Skip to content

Tweaks to generate_makevars_sources.R #73

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.

Sign up for GitHub

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
MaartenMarsman merged 1 commit into from
Jan 8, 2026
Merged

Tweaks to generate_makevars_sources.R #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RCPP_PARALLEL_CPPFLAGS=`"${R_HOME}/bin/Rscript" -e "cat(RcppParallel::CxxFlags()
RCPP_PARALLEL_LIBS=`"${R_HOME}/bin/Rscript" -e "cat(RcppParallel::LdFlags())"`

# Generate sources.mk using R
"${R_HOME}/bin/Rscript" R/generate_makevars_sources.R > src/sources.mk
"${R_HOME}/bin/Rscript" inst/generate_makevars_sources.R > src/sources.mk

# Substitute into Makevars
sed -e "s|@RCPP_PARALLEL_CPPFLAGS@|${RCPP_PARALLEL_CPPFLAGS}|" \
Expand Down
2 changes: 1 addition & 1 deletion configure.win
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RCPP_PARALLEL_CPPFLAGS=`"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "cat(RcppPar
RCPP_PARALLEL_LIBS=`"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "cat(RcppParallel::LdFlags())"`

# Generate sources.mk using R
"${R_HOME}/bin/Rscript" R/generate_makevars_sources.R > src/sources.mk
"${R_HOME}/bin/Rscript" inst/generate_makevars_sources.R > src/sources.mk

# Substitute into Makevars.win
sed -e "s|@RCPP_PARALLEL_CPPFLAGS@|${RCPP_PARALLEL_CPPFLAGS}|" \
Expand Down
6 changes: 3 additions & 3 deletions R/generate_makevars_sources.R → inst/generate_makevars_sources.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ cpp <- list.files(
full.names = TRUE
)

# strip leading "src/"
cpp <- sub("^src/", "", cpp)
# strip leading "src/" (MacOs/ Linux) or leading "src\\" (Windows)
cpp <- sub("^src[\\\\/]", "", cpp)

con <- file("src/sources.mk", open = "w")
con <- file(file.path("src", "sources.mk"), open = "w")

writeLines(c(
"# ------------------------------------------------------------------",
Expand Down
Loading