From 21f822e3c1981b110f345f9f407f5d4660c53fc8 Mon Sep 17 00:00:00 2001 From: sa Date: Mon, 23 Jun 2014 16:32:57 -0400 Subject: [PATCH] Fixed for node-webkit --- install.js | 6 ++++-- package.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/install.js b/install.js index 9ba6671ce3..f5107d3c5f 100644 --- a/install.js +++ b/install.js @@ -9,6 +9,8 @@ var tar = require('tar'); var which = require('which'); var rimraf = require('rimraf'); +var nwver = require('./package.json').nwVersion; + // This will take in an object and find any matching keys in the environment // to use as overrides. // @@ -114,7 +116,7 @@ var dependencies = Q.allSettled([ console.info('[nodegit] Configuring native node module.'); return Q.nfcall(exec, systemPath([ - '.', 'node_modules', '.bin', 'node-gyp configure --python ' + python + '.', 'node_modules', '.bin', 'nw-gyp configure --target=' + nwver ]), { cwd: '.' }); @@ -125,7 +127,7 @@ var dependencies = Q.allSettled([ console.info('[nodegit] Building native node module.'); return Q.nfcall(exec, systemPath([ - '.', 'node_modules', '.bin', 'node-gyp build' + '.', 'node_modules', '.bin', 'nw-gyp build' ]), { cwd: '.', maxBuffer: Number.MAX_VALUE diff --git a/package.json b/package.json index 68737a73c4..0d63e24bd3 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ "request": "~2.36.0", "rimraf": "~2.2.8", "tar": "~0.1.19", - "which": "~1.0.5" + "which": "~1.0.5", + "nw-gyp": "~0.12.2" }, "devDependencies": { "async": "~0.9.0", @@ -64,5 +65,6 @@ "test": "cd test && nodeunit nodegit.js", "codegen": "node build/codegen/generate.js", "publish": "node-pre-gyp package && node-pre-gyp publish" - } + }, + "nwVersion": "0.10.0-rc1" }