Merge pull request #783 from atom/use-node-pre-gyp

johnhaley81 · johnhaley81 · commit 1967b99d1ad6 · 2015-11-11T11:53:30.000-07:00
Allow node-pre-gyp for Electron and node-webkit
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -19,14 +19,6 @@ return whichNativeNodish("..")
     asVersion = results.asVersion;
   })
   .then(function() {
-    if (nwVersion) {
-      console.info("[nodegit] Must build for node-webkit/nw.js");
-      return prepareAndBuild();
-    }
-    else if (asVersion) {
-      console.info("[nodegit] Must build for atom-shell");
-      return prepareAndBuild();
-    }
     if (fs.existsSync(local("../.didntcomefromthenpmregistry"))) {
       return prepareAndBuild();
     }
@@ -38,21 +30,34 @@ return whichNativeNodish("..")
       console.info("[nodegit] BUILD_ONLY is set to true, no fetching allowed.");
       return prepareAndBuild();
     }
-    console.info("[nodegit] Fetching binary from S3.");
-    return exec("node-pre-gyp install")
-      .then(
-        function() {
-          console.info("[nodegit] Completed installation successfully.");
-        },
-        function(err) {
-          console.info("[nodegit] Failed to install prebuilt binary, " +
-            "building manually.");
-          console.error(err);
-          return prepareAndBuild();
-        }
-      );
+    var args = [];
+    if (asVersion) {
+      args.push("--runtime=electron");
+      args.push("--target=" + asVersion);
+    } else if (nwVersion) {
+      args.push("--runtime=node-webkit");
+      args.push("--target=" + nwVersion);
+    }
+    return installPrebuilt(args);
   });
 
+function installPrebuilt(args) {
+  console.info("[nodegit] Fetching binary from S3.");
+  var installArguments = args.join(" ");
+  return exec("node-pre-gyp install " + installArguments)
+    .then(
+      function() {
+        console.info("[nodegit] Completed installation successfully.");
+      },
+      function(err) {
+        console.info("[nodegit] Failed to install prebuilt binary, " +
+          "building manually.");
+        console.error(err);
+        return prepareAndBuild();
+      }
+    );
+}
+
 
 function prepareAndBuild() {
   console.info("[nodegit] Regenerating and configuring code");
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "fs-extra": "^0.24.0",
-    "node-pre-gyp": "^0.6.10",
+    "node-pre-gyp": "^0.6.15",
     "nodegit-promise": "^3.0.3",
     "npm": "^3.3.3",
     "promisify-node": "^0.2.1",
