Skip to content

Support R 3.3.0 Windows new toolchain #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2016-03-27 Qin Wenfeng <mail@qinwenfeng.com>

* R/Attributes.R: Support R 3.3.0 Windows new toolchain

2016-03-26 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION: Rolled Date and minor Version
Expand Down
12 changes: 8 additions & 4 deletions R/Attributes.R
Original file line number Diff line number Diff line change
Expand Up @@ -705,9 +705,11 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {

# Check version
ver <- key$`Current Version`
if (ver %in% (c("2.15", "2.16", "3.0", "3.1", "3.2", "3.3"))) {
if (ver %in% (c("2.15", "2.16", "3.0", "3.1", "3.2", "3.3", "3.4"))) {
# See if the InstallPath leads to the expected directories
isGcc49 <- FALSE
# R version 3.3.0 alpha (2016-03-25 r70378)
isGcc49 <- ver %in% c("3.3", "3.4") && as.numeric(R.Version()$`svn rev`) >= 70378

rToolsPath <- key$`InstallPath`
if (!is.null(rToolsPath)) {
# add appropriate path entries
Expand All @@ -721,8 +723,10 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
env <- list()
path <- paste(path, collapse = .Platform$path.sep)
env$PATH <- paste(path, Sys.getenv("PATH"), sep=.Platform$path.sep)
if (isGcc49)
env$RTOOLS <- .rtoolsPath(rToolsPath)
if (isGcc49) {
env$RTOOLS <- .rtoolsPath(rToolsPath)
env$BINPREF <- file.path(env$RTOOLS, "mingw_$(WIN)/bin//", fsep = "/")
}
return(env)
}
}
Expand Down
4 changes: 4 additions & 0 deletions inst/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
The checks for different C library implementations now also check for Musl
used by Alpine Linux (Sergio Marques in PR \ghpr{449}).
}
\item Changes in Rcpp Attributes:
\itemize{
R 3.3.0 Windows with Rtools 3.3 is now supported (Qin Wenfeng in PR \ghpr{451}).
}
}
}

Expand Down