Merge pull request #1342 from finos/emsdk-npm-fix

Replace `emsdk-npm` with simple script

Author: texodus

.gitignore

@@ -176,3 +176,4 @@ rust/perspective-vieux/pkg
 
 rust/perspective-vieux/target
 rust/perspective-vieux/target2
+.emsdk

cpp/perspective/package.json

@@ -10,10 +10,10 @@
         "dist/cjs/**/*"
     ],
     "scripts": {
-        "build": "yarn emsdk-run node ./build.js",
+        "build": "node ../../scripts/run_emsdk.js node ./build.js",
         "clean": "rimraf dist/cpp/build",
         "test": ":",
         "test:run": ":",
         "test:build": ":"
     }
-}
+}

package.json

@@ -49,7 +49,6 @@
         "cssnano": "^4.1.10",
         "cssnano-preset-lite": "^1.0.1",
         "dotenv": "^8.1.0",
-        "emsdk-npm": "https://github.com/texodus/emsdk-npm.git#bash-sub-fix",
         "eslint": "^6.6.0",
         "eslint-config-prettier": "^3.0.1",
         "eslint-plugin-markdown": "^1.0.2",

scripts/install_emsdk.js

@@ -9,23 +9,45 @@
 
 require("dotenv").config({path: "./.perspectiverc"});
 
-const {execute, execute_throw} = require("./script_utils.js");
+const {execute_throw} = require("./script_utils.js");
 const {emscripten} = require("../package.json");
+const path = require("path");
+const os = require("os");
+const fs = require("fs");
+
+function base() {
+    return path.join(__dirname, "..", ".emsdk");
+}
+
+function emsdk_checkout() {
+    function git(args) {
+        execute_throw`git ${args.join(" ")}`;
+    }
+
+    git(["clone", "https://github.com/emscripten-core/emsdk.git", base()]);
+}
+
+function emsdk(...args) {
+    const basedir = base();
+    const suffix = os.type() == "Windows_NT" ? ".bat" : "";
+    const emsdk = path.join(basedir, "emsdk" + suffix);
+    execute_throw`${emsdk} ${args.join(" ")}`;
+}
 
 function upgrade() {
     console.log(`-- Emscripten not found, installing ${emscripten}`);
-    execute`yarn emsdk-checkout`;
-    execute`yarn emsdk install ${emscripten}`;
-    execute`yarn emsdk activate ${emscripten}`;
+    emsdk_checkout();
+    emsdk("install", emscripten);
+    emsdk("activate", emscripten);
     console.log(`-- Emscripten ${emscripten} installed`);
 }
 
 function check() {
     try {
-        execute_throw`yarn emsdk-run command -v emcc`;
+        execute_throw`emcc --version`;
         return true;
     } catch (e) {
-        return false;
+        return fs.existsSync(path.join(__dirname, "..", ".emsdk"));
     }
 }
 

scripts/run_emsdk.js

@@ -0,0 +1,21 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2017, the Perspective Authors.
+ *
+ * This file is part of the Perspective library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
+
+const {execute_throw} = require("./script_utils.js");
+const path = require("path");
+
+try {
+    const cwd = process.cwd();
+    const cmd = process.argv.slice(2).join(" ");
+    const emsdkdir = path.join(__dirname, "..", ".emsdk");
+    execute_throw`cd ${emsdkdir} && . ./emsdk_env.sh && cd ${cwd} && ${cmd}`;
+} catch (e) {
+    console.log(e.message);
+    process.exit(1);
+}

yarn.lock

@@ -7105,10 +7105,6 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-"emsdk-npm@https://github.com/texodus/emsdk-npm.git#bash-sub-fix":
-  version "0.2.2"
-  resolved "https://github.com/texodus/emsdk-npm.git#19ecbaa3fb2572bd00a87173273815cf5e382fef"
-
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"