From 8407329602addecc2300d5f7141bf828d5cb0d7f Mon Sep 17 00:00:00 2001 From: Tim Branyen Date: Sat, 14 Mar 2015 13:26:36 -0400 Subject: [PATCH 1/3] Revert node-pre-gyp to install not build Regression introduced: https://github.com/nodegit/nodegit/commit/20ca86f1c027c39de4d0073e51597b0eda917134 --- lifecycleScripts/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index d83961053..acdf290d8 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -39,7 +39,7 @@ return whichNativeNodish("..") return checkAndBuild(); } console.info("[nodegit] Fetching binary from S3."); - return exec("node-pre-gyp build") + return exec("node-pre-gyp install") .then( function() { console.info("[nodegit] Completed installation successfully."); From 070ae125179e10cf130856427a267813775b1bf1 Mon Sep 17 00:00:00 2001 From: Tim Branyen Date: Sat, 14 Mar 2015 13:33:47 -0400 Subject: [PATCH 2/3] Convert remaining scripts over to pangyp --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index bf86072ec..cc5524d05 100644 --- a/package.json +++ b/package.json @@ -93,9 +93,9 @@ "install": "node lifecycleScripts/install", "installDebug": "BUILD_DEBUG=true npm install", "postinstall": "node lifecycleScripts/clean", - "recompile": "node-gyp configure build", - "rebuild": "node generate && node-gyp configure build", - "recompileDebug": "node-gyp configure --debug build", - "rebuildDebug": "node generate && node-gyp configure --debug build" + "recompile": "pangyp configure build", + "rebuild": "node generate && pangyp configure build", + "recompileDebug": "pangyp configure --debug build", + "rebuildDebug": "node generate && pangyp configure --debug build" } } From 4e00f37992ae69805db9aeeaea58b26b31b7eb5a Mon Sep 17 00:00:00 2001 From: Tim Branyen Date: Sat, 14 Mar 2015 15:13:55 -0400 Subject: [PATCH 3/3] Bump to 0.3.1 Fixes issues with our installation process. --- README.md | 2 +- lifecycleScripts/install.js | 4 +++- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3df76d1a4..8c7ab05aa 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ NodeGit ***NOTE: NodeGit currently does not work with [iojs on windows](https://github.com/rvagg/pangyp/issues/4)*** -**Stable: 0.3.0** +**Stable: 0.3.1** ## Have a problem? Come chat with us! ## diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index acdf290d8..7b5f8dc93 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -13,6 +13,8 @@ var exec = promisify(function(command, opts, callback) { var nwVersion = null; var asVersion = null; +var local = path.join.bind(path, __dirname); + return whichNativeNodish("..") .then(function(results) { nwVersion = results.nwVersion; @@ -27,7 +29,7 @@ return whichNativeNodish("..") console.info("[nodegit] Must build for atom-shell"); return checkAndBuild(); } - if (fs.existsSync("../.didntcomefromthenpmregistry")) { + if (fs.existsSync(local("../.didntcomefromthenpmregistry"))) { return checkAndBuild(); } if (process.env.BUILD_DEBUG) { diff --git a/package.json b/package.json index cc5524d05..34901e4ff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.3.0", + "version": "0.3.1", "libgit2": { "url": "https://github.com/nodegit/libgit2/tarball/4b3a1899ff37dddba0a095487505fed9ede101b1", "sha": "4b3a1899ff37dddba0a095487505fed9ede101b1",