File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change
1
+ 2015-03-16 JJ Allaire <
[email protected] >
2
+
3
+ * src/attributes.cpp: Fix failing local include test (normalize path of
4
+ base source file so comparisons work on Windows).
5
+
1
6
2015-03-15 Dirk Eddelbuettel <
[email protected] >
2
7
3
8
* R/Attributes.R (.rtoolsPath): Replace trimws() use with a local variant
Original file line number Diff line number Diff line change @@ -883,8 +883,13 @@ namespace attributes {
883
883
884
884
// parse the source dependencies from the passed lines
885
885
std::vector<FileInfo> parseSourceDependencies (
886
- const std::string& sourceFile) {
886
+ std::string sourceFile) {
887
887
888
+ // normalize source file
889
+ Rcpp::Environment baseEnv = Rcpp::Environment::base_env ();
890
+ Rcpp::Function normalizePath = baseEnv[" normalizePath" ];
891
+ sourceFile = Rcpp::as<std::string>(normalizePath (sourceFile));
892
+
888
893
// parse dependencies
889
894
std::vector<FileInfo> dependencies;
890
895
parseSourceDependencies (sourceFile, &dependencies);
You can’t perform that action at this time.
0 commit comments