Ensures that the correct http_parser is used

tbranyen · tbranyen · commit bebd459e45ed · 2014-10-23T10:47:36.000-04:00
There is a new http_parser version 2.3.0 that is required for Node 0.11.
This PR will fall back to support 0.10.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 /node_modules/
 /vendor/libgit2/
 /vendor/libssh2/
+/vendor/http_parser/
 /build/
 /coverage/
 /test/repos/
diff --git a/install.js b/install.js
@@ -8,6 +8,7 @@ var request = require("request");
 var tar = require("tar");
 var which = require("which");
 var rimraf = require("rimraf");
+var NODE_VERSION = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
 
 // This will take in an object and find any matching keys in the environment
 // to use as overrides.
@@ -58,6 +59,10 @@ var paths = envOverride({
 // Load the package.json.
 var pkg = require(paths.pkg);
 
+if (NODE_VERSION === 0.1) {
+  pkg.http_parser = pkg.http_parser["0.10"];
+}
+
 // Ensure all dependencies are available.
 var dependencies = Q.allSettled([
   // This will prioritize `python2` over `python`, because we always want to
@@ -196,12 +201,6 @@ var dependencies = Q.allSettled([
     // 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");
-    }
   });
 })
 
diff --git a/package.json b/package.json
@@ -12,7 +12,12 @@
   },
   "http_parser": {
     "url": "https://github.com/joyent/http-parser/archive/v2.3.tar.gz",
-    "version": "2.3.0"
+    "version": "2.3.0",
+
+    "0.10": {
+      "url": "https://github.com/joyent/http-parser/archive/v2.0.tar.gz",
+      "version": "2.0.0"
+    }
   },
   "homepage": "https://github.com/tbranyen/nodegit",
   "keywords": [
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -22,7 +22,7 @@
       ],
       "dependencies": [
         "zlib",
-        "http_parser",
+        "<(module_root_dir)/vendor/http_parser/http_parser.gyp:http_parser",
         "libssh2",
         "openssl"
       ],
@@ -400,27 +400,6 @@
         ],
       },
     },
-    {
-      "target_name": "http_parser",
-      "type": "static_library",
-      "sources": [
-        "http-parser/http_parser.c",
-        "http-parser/http_parser.h",
-      ],
-      "direct_dependent_settings": {
-        "include_dirs": [
-          "http-parser",
-        ],
-      },
-      "conditions": [
-        ["OS=='win'", {
-          "msvs_disabled_warnings": [
-            # Conversion from 'ssize_t' to 'int32_t', possible loss of data.
-            4244,
-          ],
-        }],
-      ],
-    },
     {
       "target_name": "libssh2",
       "type": "static_library",
