Skip to content

Commit 4015d89

Browse files
authored
Merge pull request #1235 from RcppCore/bugfix/windows_path
Additional file path normalization to protect a windows path
2 parents b6d25ce + beb26a4 commit 4015d89

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2022-10-12 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): Roll minor version
4+
* inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem
5+
6+
* R/Attributes.R (sourceCpp): Protect path to binary from spaces
7+
18
2022-10-06 Dirk Eddelbuettel <[email protected]>
29

310
* DESCRIPTION (Version, Date): Roll minor version

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 1.0.9.4
4-
Date: 2022-10-06
3+
Version: 1.0.9.5
4+
Date: 2022-10-12
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
66
Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
77
Maintainer: Dirk Eddelbuettel <[email protected]>

R/Attributes.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ sourceCpp <- function(file = "",
129129
} # #nocov end
130130

131131
# grab components we need to build command
132-
r <- paste(R.home("bin"), "R", sep = .Platform$file.sep)
132+
r <- file.path(R.home("bin"), "R")
133+
if (.Platform$OS.type == "windows") r <- shQuote(r)
133134
lib <- context$dynlibFilename
134135
deps <- context$cppDependencySourcePaths
135136
src <- context$cppSourceFilename

inst/include/Rcpp/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define RCPP_VERSION_STRING "1.0.9"
3131

3232
// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
33-
#define RCPP_DEV_VERSION RcppDevVersion(1,0,9,4)
34-
#define RCPP_DEV_VERSION_STRING "1.0.9.4"
33+
#define RCPP_DEV_VERSION RcppDevVersion(1,0,9,5)
34+
#define RCPP_DEV_VERSION_STRING "1.0.9.5"
3535

3636
#endif

0 commit comments

Comments
 (0)