@platforma-sdk/r-builder 1.1.2 → 1.1.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "@platforma-sdk/r-builder",
   "description": "Build R run environment for Platforma",
   "type": "module",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "files": [
     "assets/",
     "scripts/"

package/scripts/lib/linux.js

@@ -146,11 +146,14 @@ async function buildRDist(logger, buildDir, installRoot, rRoot) {
 
 const systemLibs = [
   /ld-linux-x86-64\.so(\.[0-9.]+)?$/,
-  /libc\.so(\.[0-9.]+)?$/,
   /libm\.so(\.[0-9.]+)?$/,
   /libcom_err\.so(\.[0-9.]+)?$/,
+  /libc\.so(\.[0-9.]+)?$/,
   /libstdc\+\+\.so(\.[0-9.]+)?$/,
-  /libresolv\.so(\.[0-9.]+)?$/
+  /libresolv\.so(\.[0-9.]+)?$/,
+  /libdl\.so(\.[0-9.]+)?$/,
+  /librt\.so(\.[0-9.]+)?$/,
+  /libpthread\.so(\.[0-9.]+)?$/
 ];
 
 function collectDependencies(logger, installDir, patchElf = false) {

package/scripts/lib/util.js

@@ -397,29 +397,37 @@ export function buildRDependencies(
 
   const lockPath = path.join(depsDir, lockFile)
 
-  if (fs.existsSync(lockPath)) {
-    runInRenv(logger, rRoot, [
-      '--no-echo',
-      '-e', ...quote(`renv::restore( clean = TRUE )`),
-    ], {
+  const lockExists = fs.existsSync(lockPath)
+  const initExists = fs.existsSync(path.join(depsDir, initFile))
+
+  if (initExists && lockExists) {
+    throw new Error(
+      `directory ${depsDir} cannot have '${lockFile}' and '${initFile}' simultaneously.\n`+
+      `Choose either frozen dependencies state (${lockFile}) either dynamic dependencies initialization (${initFile}).\n`+
+      `Create empty '${initFile}' file if you really need empty R run environment without any preinstalled dependencies.`
+    )
+  } else if (initExists) {
+    runInRenv(logger, rRoot, ['--no-echo', `--file=${initFile}`], {
       wd: depsDir,
       paths: additionalPaths,
     })
 
-  } else if (fs.existsSync(path.join(depsDir, initFile))) {
-    runInRenv(logger, rRoot, ['--no-echo', `--file=${initFile}`], {
+    // Force snapshot regeneration to put all installed packages into the lock file.
+    runInRenv(logger, rRoot, ['--no-echo', '-e', ...quote(`renv::settings$snapshot.type("all"); renv::snapshot()`)])
+
+  } else if (lockExists) {
+    runInRenv(logger, rRoot, [
+      '--no-echo',
+      '-e', ...quote(`renv::restore( clean = TRUE )`),
+    ], {
       wd: depsDir,
       paths: additionalPaths,
     })
 
-    if (!fs.existsSync(path.join(depsDir, lockFile))) {
-      runInRenv(logger, rRoot, ['--no-echo', '-e', ...quote(`renv::snapshot()`)])
-    }
-
   } else {
       throw new Error(
-        `directory ${depsDir} has no ${lockFile} or ${initFile}. No dependencies detected.\n`+
-        `Create empty init.R file if you really need empty R run environment without any preinstalled dependencies`
+        `directory ${depsDir} has no '${lockFile}' or '${initFile}'. No dependencies detected.\n`+
+        `Create empty '${initFile}' file if you really need empty R run environment without any preinstalled dependencies`
       )
   }