Merge pull request nodegit#1623 from implausible/fix/electron-4-builds

implausible · web-flow · commit 299414f4e5e6 · 2019-02-07T20:05:45.000-07:00
Handle new gyp information for electron builds
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
@@ -1,21 +1,13 @@
 {
-  "conditions": [
-    ["(OS=='win' and node_root_dir.split('\\\\')[-1].startswith('iojs')) or (OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs'))", {
-      "variables": {
-        "is_electron%": "1",
-      }
-    }, {
-      "variables": {
-        "is_electron%": "0",
-      }
-    }]
-  ],
+  "variables": {
+    "is_electron%": "<!(node ./utils/isBuildingForElectron.js <(node_root_dir))"
+  },
 
   "targets": [
     {
       "target_name": "acquireOpenSSL",
         "conditions": [
-        ["<(is_electron) == 1", {
+        ["<(is_electron) == 1 and OS != 'linux'", {
           "actions": [{
             "action_name": "acquire",
             "action": ["node", "utils/acquireOpenSSL.js"],
@@ -168,7 +160,7 @@
           }
         ],
         [
-          "OS.endswith('bsd') or (node_root_dir.split('/')[-1].startswith('iojs') and OS=='linux')", {
+          "OS.endswith('bsd') or (<(is_electron) == 1 and OS=='linux')", {
             "libraries": [
               "-lcrypto",
               "-lssl"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "fs-extra": "^7.0.0",
+    "json5": "^2.1.0",
     "lodash": "^4.17.11",
     "nan": "^2.11.1",
     "node-gyp": "^3.8.0",
diff --git a/utils/isBuildingForElectron.js b/utils/isBuildingForElectron.js
@@ -0,0 +1,32 @@
+const fs = require("fs")
+const JSON5 = require("json5");
+const path = require("path");
+
+if (process.argv.length < 3) {
+  process.exit(1);
+}
+
+const last = arr => arr[arr.length - 1];
+const sep = process.platform === "win32" ? "\\\\" : "/";
+const [, , nodeRootDir] = process.argv;
+
+let isElectron = last(nodeRootDir.split(sep)).startsWith("iojs");
+
+if (!isElectron) {
+  try {
+    // Not ideal, would love it if there were a full featured gyp package to do this operation instead.
+    const { variables: { built_with_electron } } = JSON5.parse(
+      fs.readFileSync(
+        path.resolve(nodeRootDir, "include", "node", "config.gypi"),
+        "utf8"
+      )
+    );
+
+    if (built_with_electron) {
+      isElectron = true;
+    }
+  } catch (e) {}
+}
+
+fs.writeFileSync("was_electron", isElectron ? "1" : "0");
+process.stdout.write(isElectron ? "1" : "0");
