From 96de25f0156b564d65b097d3020134ebae14e54f Mon Sep 17 00:00:00 2001 From: Tim Branyen Date: Thu, 5 Mar 2015 15:47:34 -0500 Subject: [PATCH 1/9] Test in Node 0.12 --- .travis.yml | 1 + appveyor.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e861e6cd5..1d7498110 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ env: matrix: - export NODE_VERSION="0.10" + - export NODE_VERSION="0.12" before_install: - git clone https://github.com/creationix/nvm.git ./.nvm - source ./.nvm/nvm.sh diff --git a/appveyor.yml b/appveyor.yml index 3631bea15..a45606be3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,6 +20,7 @@ init: environment: matrix: - nodejs_version: 0.10 + - nodejs_version: 0.12 # Get the latest stable version of Node 0.STABLE.latest install: From 866cebce89dbb6089a34e550c8e6f50561c9262b Mon Sep 17 00:00:00 2001 From: Maximiliano Korp Date: Fri, 6 Mar 2015 09:40:52 -0700 Subject: [PATCH 2/9] add io.js to test matrix --- .travis.yml | 1 + appveyor.yml | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d7498110..de9dd3142 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ env: matrix: - export NODE_VERSION="0.10" - export NODE_VERSION="0.12" + - export NODE_VERSION="iojs" before_install: - git clone https://github.com/creationix/nvm.git ./.nvm - source ./.nvm/nvm.sh diff --git a/appveyor.yml b/appveyor.yml index a45606be3..65cf82008 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,12 +19,16 @@ init: # what combinations to test environment: matrix: - - nodejs_version: 0.10 - - nodejs_version: 0.12 + # Node.js + - nodejs_version: "0.10" + - nodejs_version: "0.12" + # io.js + - nodejs_version: "1.4.3" + # Get the latest stable version of Node 0.STABLE.latest install: - - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) + - ps: Install-Product node $env:nodejs_version - cmd: SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH% - cmd: SET PATH=c:\python27;%PATH% - cmd: SET JOBS=4 From 9be4c47bbed66196a20a6bef972ac22fa75b08d5 Mon Sep 17 00:00:00 2001 From: Maximiliano Korp Date: Fri, 6 Mar 2015 09:41:10 -0700 Subject: [PATCH 3/9] add fast-finish and allowed failures to appveyor --- appveyor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 65cf82008..b8809da7c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,6 +25,11 @@ environment: # io.js - nodejs_version: "1.4.3" +matrix: + fast_finish: true + allow_failures: + - nodejs_version: "0.10" + - nodejs_version: "1.4.3" # Get the latest stable version of Node 0.STABLE.latest install: From 18cd0b4d44ffee51b7e70376ad29c05388cf5681 Mon Sep 17 00:00:00 2001 From: Maximiliano Korp Date: Fri, 6 Mar 2015 10:08:29 -0700 Subject: [PATCH 4/9] allowed failures and fast-finish for travis --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index de9dd3142..eccf39e5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,11 @@ env: - export NODE_VERSION="0.10" - export NODE_VERSION="0.12" - export NODE_VERSION="iojs" +matrix: + fast_finish: true + allow_failures: + - env: NODE_VERSION="0.10" + - env: NODE_VERSION="iojs" before_install: - git clone https://github.com/creationix/nvm.git ./.nvm - source ./.nvm/nvm.sh From dd587153b22824d299809f73bede4d7331c28278 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 10 Mar 2015 15:38:01 -0700 Subject: [PATCH 5/9] Switch from node-gyp to pangyp Currently there's a PR (TooTallNate/node-gyp#564) that's awaiting a merge that will allow us to once again use node-gyp to compile nodegit across all platforms. Until that is merged however we can use pangyp as a stop-gap. After that PR is merged though we should switch back to node-gyp. --- lifecycleScripts/install.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index 042d8b520..c208f298b 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -90,7 +90,7 @@ function build() { var prefix = ""; var target = ""; var debug = (process.env.BUILD_DEBUG ? " --debug" : ""); - var builder = "node-gyp"; + var builder = "pangyp"; var distUrl = ""; if (asVersion) { diff --git a/package.json b/package.json index 2af20f46c..ea31ded5d 100644 --- a/package.json +++ b/package.json @@ -69,8 +69,8 @@ "lodash": "^3.1.0", "mocha": "~2.1.0", "nan": "^1.7.0", - "node-gyp": "~1.0.2", "nw-gyp": "^0.12.4", + "pangyp": "^2.1.0", "request": "^2.53.0", "tar": "^1.0.3" }, From c59309cd466fe93f95e8997f0d41d69cfed294d7 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 10 Mar 2015 16:26:48 -0700 Subject: [PATCH 6/9] Test latest iojs version on appveyor --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b8809da7c..43d9c7e82 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,13 +23,13 @@ environment: - nodejs_version: "0.10" - nodejs_version: "0.12" # io.js - - nodejs_version: "1.4.3" + - nodejs_version: "1" matrix: fast_finish: true allow_failures: - nodejs_version: "0.10" - - nodejs_version: "1.4.3" + - nodejs_version: "1" # Get the latest stable version of Node 0.STABLE.latest install: From 825ce420912851a26ed1952fde1558d30360f9dd Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 10 Mar 2015 23:05:09 -0700 Subject: [PATCH 7/9] Fix iojs build in windows --- generate/templates/templates/binding.gyp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp index 845c39a8d..06adb5307 100644 --- a/generate/templates/templates/binding.gyp +++ b/generate/templates/templates/binding.gyp @@ -52,6 +52,15 @@ ] } } + ], [ + "OS=='win'", { + "cflags": [ + "/EHsc" + ], + "defines": [ + "_HAS_EXCEPTIONS=1" + ] + } ] ] } From a11afb4fe1d3e31996f7e7a857addd2656962b74 Mon Sep 17 00:00:00 2001 From: John Haley Date: Wed, 11 Mar 2015 09:49:11 -0700 Subject: [PATCH 8/9] Fix hashsig.h location --- vendor/libgit2.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index a9a73fa40..0af36d465 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -106,7 +106,7 @@ "libgit2/src/hash.c", "libgit2/src/hash.h", "libgit2/src/hashsig.c", - "libgit2/src/hashsig.h", + "libgit2/include/git2/sys/hashsig.h", "libgit2/src/ident.c", "libgit2/src/ignore.c", "libgit2/src/ignore.h", From 766bfb7c79cc7c188bed7b0174af719613846f7a Mon Sep 17 00:00:00 2001 From: John Haley Date: Wed, 11 Mar 2015 11:22:55 -0700 Subject: [PATCH 9/9] Add note about iojs and windows --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 75b27b0ef..3e2519c6d 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,8 @@ NodeGit +***NOTE: NodeGit currently does not work with [iojs on windows](https://github.com/rvagg/pangyp/issues/4)*** + **Stable: 0.2.7** ## Have a problem? Come chat with us! ##