summaryrefslogtreecommitdiff
path: root/deps/npm/node_modules
diff options
context:
space:
mode:
authorKat Marchán <kzm@sykosomatic.org>2015-09-18 18:09:51 -0700
committerJeremiah Senkpiel <fishrock123@rocketmail.com>2015-09-20 10:16:30 -0700
commit2c09a5364e72471a06ad7528d8b61101afd59ff1 (patch)
treeb37a05049c9842e657b13788a1c1e7a89f9e3002 /deps/npm/node_modules
parent57c44324c19119de7c4bb714eae955654bbcc324 (diff)
downloadandroid-node-v8-2c09a5364e72471a06ad7528d8b61101afd59ff1.tar.gz
android-node-v8-2c09a5364e72471a06ad7528d8b61101afd59ff1.tar.bz2
android-node-v8-2c09a5364e72471a06ad7528d8b61101afd59ff1.zip
deps: upgraded to node-gyp@3.0.3 in npm
PR-URL: https://github.com/nodejs/node/pull/2958 Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/node_modules')
l---------deps/npm/node_modules/.bin/node-gyp1
-rw-r--r--deps/npm/node_modules/node-gyp/CHANGELOG.md9
-rw-r--r--deps/npm/node_modules/node-gyp/README.md2
-rw-r--r--deps/npm/node_modules/node-gyp/lib/process-release.js5
-rw-r--r--deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json3
-rw-r--r--deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json3
-rw-r--r--deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.jshintrc4
-rw-r--r--deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.jshintrc3
-rw-r--r--deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json3
-rw-r--r--deps/npm/node_modules/node-gyp/node_modules/path-array/package.json3
-rw-r--r--deps/npm/node_modules/node-gyp/node_modules/tar/package.json3
-rw-r--r--deps/npm/node_modules/node-gyp/package.json19
-rw-r--r--deps/npm/node_modules/node-gyp/test/test-process-release.js27
13 files changed, 67 insertions, 18 deletions
diff --git a/deps/npm/node_modules/.bin/node-gyp b/deps/npm/node_modules/.bin/node-gyp
new file mode 120000
index 0000000000..9b31a4fe43
--- /dev/null
+++ b/deps/npm/node_modules/.bin/node-gyp
@@ -0,0 +1 @@
+../node-gyp/bin/node-gyp.js \ No newline at end of file
diff --git a/deps/npm/node_modules/node-gyp/CHANGELOG.md b/deps/npm/node_modules/node-gyp/CHANGELOG.md
index 0c88cbfa18..4c8cc36781 100644
--- a/deps/npm/node_modules/node-gyp/CHANGELOG.md
+++ b/deps/npm/node_modules/node-gyp/CHANGELOG.md
@@ -1,3 +1,12 @@
+v3.0.3 2015-09-14
+
+* [[`ad827cda30`](https://github.com/nodejs/node-gyp/commit/ad827cda30)] - tarballUrl global and && when checking for iojs (Lars-Magnus Skog) [#729](https://github.com/nodejs/node-gyp/pull/729)
+
+v3.0.2 2015-09-12
+
+* [[`6e8c3bf3c6`](https://github.com/nodejs/node-gyp/commit/6e8c3bf3c6)] - add back support for passing additional cmdline args (Rod Vagg) [#723](https://github.com/nodejs/node-gyp/pull/723)
+* [[`ff82f2f3b9`](https://github.com/nodejs/node-gyp/commit/ff82f2f3b9)] - fixed broken link in docs to Visual Studio 2013 download (simon-p-r) [#722](https://github.com/nodejs/node-gyp/pull/722)
+
v3.0.1 2015-09-08
* [[`846337e36b`](https://github.com/nodejs/node-gyp/commit/846337e36b)] - normalise versions for target == this comparison (Rod Vagg) [#716](https://github.com/nodejs/node-gyp/pull/716)
diff --git a/deps/npm/node_modules/node-gyp/README.md b/deps/npm/node_modules/node-gyp/README.md
index 71f1f6bd21..779dc6adc2 100644
--- a/deps/npm/node_modules/node-gyp/README.md
+++ b/deps/npm/node_modules/node-gyp/README.md
@@ -187,6 +187,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[windows-python]: http://www.python.org/getit/windows
[windows-python-v2.7.3]: http://www.python.org/download/releases/2.7.3#download
-[msvc2013]: http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs
+[msvc2013]: http://www.microsoft.com/en-gb/download/details.aspx?id=44914
[win7sdk]: http://www.microsoft.com/en-us/download/details.aspx?id=8279
[compiler update for the Windows SDK 7.1]: http://www.microsoft.com/en-us/download/details.aspx?id=4422
diff --git a/deps/npm/node_modules/node-gyp/lib/process-release.js b/deps/npm/node_modules/node-gyp/lib/process-release.js
index 2da45eba8e..2a574f437e 100644
--- a/deps/npm/node_modules/node-gyp/lib/process-release.js
+++ b/deps/npm/node_modules/node-gyp/lib/process-release.js
@@ -10,7 +10,7 @@ var semver = require('semver')
// file names. Inputs come from command-line switches (--target, --dist-url),
// `process.version` and `process.release` where it exists.
function processRelease (argv, gyp, defaultVersion, defaultRelease) {
- var version = argv[0] || gyp.opts.target || defaultVersion
+ var version = (semver.valid(argv[0]) && argv[0]) || gyp.opts.target || defaultVersion
, versionSemver = semver.parse(version)
, overrideDistUrl = gyp.opts['dist-url'] || gyp.opts.disturl
, isDefaultVersion
@@ -20,6 +20,7 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
, baseUrl
, libUrl32
, libUrl64
+ , tarballUrl
if (!versionSemver) {
// not a valid semver string, nothing we can do
@@ -42,7 +43,7 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
} else {
// old node or alternative --target=
// semver.satisfies() doesn't like prerelease tags so test major directly
- isIojs = versionSemver.major >= 1 & versionSemver.major < 4
+ isIojs = versionSemver.major >= 1 && versionSemver.major < 4
name = isIojs ? 'iojs' : 'node'
}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
index b516138098..386ed51601 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
@@ -78,6 +78,5 @@
}
],
"_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
- "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "readme": "ERROR: No README data found!"
+ "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json b/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json
index ed21c51376..8bf46ccae0 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json
@@ -53,5 +53,6 @@
"tarball": "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"
+ "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+ "readme": "ERROR: No README data found!"
}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.jshintrc b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.jshintrc
new file mode 100644
index 0000000000..182e34d07d
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.jshintrc
@@ -0,0 +1,4 @@
+{
+ "asi": true,
+ "laxcomma": true
+}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.jshintrc b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.jshintrc
new file mode 100644
index 0000000000..299877f26a
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.jshintrc
@@ -0,0 +1,3 @@
+{
+ "laxbreak": true
+}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
index 8ed83ab243..6ba9df72c2 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
@@ -53,5 +53,6 @@
"tarball": "http://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz"
+ "_resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+ "readme": "ERROR: No README data found!"
}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/package.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/package.json
index ad8edc9f83..41d25482b8 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/path-array/package.json
@@ -51,5 +51,6 @@
"tarball": "http://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz"
+ "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+ "readme": "ERROR: No README data found!"
}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/tar/package.json b/deps/npm/node_modules/node-gyp/node_modules/tar/package.json
index 5aa78aec30..7fab5394cd 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/tar/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/tar/package.json
@@ -56,5 +56,6 @@
"tarball": "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
+ "_resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz",
+ "readme": "ERROR: No README data found!"
}
diff --git a/deps/npm/node_modules/node-gyp/package.json b/deps/npm/node_modules/node-gyp/package.json
index f7638d4007..76fc168f2d 100644
--- a/deps/npm/node_modules/node-gyp/package.json
+++ b/deps/npm/node_modules/node-gyp/package.json
@@ -11,7 +11,7 @@
"bindings",
"gyp"
],
- "version": "3.0.1",
+ "version": "3.0.3",
"installVersion": 9,
"author": {
"name": "Nathan Rajlich",
@@ -52,16 +52,16 @@
"scripts": {
"test": "tape test/test-*"
},
- "gitHead": "112afb4466eafe8bf9d7c72cfac94222d952c370",
+ "gitHead": "d6b03851d366c7fa78e7d2f57c61bb074ea45ea3",
"bugs": {
"url": "https://github.com/nodejs/node-gyp/issues"
},
"homepage": "https://github.com/nodejs/node-gyp",
- "_id": "node-gyp@3.0.1",
- "_shasum": "597a2069786a443add5eecffc160f5d6c7045cd7",
- "_from": "node-gyp@3.0.1",
+ "_id": "node-gyp@3.0.3",
+ "_shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
+ "_from": "node-gyp@3.0.3",
"_npmVersion": "2.14.2",
- "_nodeVersion": "4.0.0-rc.4",
+ "_nodeVersion": "4.0.0",
"_npmUser": {
"name": "rvagg",
"email": "rod@vagg.org"
@@ -89,9 +89,10 @@
}
],
"dist": {
- "shasum": "597a2069786a443add5eecffc160f5d6c7045cd7",
- "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.0.1.tgz"
+ "shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
+ "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.1.tgz"
+ "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
+ "readme": "ERROR: No README data found!"
}
diff --git a/deps/npm/node_modules/node-gyp/test/test-process-release.js b/deps/npm/node_modules/node-gyp/test/test-process-release.js
index c0fbbf624e..33655ab726 100644
--- a/deps/npm/node_modules/node-gyp/test/test-process-release.js
+++ b/deps/npm/node_modules/node-gyp/test/test-process-release.js
@@ -421,3 +421,30 @@ test('test process release - process.release ~ node@4.0.0-rc.4 passed as argv[0]
})
})
+
+test('test process release - process.release ~ node@4.0.0-rc.4 - bogus string passed as argv[0]', function (t) {
+ t.plan(2)
+
+ // additional arguments can be passed in on the commandline that should be ignored if they
+ // are not specifying a valid version @ position 0
+ var release = processRelease([ 'this is no version!' ], { opts: {} }, 'v4.0.0-rc.4', {
+ name: 'node',
+ headersUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz'
+ })
+
+ t.equal(release.semver.version, '4.0.0-rc.4')
+ delete release.semver
+
+ t.deepEqual(release, {
+ version: '4.0.0-rc.4',
+ name: 'node',
+ baseUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/',
+ tarballUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz',
+ shasumsUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/SHASUMS256.txt',
+ versionDir: '4.0.0-rc.4',
+ libUrl32: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x86/node.lib',
+ libUrl64: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x64/node.lib',
+ libPath32: 'win-x86/node.lib',
+ libPath64: 'win-x64/node.lib'
+ })
+})