Activate emsdk version from package.json

This ensures that the version installed on a developer's clone matches what's in package.json may want to catch the error + add some instructions to fix the problem
finos · Jun 13, 2023 · d86d8d3 · d86d8d3
1 parent 457d655
commit d86d8d3
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/scripts/run_emsdk.js b/scripts/run_emsdk.js
@@ -13,13 +13,16 @@ const path = require("path");
 try {
     const cwd = process.cwd();
     const cmd = process.argv.slice(2).join(" ");
-    const scripts = __dirname;
-    const emsdkdir = path.join(scripts, "..", ".emsdk");
-    const emversion = require("../package.json").emscripten;
+    const emsdkdir = path.join(__dirname, "..", ".emsdk");
+    const emversion = require(path.join(
+        __dirname,
+        "..",
+        "package.json"
+    )).emscripten;
     if (!emversion) {
-        throw new Error("emscripten version not specified in package.json");
+        throw new Error("Emscripten version not specified in package.json");
     }
-    execute_throw`${scripts}/with_emsdk.sh ${emsdkdir} ${emversion} ${cmd}`;
+    execute_throw`cd ${emsdkdir} && . ./emsdk_env.sh >/dev/null 2>&1 && emsdk activate ${emversion} >/dev/null && cd ${cwd} && ${cmd}`;
 } catch (e) {
     console.log(e.message);
     process.exit(1);