diff --git a/ChangeLog b/ChangeLog index bc96605d2..b2c2d32fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2025-07-20 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version and date + * inst/include/Rcpp/config.h: Idem + + * R/compilerCheck.R: Remove unused function + * man/compilerCheck.Rd: Remove its documentation + 2025-07-19 Dirk Eddelbuettel * vignettes/rmd/Rcpp.bib: Use DOI for R citation diff --git a/DESCRIPTION b/DESCRIPTION index 31ed13b2b..3cc20d012 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: Rcpp Title: Seamless R and C++ Integration -Version: 1.1.0.1 -Date: 2025-07-18 +Version: 1.1.0.2 +Date: 2025-07-20 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org", comment = c(ORCID = "0000-0001-6419-907X")), person("Romain", "Francois", role = "aut", diff --git a/R/compilerCheck.R b/R/compilerCheck.R deleted file mode 100644 index 25a67d5cf..000000000 --- a/R/compilerCheck.R +++ /dev/null @@ -1,36 +0,0 @@ -##' Helper function to establish minimal compiler versions, currently limited -##' only to \code{g++} which (particularly for older RHEL/CentOS releases) is -##' too far behind current C++11 standards required for some packages. -##' -##' This function looks up \code{g++} (as well as optional values in the -##' \code{CXX} and \code{CXX1X} environment variables) in the \code{PATH}. For -##' all values found, the output of \code{g++ -v} is analyzed for the version -##' string, which is then compared to the given minimal version. -##' @title Check for Minimal (g++) Compiler Version -##' @param minVersion An object of type \code{package_version}, with a default -##' of version 4.6.0 -##' @return A boolean value is returned, indicating if the minimal version is -##' being met -##' @author Dirk Eddelbuettel -compilerCheck <- function(minVersion=package_version("4.6.0")) { # nocov start - - binaries <- c("g++", Sys.getenv("CXX", unset=""), Sys.getenv("CXX1X", unset="")) - binpaths <- lapply(binaries, function(b) { if (b=="") NULL else Sys.which(b) }) - - allgood <- FALSE - rl <- lapply(binpaths, function(b) { - if (is.null(b)) return(NULL) - con <- pipe(paste(b, "-v 2>&1"), "r") # NB: not --version, but -v - lines <- readLines(con) - close(con) - lines <- lines[grepl("^g.. version", lines)] - if (length(lines) == 0) return(NULL) - ver <- strsplit(lines, " ")[[1]][3] # format is 'gcc version x.y.z ....' - package_version(ver) >= minVersion - }) - all(do.call(c, rl)) # drops NULLs -} # nocov end - -## TODO: maybe not limit to gcc/g++ -## TODO: maybe be smarter about combination of path, CXX and CXX1X ? -## TODO: maybe make env.var optional arguments too diff --git a/inst/include/Rcpp/config.h b/inst/include/Rcpp/config.h index 9486f9e50..1de77d134 100644 --- a/inst/include/Rcpp/config.h +++ b/inst/include/Rcpp/config.h @@ -31,7 +31,7 @@ #define RCPP_VERSION_STRING "1.1.0" // the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it) -#define RCPP_DEV_VERSION RcppDevVersion(1,1,0,1) -#define RCPP_DEV_VERSION_STRING "1.1.0.1" +#define RCPP_DEV_VERSION RcppDevVersion(1,1,0,2) +#define RCPP_DEV_VERSION_STRING "1.1.0.2" #endif diff --git a/man/compilerCheck.Rd b/man/compilerCheck.Rd deleted file mode 100644 index b10c23d89..000000000 --- a/man/compilerCheck.Rd +++ /dev/null @@ -1,30 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/compilerCheck.R -\name{compilerCheck} -\alias{compilerCheck} -\title{Check for Minimal (g++) Compiler Version} -\usage{ -compilerCheck(minVersion = package_version("4.6.0")) -} -\arguments{ -\item{minVersion}{An object of type \code{package_version}, with a default -of version 4.6.0} -} -\value{ -A boolean value is returned, indicating if the minimal version is - being met -} -\description{ -Helper function to establish minimal compiler versions, currently limited -only to \code{g++} which (particularly for older RHEL/CentOS releases) is -too far behind current C++11 standards required for some packages. -} -\details{ -This function looks up \code{g++} (as well as optional values in the -\code{CXX} and \code{CXX1X} environment variables) in the \code{PATH}. For -all values found, the output of \code{g++ -v} is analyzed for the version -string, which is then compared to the given minimal version. -} -\author{ -Dirk Eddelbuettel -}