From f8cdcf615f1d1b98bf4043c196c695f845cab23c Mon Sep 17 00:00:00 2001
From: Tyler Wanek <tylerw@axosoft.com>
Date: Thu, 7 Feb 2019 12:24:44 -0700
Subject: [PATCH] Handle new gyp information for electron builds

---
 generate/templates/templates/binding.gyp | 18 ++++---------
 package-lock.json                        | 25 +++++++++++++++---
 package.json                             |  1 +
 utils/isBuildingForElectron.js           | 32 ++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 17 deletions(-)
 create mode 100644 utils/isBuildingForElectron.js

diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
index e6f1141cb..c15a7ec55 100644
--- 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
index 9576fb389..d7ab33817 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -258,6 +258,14 @@
         "private": "^0.1.8",
         "slash": "^1.0.0",
         "source-map": "^0.5.7"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        }
       }
     },
     "babel-generator": {
@@ -3230,10 +3238,19 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+      "requires": {
+        "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
     },
     "jsonfile": {
       "version": "2.4.0",
diff --git a/package.json b/package.json
index f5aef99c2..9597da832 100644
--- 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
new file mode 100644
index 000000000..58d32bd5e
--- /dev/null
+++ 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");