fix setwd problem when sourceCpp used a relative path and included an R code chunk

jjallaire · jjallaire · commit 70e6cb8deaa2 · 2014-06-29T18:32:41.000-04:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-29  JJ Allaire <jj@rstudio.org>
+
+        * R/Attributes.R: fix setwd problem when sourceCpp used a
+        relative path and included an R code chunk
+
 2014-06-20  Dirk Eddelbuettel  <edd@debian.org>
 
         * include/Rcpp/sugar/functions/ifelse.h: Applied pull request #150 by
diff --git a/R/Attributes.R b/R/Attributes.R
@@ -34,7 +34,7 @@ sourceCpp <- function(file = "",
         writeLines(code, con)
         close(con)
     } else {
-        rWorkingDir <- dirname(file)
+        rWorkingDir <- normalizePath(dirname(file))
     }
 
     # resolve the file path

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ sourceCpp <- function(file = "",`
`34`	`34`	`writeLines(code, con)`
`35`	`35`	`close(con)`
`36`	`36`	`} else {`
`37`		`- rWorkingDir <- dirname(file)`
	`37`	`+ rWorkingDir <- normalizePath(dirname(file))`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`# resolve the file path`