WIP on action for acquiring OpenSSL

emmax86 · emmax86 · commit 136dace3a0a0 · 2018-09-25T15:48:59.000-07:00
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
@@ -1,8 +1,69 @@
 {
+  "conditions": [
+    ["(OS=='win' and node_root_dir.split('\\\\')[-1].startswith('iojs')) or (OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs'))", {
+      "conditions": [
+        ["OS=='win'", {
+          "variables": {
+            "is_electron%": "1",
+            "openssl_include_dir%": "<(module_root_dir)\\vendor\\openssl"
+          }
+        }, {
+          "variables": {
+            "is_electron%": "1",
+            "openssl_include_dir%": "<(module_root_dir)/vendor/openssl"
+          }
+        }]
+      ],
+    }, {
+      "conditions": [
+        ["OS=='win'", {
+          "variables": {
+            "is_electron%": "0",
+            "openssl_include_dir%": "<(node_root_dir)\\include\\node"
+          }
+        }, {
+          "variables": {
+            "is_electron%": "0",
+            "openssl_include_dir%": "<(node_root_dir)/include/node"
+          }
+        }]
+      ]
+    }]
+  ],
+
   "targets": [
+    {
+      "target_name": "acquireOpenSSL",
+        "conditions": [
+        ["<(is_electron) == 1", {
+          "actions": [{
+            "action_name": "acquire",
+            "action": ["node", "utils/acquireOpenSSL.js"],
+            "inputs": ["vendor/openssl_distributions.json"],
+            "outputs": ["vendor/openssl"]
+          }]
+        }]
+      ]
+    },
+    {
+      "target_name": "configureLibssh2",
+      "actions": [{
+        "action_name": "configure",
+        "action": ["node", "utils/configureLibssh2.js", "<(openssl_include_dir)", "<(is_electron)"],
+        "inputs": [""],
+        "outputs": [""]
+      }],
+      "hard_dependencies": [
+        "acquireOpenSSL"
+      ]
+    },
     {
       "target_name": "nodegit",
 
+      "hard_dependencies": [
+        "configureLibssh2"
+      ],
+
       "dependencies": [
         "vendor/libgit2.gyp:libgit2"
       ],
@@ -64,8 +125,8 @@
                   "vendor/openssl/include"
                 ],
                 "libraries": [
-                  "<(module_root_dir)/vendor/openssl/lib/libcrypto.a",
-                  "<(module_root_dir)/vendor/openssl/lib/libssl.a"
+                  "<(module_root_dir)/vendor/openssl/lib/libcrypto.dylib",
+                  "<(module_root_dir)/vendor/openssl/lib/libssl.dylib"
                 ]
               }]
             ],
diff --git a/lifecycleScripts/preinstall.js b/lifecycleScripts/preinstall.js
@@ -2,7 +2,6 @@ var path = require("path");
 var local = path.join.bind(path, __dirname);
 
 var exec = require(local("../utils/execPromise"));
-var configure = require(local("configureLibssh2"));
 var buildFlags = require(local("../utils/buildFlags"));
 
 module.exports = function prepareForBuild() {
@@ -17,9 +16,6 @@ module.exports = function prepareForBuild() {
 
       return Promise.resolve();
     })
-    .then(function() {
-      return configure();
-    })
     .then(function() {
       if (buildFlags.isGitRepo) {
         var submodules = require(local("submodules"));
diff --git a/utils/acquireOpenSSL.js b/utils/acquireOpenSSL.js
@@ -1,4 +1,3 @@
-const fs = require('fs');
 const fse = require('fs-extra');
 const path = require('path');
 const R = require('ramda');
@@ -7,7 +6,7 @@ const stream = require('stream');
 const tar = require('tar-fs');
 const zlib = require('zlib');
 
-const vendorPath = path.resolve('..', 'vendor');
+const vendorPath = path.resolve(__dirname, '..', 'vendor');
 const distrosFilePath = path.join(vendorPath, 'openssl_distributions.json');
 const extractPath = path.join(vendorPath, 'openssl');
 
diff --git a/utils/configureLibssh2.js b/utils/configureLibssh2.js
@@ -13,22 +13,21 @@ module.exports = function retrieveExternalDependencies() {
 
   return new Promise(function(resolve, reject) {
     console.info("[nodegit] Configuring libssh2.");
-    var opensslDir;
-
-    if (process.platform === "darwin") {
-      opensslDir = "vendor/openssl";
-    }
+    var opensslDir = process.argv[2];
+    var isElectron = process.argv[3] === "1";
+    var opensslIncludes = isElectron ? path.join(opensslDir, "includes") : opensslDir;
 
     var newEnv = {};
     Object.keys(process.env).forEach(function(key) {
       newEnv[key] = process.env[key];
     });
 
+    newEnv.CPPFLAGS = newEnv.CPPFLAGS || "";
+    newEnv.CPPFLAGS += ` -I${opensslIncludes}`;
+    newEnv.CPPFLAGS = newEnv.CPPFLAGS.trim();
+
     var maybeLibsslPrefix = "";
-    if (opensslDir) {
-      newEnv.CPPFLAGS = newEnv.CPPFLAGS || "";
-      newEnv.CPPFLAGS += " -I" + path.join(opensslDir, "include");
-      newEnv.CPPFLAGS = newEnv.CPPFLAGS.trim();
+    if (isElectron) {
       maybeLibsslPrefix = ` --with-libssl-prefix=${opensslDir}`;
     }
 
@@ -55,6 +54,6 @@ if (require.main === module) {
     console.log("nothing to do");
   }
   else {
-    module.exports().done();
+    module.exports();
   }
 }
