Work towards Makevars.win #23

Author: gregorgorjanc

RcppTskit/configure.win

@@ -1,5 +1,2 @@
 #!/bin/sh
-"${R_HOME}/bin/Rscript" tools/configure.R
-# TODO: Use "${R_HOME}/bin${R_ARCH_BIN}/Rscript" in configure.win on Windows #18
-#       https://cran.r-project.org/doc/manuals/r-devel/R-exts.html#Configure-and-cleanup
-#       https://github.com/HighlanderLab/RcppTskit/issues/18
+"${R_HOME}/bin${R_ARCH_BIN}/Rscript" tools/configure.R

RcppTskit/src/Makevars.in

@@ -50,6 +50,3 @@ tskit/%.o: tskit/%.c
 
 # Linking
 PKG_LIBS = @RCPPTSKIT_LIB@
-
-# TODO: Create Makevars.win #23
-#       https://github.com/HighlanderLab/RcppTskit/issues/23

RcppTskit/tools/configure.R

@@ -38,6 +38,7 @@ renderMakevars <- function(template, output) {
 }
 
 # renderMakevars(template = "this_should_fail", output = "before_getting_to_output")
+
 if (.Platform$OS.type == "unix") {
   # readLines(con = "src/Makevars.in")
   success <- renderMakevars(
@@ -47,7 +48,9 @@ if (.Platform$OS.type == "unix") {
 } else {
   # readLines(con = "src/Makevars.win.in")
   success <- renderMakevars(
-    template = "src/Makevars.win.in",
+    # Currently, both Unix and Windows use the same template
+    # template = "src/Makevars.win.in",
+    template = "src/Makevars.in",
     output = "src/Makevars.win"
   )
 }