Merge pull request #815 from nodegit/pr/812

johnhaley81 · johnhaley81 · commit a586bd53ecec · 2015-12-08T16:39:54.000-07:00
Let node-pre-gyp handle Electron/nwjs
diff --git a/.didntcomefromthenpmregistry b/.didntcomefromthenpmregistry
diff --git a/.npmignore b/.npmignore
@@ -15,7 +15,6 @@
 .jshintrc
 .travis.yml
 appveyor.yml
-.didntcomefromthenpmregistry
 
 *.vcxproj
 *.filters
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -2,63 +2,59 @@ var promisify = require("promisify-node");
 var path = require("path");
 var fs = require("fs");
 
-var whichNativeNodish = require("which-native-nodish");
 var prepareForBuild = require("./prepareForBuild");
 
 var exec = promisify(function(command, opts, callback) {
   return require("child_process").exec(command, opts, callback);
 });
-var nwVersion = null;
-var asVersion = null;
-
-var local = path.join.bind(path, __dirname);
-
-return whichNativeNodish("..")
-  .then(function(results) {
-    nwVersion = results.nwVersion;
-    asVersion = results.asVersion;
-  })
-  .then(function() {
-    if (fs.existsSync(local("../.didntcomefromthenpmregistry"))) {
-      return prepareAndBuild();
-    }
-    if (process.env.BUILD_DEBUG) {
-      console.info("[nodegit] Doing a debug build, no fetching allowed.");
-      return prepareAndBuild();
-    }
-    if (process.env.BUILD_ONLY) {
-      console.info("[nodegit] BUILD_ONLY is set to true, no fetching allowed.");
-      return prepareAndBuild();
-    }
-    var args = [];
-    if (asVersion) {
-      args.push("--runtime=electron");
-      args.push("--target=" + asVersion);
-      args.push("--is_clang=1");
-    } else if (nwVersion) {
-      args.push("--runtime=node-webkit");
-      args.push("--target=" + nwVersion);
-    }
-    return installPrebuilt(args);
-  });
 
-function installPrebuilt(args) {
+var fromRegistry;
+try {
+  fs.statSync(path.join(__dirname, "..", "include"));
+  fs.statSync(path.join(__dirname, "..", "src"));
+  fromRegistry = true;
+}
+catch(e) {
+  fromRegistry = false;
+}
+
+if (!fromRegistry) {
+  console.info("[nodegit] Local install, no fetching allowed.");
+  return prepareAndBuild();
+}
+if (process.env.BUILD_DEBUG) {
+  console.info("[nodegit] Doing a debug build, no fetching allowed.");
+  return prepareAndBuild();
+}
+if (process.env.BUILD_ONLY) {
+  console.info("[nodegit] BUILD_ONLY is set to true, no fetching allowed.");
+  return prepareAndBuild();
+}
+
+return installPrebuilt();
+
+function installPrebuilt() {
   console.info("[nodegit] Fetching binary from S3.");
-  var installArguments = args.join(" ");
-  return exec("node-pre-gyp install " + installArguments)
+  var npg = pathForTool("node-pre-gyp");
+  return exec(npg + " install --fallback-to-build=false")
     .then(
       function() {
         console.info("[nodegit] Completed installation successfully.");
       },
       function(err) {
-        console.info("[nodegit] Failed to install prebuilt binary, " +
-          "building manually.");
+        console.info("[nodegit] Failed to install prebuilt binary:");
         console.error(err);
+        console.info("[nodegit] Building manually. (You'll be here a while.)");
         return prepareAndBuild();
       }
     );
 }
 
+function pathForTool(name) {
+  var toolPath = path.resolve(".", "node_modules", ".bin", name);
+  toolPath = toolPath.replace(/\s/g, "\\$&");
+  return toolPath;
+}
 
 function prepareAndBuild() {
   console.info("[nodegit] Regenerating and configuring code");
@@ -70,44 +66,53 @@ function prepareAndBuild() {
 
 function build() {
   console.info("[nodegit] Everything is ready to go, attempting compilation");
-  if (nwVersion) {
-    console.info("[nodegit] Building native node-webkit module.");
-  }
-  else {
-    console.info("[nodegit] Building native node module.");
-  }
 
+  var electronVersion = process.env.ELECTRON_VERSION;
+  var nwjsVersion = process.env.NWJS_VERSION;
   var opts = {
     cwd: ".",
     maxBuffer: Number.MAX_VALUE,
     env: process.env
   };
 
-  var target = "";
-  var debug = (process.env.BUILD_DEBUG ? " --debug" : "");
   var builder = "node-gyp";
-  var distUrl = "";
-
-  if (asVersion) {
-    var home = process.platform == "win32" ?
-            process.env.USERPROFILE : process.env.HOME;
-
-    opts.env.HOME = path.join(home, ".atom-shell-gyp");
+  var debug = (process.env.BUILD_DEBUG ? " --debug" : "");
+  var target;
+  var distUrl;
 
-    target = "--target=" + asVersion;
+  process.argv.forEach(function(arg) {
+    if (~arg.indexOf("electronVersion")) {
+      electronVersion = arg.split("=")[1].trim();
+    }
+    else if (~arg.indexOf("nsjwVersion")) {
+      nwjsVersion = arg.split("=")[1].trim();
+    }
+  });
 
+  if (electronVersion) {
+    target = "--target=" + electronVersion;
     distUrl = "--dist-url=https://gh-contractor-zcbenz.s3." +
       "amazonaws.com/atom-shell/dist";
   }
-  else if (nwVersion) {
+  else if (nwjsVersion) {
     builder = "nw-gyp";
-    target = "--target=" + nwVersion;
+    target = "--target=" + nwjsVersion;
   }
 
-  builder = path.resolve(".", "node_modules", ".bin", builder);
-  builder = builder.replace(/\s/g, "\\$&");
-  var cmd = [builder, "rebuild", target, debug, distUrl]
-    .join(" ").trim();
+  var home = process.platform == "win32" ?
+              process.env.USERPROFILE : process.env.HOME;
+
+  opts.env.HOME = path.join(home, ".nodegit-gyp");
+
+  var cmd = [
+    pathForTool(builder),
+    "rebuild",
+    debug,
+    target,
+    distUrl
+  ]
+  .join(" ")
+  .trim();
 
   return exec(cmd, opts)
     .then(function() {
diff --git a/package.json b/package.json
@@ -40,8 +40,7 @@
     "fs-extra": "~0.26.2",
     "node-pre-gyp": "~0.6.15",
     "nodegit-promise": "~4.0.0",
-    "promisify-node": "~0.3.0",
-    "which-native-nodish": "~1.1.3"
+    "promisify-node": "~0.3.0"
   },
   "devDependencies": {
     "clean-for-publish": "~1.0.2",
