Fix http_parser woes

tbranyen · tbranyen · commit b7ad1c4c5c52 · 2014-10-23T10:47:36.000-04:00
diff --git a/install.js b/install.js
@@ -46,6 +46,7 @@ var paths = envOverride({
   pkg: local("package"),
   libgit2: local("vendor/libgit2/"),
   libssh2: local("vendor/libssh2/"),
+  http_parser: local("vendor/http_parser/"),
   sys: {
     include: local("include/sys/"),
     src: local("src/sys/"),
@@ -121,7 +122,7 @@ var dependencies = Q.allSettled([
   });
 })
 
-// Grab libssh2 if needed
+// Grab libssh2 if needed.
 .then(function() {
   console.info("[nodegit] Detecting vendor/libssh2.");
 
@@ -156,11 +157,55 @@ var dependencies = Q.allSettled([
   }).then(function() {
     // Only run the configuration script in a BSD-like environment.
     if (process.platform !== "win32") {
-      return Q.nfcall(exec, "cd " + paths.libssh2 + " ; " + paths.libssh2 + "configure");
+      return Q.nfcall(exec, "cd " + paths.libssh2 + " ; " + paths.libssh2 +
+        "configure");
     }
   });
 })
 
+// Grab http-parser if needed.
+.then(function() {
+  console.info("[nodegit] Detecting vendor/http_parser.");
+
+  return Q.ninvoke(fs, "stat", paths.http_parser).then(function() {
+    return Q.ninvoke(fs, "stat", paths.http_parser + pkg.http_parser.version);
+  }).fail(function() {
+    console.info("[nodegit] Removing outdated vendor/http_parser.");
+
+    // This directory is outdated, remove.
+    throw Q.ninvoke(rimraf, null, paths.http_parser);
+  });
+})
+
+// If the directory already exists, no need to refetch.
+.fail(function() {
+  // Otherwise fetch the http_parser source.
+  console.info("[nodegit] Fetching vendor/http_parser.");
+
+  var url = pkg.http_parser.url;
+
+  var extract = tar.Extract({
+    path: paths.http_parser,
+    strip: true
+  });
+
+  // First extract from Zlib and then extract from Tar.
+  var expand = request.get(url).pipe(zlib.createUnzip()).pipe(extract);
+
+  return Q.ninvoke(expand, "on", "end").then(function() {
+    // Write out a sha file for testing in the future.
+    return Q.ninvoke(fs, "writeFile", paths.http_parser +
+      pkg.http_parser.version, "");
+  }).then(function() {
+    // Only run the configuration script in a BSD-like environment.
+    if (process.platform !== "win32") {
+      return Q.nfcall(exec, "cd " + paths.http_parser + " ; " +
+        paths.http_parser + "configure");
+    }
+  });
+})
+
+
 // Build the native module using node-gyp.
 .then(function() {
   console.info("[nodegit] Building native node module.");
diff --git a/package.json b/package.json
@@ -10,6 +10,10 @@
     "url": "http://www.libssh2.org/download/libssh2-1.4.3.tar.gz",
     "version": "1.4.3"
   },
+  "http_parser": {
+    "url": "https://github.com/joyent/http-parser/archive/v2.3.tar.gz",
+    "version": "2.3.0"
+  },
   "homepage": "https://github.com/tbranyen/nodegit",
   "keywords": [
     "libgit2",
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -9,8 +9,6 @@
     "gcc_version%": 0,
     "is_clang%": 0,
   },
-  "targets": [
-  ],
   "targets": [
     {
       "target_name": "libgit2",
@@ -406,12 +404,12 @@
       "target_name": "http_parser",
       "type": "static_library",
       "sources": [
-        "libgit2/deps/http-parser/http_parser.c",
-        "libgit2/deps/http-parser/http_parser.h",
+        "http-parser/http_parser.c",
+        "http-parser/http_parser.h",
       ],
       "direct_dependent_settings": {
         "include_dirs": [
-          "libgit2/deps/http-parser",
+          "http-parser",
         ],
       },
       "conditions": [
