no more hardcoded rollup

Author: ThierryBerger

builds/prepare_builds/src/main.rs

@@ -23,7 +23,7 @@ pub struct Args {
 pub struct BuildValues {
     /// Only the number of dimensions (1 or 2), as sometimes it will be prefixed by "dim" and sometimes post-fixed by "d".
     pub dim: String,
-    /// real name of the additional features to enable in the project
+    /// Rust name of the additional features to enable in the project, they should correspond to features from Cargo.toml(.tera).
     pub feature_set: Vec<String>,
     pub target_dir: PathBuf,
     pub template_dir: PathBuf,

rapier-compat/build_conf.sh

@@ -16,6 +16,6 @@ do
 
   ./build-rust.sh $config_file_name
   ./gen_src.sh $config_file_name
-  npm run my_rollup
+  npm run rollup --  --config rollup.config.js --bundleConfigAsCjs --environment BUILD_CONFIG_NAME:${config_file_name}
 
 done

rapier-compat/gen_src.sh

@@ -34,8 +34,6 @@ cp -r ../src.ts/* $GENOUT
 rm -f "${GENOUT}/raw.ts" "${GENOUT}/init.ts"
 cp -r ./src${DIM}/* $GENOUT
 
-echo ${conditions_to_remove}
-
 for condition_to_remove in "${conditions_to_remove}" ; do
   # See https://serverfault.com/a/137848
   echo "find ${GENOUT} -type f -print0 | LC_ALL=C xargs -0 sed -i \"\\:#if ${condition_to_remove}:,\\:#endif:d\""

rapier-compat/package.json

@@ -4,20 +4,15 @@
     "private": true,
     "scripts": {
         "prepare-all-projects": "../builds/prepare_builds/prepare_all_projects.sh",
-        "build2d-non-deterministic": "./build_conf.sh dim2",
-        "build-2d-deterministic": "./build_conf.sh dim2_deterministic",
-        "build-2d-simd": "./build_conf.sh dim2_simd",
-        "build-2d-all": "npm run build-2d-non-deterministic && npm run build-2d-deterministic && npm run build-2d-simd",
-        "build-3d-non-deterministic": "./build_conf.sh dim3 && ./gen_src.sh dim3",
-        "build-3d-deterministic": "./build_conf.sh dim3_deterministic && ./gen_src.sh dim3_deterministic",
-        "build-3d-simd": "./build_conf.sh dim3_simd",
-        "build-3d-all": "npm run build-3d-non-deterministic && npm run build-3d-deterministic && npm run build-3d-simd",
-        "build-all": "npm run build-2d-all && npm run build-3d-all",
+        "build-2d-all": "./build_conf.sh dim2 dim2_deterministic dim2_simd",
+        "build-3d-all": "./build_conf.sh dim3 dim3_deterministic dim3_simd",
+        "build-all-feature_group": "./build_conf.sh dim2 dim3 dim2_deterministic dim3_deterministic dim2_simd dim3_simd",
+        "build-all-dim_group": "./build_conf.sh dim2 dim2_deterministic dim2_simd dim3 dim3_deterministic dim3_simd",
         "fix-raw-file": "sh ./fix_raw_file.sh",
-        "build": "npm run clean && npm run build-rust-all && npm run build-genjs && npm run fix-raw-file",
-        "clean": "cargo clean && rimraf gen2d gen3d builds",
+        "build": "npm run clean && npm run build-all",
+        "clean": "cargo clean && rimraf builds",
         "test": "jest --detectOpenHandles",
-        "my_rollup": "rollup --config rollup.config.js --bundleConfigAsCjs --environment BUILD_CONFIG_NAME:dim2"
+        "rollup": "rollup"
     },
     "dependencies": {
         "base64-js": "^1.5.1"

rapier-compat/rollup.config.js

@@ -71,8 +71,6 @@ const config = (dim, js_package_name) => ({
 
 const conf = JSON.parse(fs.readFileSync('../builds/prepare_builds/assets/' + process.env.BUILD_CONFIG_NAME + '.json'));
 
-//console.log(conf);
-
 
 export default [
     config("" + conf.dim + "d", conf.js_package_name),