Skip to content
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

Jump to bottom

pass the to be installed modules to install-jaspModuleInstaller.R.in #5684

Merged
merged 2 commits into from
Oct 1, 2024
Merged

pass the to be installed modules to install-jaspModuleInstaller.R.in #5684

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cb5147
pass the to be installed modules to install-jaspModuleInstaller.R.in
vandenman Sep 27, 2024
8e061a4
pass character vector rather than a list
vandenman Oct 1, 2024
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: 3 additions & 1 deletion Modules/install-jaspModuleInstaller.R.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ renv::restore(lockfile = lf, library = .libPaths(), rebuild = pkgName)


cat("jaspModuleInstaller::writeModuleStatusObject\n")
jaspModuleInstaller::writeModuleStatusObject("@PROJECT_SOURCE_DIR@", oldModuleStatusObject, "@MODULES_BINARY_PATH@")
modulesToInstallRaw <- "@JASP_COMMON_MODULES@;@JASP_EXTRA_MODULES@"
modulesToInstall <- strsplit(modulesToInstallRaw, ";", fixed = TRUE)[[1]] # should perhaps use CMAKE_PREFIX_PATH
jaspModuleInstaller::writeModuleStatusObject("@PROJECT_SOURCE_DIR@", oldModuleStatusObject, "@MODULES_BINARY_PATH@", modulesToInstall)

#This is necessary because of conflicts with Matrix dep of base R lib.
#Can be removed when a new version of R updates its Matrix
Expand Down
Loading