fix renv install on mac (#5697)

Co-authored-by: Rens <example>
jasp-stats · Oct 14, 2024 · 3b9eb6d · 3b9eb6d
1 parent 517d055
commit 3b9eb6d
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 32 deletions.
diff --git a/Modules/setup_rcpp_rinside.R.in b/Modules/setup_rcpp_rinside.R.in
@@ -0,0 +1,58 @@
+# Generated from Tools/setup_rcpp_rinside.R.in
+#
+Sys.setenv(GITHUB_PAT          = "@GITHUB_PAT@")
+Sys.setenv(RENV_PATHS_ROOT     = "@MODULES_RENV_ROOT_PATH@")
+Sys.setenv(RENV_PATHS_CACHE    = "@MODULES_RENV_CACHE_PATH@")
+Sys.setenv(RENV_PATHS_SANDBOX  = "@RENV_SANDBOX@")
+Sys.setenv(JASPENGINE_LOCATION = "@JASP_ENGINE_PATH@/JASPEngine")
+
+if("@R_PKG_CELLAR_PATH@" != "")
+	Sys.setenv(RENV_PATHS_CELLAR   = "@R_PKG_CELLAR_PATH@")
+
+RENV_LIBRARY                <- "@RENV_LIBRARY@"
+R_CPP_INCLUDES_LIBRARY      <- "@R_CPP_INCLUDES_LIBRARY@"
+JASPMODULEINSTALLER_LIBRARY <- "@JASPMODULEINSTALLER_LIBRARY@"
+PKGDEPENDS_LIBRARY          <- "@PKGDEPENDS_LIBRARY@"
+
+ENGINE                 <- file.path("@PROJECT_SOURCE_DIR@", "Engine")
+MODULES                <- file.path("@PROJECT_SOURCE_DIR@", "Modules")
+TOOLS                  <- file.path("@PROJECT_SOURCE_DIR@", "Tools")
+
+# defines assignFunctionInRenv, getOS, and setupRenv
+source(file.path(ENGINE, "jaspModuleInstaller", "R", "renvOverrides.R"))
+
+mkdir <- function(paths) {
+  for (path in paths)
+    if (!dir.exists(path))
+      dir.create(path, recursive = TRUE)
+}
+
+mkdir(c(RENV_LIBRARY, R_CPP_INCLUDES_LIBRARY, JASPMODULEINSTALLER_LIBRARY))
+
+# used by renv
+options(
+  install.opts                = "--no-multiarch --no-docs --no-test-load",
+  # these two could be added to setupRenv
+  renv.config.install.verbose = TRUE,
+  renv.config.ppm.default     = TRUE
+)
+
+.libPaths(RENV_LIBRARY)
+sandboxPaths <- renv:::renv_sandbox_activate()
+
+#to fix flatpak issue cleaning up on interrupt
+if (@IS_FLATPAK_USED@) {
+  system2(command="chmod", args=c("-R", "777", "@RENV_LIBRARY@/../"))
+}
+
+cat("Using sandbox paths:\n")
+for (path in sandboxPaths)
+  cat("    ", path, "\n", sep = "")
+
+cat("Restoring Rcpp & RInside\n")
+setupRenv(R_CPP_INCLUDES_LIBRARY)
+renv::restore(
+  library  = R_CPP_INCLUDES_LIBRARY,
+  lockfile = file.path(MODULES, "Rcpp_RInside.lock"),
+  clean    = TRUE
+)
diff --git a/Modules/setup_renv_rcpp_rinside.R.in → Modules/setup_renv.R.in b/Modules/setup_renv_rcpp_rinside.R.in → Modules/setup_renv.R.in
@@ -1,4 +1,4 @@
-# Generated from Tools/setup_renv_rcpp_rinside_jaspModuleInstaller.R.in
+# Generated from Tools/setup_renv.R.in
 #
 Sys.setenv(GITHUB_PAT          = "@GITHUB_PAT@")
 Sys.setenv(RENV_PATHS_ROOT     = "@MODULES_RENV_ROOT_PATH@")
@@ -49,31 +49,3 @@ if (!dir.exists(file.path(RENV_LIBRARY, "renv"))) {
 } else {
   cat("renv already installed, not reinstalling\n")
 }
-
-# used by renv
-options(
-  install.opts                = "--no-multiarch --no-docs --no-test-load",
-  # these two could be added to setupRenv
-  renv.config.install.verbose = TRUE,
-  renv.config.ppm.default     = TRUE
-)
-
-.libPaths(RENV_LIBRARY)
-sandboxPaths <- renv:::renv_sandbox_activate()
-
-#to fix flatpak issue cleaning up on interrupt
-if (@IS_FLATPAK_USED@) {
-  system2(command="chmod", args=c("-R", "777", "@RENV_LIBRARY@/../"))
-}
-
-cat("Using sandbox paths:\n")
-for (path in sandboxPaths)
-  cat("    ", path, "\n", sep = "")
-
-cat("Restoring Rcpp & RInside\n")
-setupRenv(R_CPP_INCLUDES_LIBRARY)
-renv::restore(
-  library  = R_CPP_INCLUDES_LIBRARY,
-  lockfile = file.path(MODULES, "Rcpp_RInside.lock"),
-  clean    = TRUE
-)
diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake
@@ -838,14 +838,40 @@ message(STATUS "Setting up renv, Rcpp, RInside, and jaspModuleInstaller")
 message(STATUS "RENV_LIBRARY           = ${RENV_LIBRARY}")
 message(STATUS "R_CPP_INCLUDES_LIBRARY = ${R_CPP_INCLUDES_LIBRARY}")
 
-configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_renv_rcpp_rinside.R.in
-                ${SCRIPT_DIRECTORY}/setup_renv_rcpp_rinside.R @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_renv.R.in
+                ${SCRIPT_DIRECTORY}/setup_renv.R @ONLY)
 
 execute_process(
   COMMAND_ECHO STDOUT
   #ERROR_QUIET OUTPUT_QUIET
   WORKING_DIRECTORY ${R_HOME_PATH}
-  COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_renv_rcpp_rinside.R)
+  COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_renv.R)
+
+if(APPLE)
+  # Patch renv
+  message(CHECK_START "Patching ${RENV_LIBRARY}")
+  execute_process(
+    COMMAND_ECHO STDOUT
+    #ERROR_QUIET OUTPUT_QUIET
+    WORKING_DIRECTORY ${R_HOME_PATH}
+    COMMAND
+      ${CMAKE_COMMAND} -D
+      NAME_TOOL_PREFIX_PATCHER=${PROJECT_SOURCE_DIR}/Tools/macOS/install_name_prefix_tool.sh
+      -D PATH=${RENV_LIBRARY} -D R_HOME_PATH=${R_HOME_PATH} -D
+      R_DIR_NAME=${R_DIR_NAME} -D SIGNING_IDENTITY=${APPLE_CODESIGN_IDENTITY}
+      -D SIGNING=1 -D CODESIGN_TIMESTAMP_FLAG=${CODESIGN_TIMESTAMP_FLAG} -P
+      ${PROJECT_SOURCE_DIR}/Tools/CMake/Patch.cmake
+  )
+endif()
+
+configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_rcpp_rinside.R.in
+                ${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R @ONLY)
+
+execute_process(
+  COMMAND_ECHO STDOUT
+  #ERROR_QUIET OUTPUT_QUIET
+  WORKING_DIRECTORY ${R_HOME_PATH}
+  COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R)
 
 if(APPLE)
   # Patch RInside and RCpp