@platforma-sdk/r-builder 1.0.0 → 1.1.1

package/package.json

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

package/scripts/lib/linux.js

@@ -38,42 +38,33 @@ function useCCache(logger) {
   logger.info("Using ccache as build caching tool...")
   process.env.CC = `ccache gcc`
   process.env.CXX = `ccache g++`
+  process.env.CXX11 = `ccache g++`
+  process.env.CXX14 = `ccache g++`
+  process.env.CXX17 = `ccache g++`
+  process.env.CXX20 = `ccache g++`
 }
 
-async function installSystemPackages(logger) {
-  const originalAptSources = '/etc/apt/sources.list';
-  logger.info(`Analyzing '${originalAptSources}'`);
-
-  const modifiedAptSources = path.join(os.tmpdir(), 'apt-sources-list');
-  let srcExists = false;
-
-  const lines = fs.readFileSync(originalAptSources).toString().split('\n');
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i].trim();
-    if (/^\s*#\s*(deb-src)\s+.*\s+(universe)\s*$/.test(line)) {
-      srcExists = true;
-      lines[i] = line.replace(/^\s*#\s*/, '');
-    }
-    if (/^\s*deb-src\s+/.test(line)) {
-      srcExists = true;
+async function installRockyLinuxPackages(logger) {
+  logger.info('Installing packages for Rocky Linux');
+  util.runInherit(`sudo dnf -y install dnf-plugins-core`);
+  util.runInherit(`sudo dnf -y install epel-release`);
+
+  // Try to enable powertools or add fallback for different Rocky Linux versions
+  try {
+    util.runInherit(`sudo dnf config-manager --set-enabled powertools`);
+  } catch (error) {
+    logger.warn('Failed to enable powertools, trying alternative names');
+    try {
+      // In Rocky Linux 9, it's called "crb" instead of "powertools"
+      util.runInherit(`sudo dnf config-manager --set-enabled crb`);
+    } catch (innerError) {
+      logger.warn('Could not enable powertools or crb repositories. Some packages might not be available.');
     }
   }
 
-  if (srcExists) {
-    logger.info(`Patching '${originalAptSources}'`);
-    fs.writeFileSync(modifiedAptSources, lines.join('\n'));
-    util.runInherit(`sudo mv '${modifiedAptSources}' '${originalAptSources}'`);
-  } else {
-    logger.warn(
-      `WARNING! No 'deb-src' records found in '${originalAptSources}'. 'apt-get build-dep' would probably fail.`
-    );
-  }
-
-  logger.info('Installing packages');
-  util.runInherit(`sudo apt-get update`);
-  util.runInherit(`sudo apt-get install --yes rsync build-essential unzip curl patchelf r-recommended`);
-  util.runInherit(`sudo apt-get install --yes libssl-dev libcurl4-openssl-dev libpng-dev liblapack-dev libblas-dev libfontconfig1-dev libxml2-dev`);
-  util.runInherit(`sudo apt-get build-dep --yes r-base`);
+  util.runInherit(`sudo dnf -y install R`);
+  util.runInherit(`sudo dnf -y builddep R`);
+  util.runInherit(`sudo dnf -y install curl rsync unzip diffutils procps patchelf openssl-devel libcurl-devel libpng-devel lapack-devel blas-devel fontconfig-devel libxml2-devel`);
 }
 
 function getGCCMajorVersion() {
@@ -130,16 +121,23 @@ function configureRBuild(logger, version, sourcesDir, installDir) {
   return buildDir;
 }
 
-function buildRDist(logger, buildDir, installRoot, rRoot) {
+async function buildRDist(logger, buildDir, installRoot, rRoot) {
   util.runInherit(`make`, { cwd: buildDir });
   util.runInherit(`make install`, { cwd: buildDir });
 
-  // Move core of R installation into desired R root, leaving behind all supporting
-  // (and unnecessary) files.
+  let libsDir = path.join(installRoot, 'lib64', 'R');
+  if (!fs.existsSync(libsDir)) {
+    libsDir = path.join(installRoot, 'lib', 'R');
+  }
+  if (!fs.existsSync(libsDir)) {
+    throw new Error(`R libraries directory not found in ${installRoot} (neither 'lib64/R' nor 'lib/R')`);
+  }
+
+  logger.info(`Moving R from ${libsDir} to ${rRoot}`);
   if (fs.existsSync(rRoot)) {
-    fs.rmSync(rRoot, { recursive: true })
+    fs.rmSync(rRoot, { recursive: true });
   }
-  fs.renameSync(path.join(installRoot, 'lib', 'R'), rRoot);
+  fs.renameSync(libsDir, rRoot);
 
   // 1st round of dependencies collection with binaries ELF patching to make R work from
   // its new location. We'll collect dependencies of installed packages later by one more round.
@@ -277,7 +275,7 @@ export async function buildR(logger, version) {
   fs.mkdirSync(path.dirname(distDir), { recursive: true });
   fs.mkdirSync(util.downloadsDir, { recursive: true });
 
-  await installSystemPackages(logger);
+  await installRockyLinuxPackages(logger);
 
   const rSourcesDir = await getRSources(logger, version);
   const installDir = path.join(util.rDistDir, 'tmp-install');

package/scripts/lib/util.js

@@ -1,7 +1,7 @@
 import child_process from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
-import { pipeline } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import { promisify } from 'node:util';
 import { fetch } from 'undici';
 
@@ -131,16 +131,7 @@ export async function download(logger, url, destination) {
     
     await pump();
   } else {
-
-    return new Promise((resolve, reject) => {
-      pipeline(response.body, writer, (err) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
-    });
+    await pipeline(response.body, writer);
   }
 }
 
@@ -152,7 +143,7 @@ export async function extractTarXz(archivePath, destination) {
 }
 
 export async function extractTarGz(archivePath, destination) {
-  await pipelineAsync(
+  await pipeline(
     fs.createReadStream(archivePath),
     zlib.createUnzip(),
     tar.extract({ cwd: destination })