fix build

maxkorp · maxkorp · commit a2848602ab74 · 2015-08-27T00:23:38.000-07:00
diff --git a/generate/index.js b/generate/index.js
@@ -1,11 +1,20 @@
+var Promise = require('nodegit-promise');
 var generateJson = require("./scripts/generateJson");
 var generateNativeCode = require("./scripts/generateNativeCode");
 var generateMissingTests = require("./scripts/generateMissingTests");
 
 module.exports = function generate() {
-  generateJson();
-  generateNativeCode();
-  generateMissingTests();
+  return new Promise(function(resolve, reject) {
+    try {
+      generateJson();
+      generateNativeCode();
+      generateMissingTests();
+      resolve();
+    }
+    catch(e) {
+      reject(e);
+    }
+  });
 }
 
 if (require.main === module) {
diff --git a/generate/scripts/generateJson.js b/generate/scripts/generateJson.js
@@ -3,7 +3,7 @@ const path = require("path");
 const utils = require("./utils");
 var _;
 
-var version = require("../../package.json").libgit2.version;
+var version = require("../../package.json").vendorDependencies.libgit2.version;
 var libgit2 = require("../input/v" + version + ".json");
 var descriptor = require("../input/descriptor.json");
 var supplement = require("../input/libgit2-supplement.json");
diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js
@@ -5,7 +5,7 @@ var utils = require("./utils");
 var _ = require("lodash");
 
 // TODO: When libgit2's docs include callbacks we should be able to remove this
-var version = require("../../package.json").libgit2.version;
+var version = require("../../package.json").vendorDependencies.libgit2.version;
 var callbackDefs = require("../input/callbacks.json");
 var descriptor = require("../input/descriptor.json");
 var libgit2 = require("../input/v" + version + ".json");
diff --git a/lifecycleScripts/checkPrepared.js b/lifecycleScripts/checkPrepared.js
diff --git a/lifecycleScripts/configureLibssh2.js b/lifecycleScripts/configureLibssh2.js
@@ -0,0 +1,38 @@
+var Promise = require("nodegit-promise");
+var cp = require("child_process");
+var path = require("path");
+var rooted = path.join.bind(path, __dirname, "..");
+
+module.exports = function retrieveExternalDependencies() {
+  if (process.platform === "win32") {
+    return Promise.resolve("");
+  }
+
+  return new Promise(function(resolve, reject) {
+    console.info("[nodegit] Configuring libssh2.");
+    cp.execFile(
+      rooted("vendor/libssh2/") + "configure",
+      {cwd: rooted("vendor/libssh2/")},
+      function(err, stdout, stderr) {
+        if (err) {
+          console.error(err);
+          console.error(stderr);
+          reject(err, stderr);
+        }
+        else {
+          resolve(stdout);
+        }
+      }
+    );
+  });
+};
+
+// Called on the command line
+if (require.main === module) {
+  if (process.platform === "win32") {
+    console.log("nothing to do");
+  }
+  else {
+    module.exports();
+  }
+}
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -1,9 +1,7 @@
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var path = require("path");
 var fs = require("fs");
 
-var checkPrepared = require("./checkPrepared");
 var whichNativeNodish = require("which-native-nodish");
 var prepareForBuild = require("./prepareForBuild");
 
@@ -23,22 +21,22 @@ return whichNativeNodish("..")
   .then(function() {
     if (nwVersion) {
       console.info("[nodegit] Must build for node-webkit/nw.js");
-      return checkAndBuild();
+      return prepareAndBuild();
     }
     else if (asVersion) {
       console.info("[nodegit] Must build for atom-shell");
-      return checkAndBuild();
+      return prepareAndBuild();
     }
     if (fs.existsSync(local("../.didntcomefromthenpmregistry"))) {
-      return checkAndBuild();
+      return prepareAndBuild();
     }
     if (process.env.BUILD_DEBUG) {
       console.info("[nodegit] Doing a debug build, no fetching allowed.");
-      return checkAndBuild();
+      return prepareAndBuild();
     }
     if (process.env.BUILD_ONLY) {
       console.info("[nodegit] BUILD_ONLY is set to true, no fetching allowed.");
-      return checkAndBuild();
+      return prepareAndBuild();
     }
     console.info("[nodegit] Fetching binary from S3.");
     return exec("node-pre-gyp install")
@@ -49,27 +47,15 @@ return whichNativeNodish("..")
         function() {
           console.info("[nodegit] Failed to install prebuilt binary, " +
             "building manually.");
-          return checkAndBuild();
+          return prepareAndBuild();
         }
       );
   });
 
 
-function checkAndBuild() {
-  console.info("[nodegit] Making sure dependencies are available and native " +
-    "code is generated");
-
-  return checkPrepared.checkAll()
-    .then(function(allGood) {
-      if (allGood) {
-        return Promise.resolve();
-      }
-      else {
-        console.info("[nodegit] Something is missing, retrieving " +
-        "dependencies and regenerating code");
-        return prepareForBuild();
-      }
-    })
+function prepareAndBuild() {
+  console.info("[nodegit] Regenerating and configuring code");
+  return prepareForBuild()
     .then(function() {
       return build();
     });
diff --git a/lifecycleScripts/prepareForBuild.js b/lifecycleScripts/prepareForBuild.js
@@ -4,8 +4,7 @@ var path = require("path");
 
 var local = path.join.bind(path, __dirname);
 
-var check = require(local("checkPrepared")).checkGenerated;
-var retrieve = require(local("retrieveExternalDependencies"));
+var configure = require(local("configureLibssh2"));
 var generate = require(local("../generate"));
 
 module.exports = function prepareForBuild() {
@@ -23,39 +22,12 @@ module.exports = function prepareForBuild() {
     });
   }).then(function() {
     return Promise.all([
-      retrieve(),
-      doGenerate()
+      configure(),
+      generate()
     ]);
   });
 };
 
-function doGenerate() {
-  console.info("[nodegit] Detecting generated code.");
-  return check().then(function(allThere) {
-    if (allThere) {
-      console.info("[nodegit] Generated code is intact.");
-      return Promise.resolve();
-    }
-    else {
-      console.info("[nodegit] Generated code is missing or incomplete, " +
-        "regenerating now.");
-
-      return new Promise(function(resolve, reject) {
-        try {
-          generate();
-          console.info("[nodegit] Code regenerated.");
-          resolve();
-        }
-        catch (e) {
-          console.info("[nodegit] Error generating code.");
-          console.info(e);
-          //console.info(stderr);
-          reject(e);
-        }
-      });
-    }
-  });
-}
 // Called on the command line
 if (require.main === module) {
   module.exports();
diff --git a/lifecycleScripts/retrieveExternalDependencies.js b/lifecycleScripts/retrieveExternalDependencies.js
