node-gyp@3.6.1

11 files changed, 69 insertions, 145 deletions

diff --git a/node_modules/node-gyp/0001-gyp-always-install-into-PRODUCT_DIR.patch b/node_modules/node-gyp/0001-gyp-always-install-into-PRODUCT_DIR.patch
deleted file mode 100644
index 694913f59..000000000
--- a/node_modules/node-gyp/0001-gyp-always-install-into-PRODUCT_DIR.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9b5e8dc426ada891d67d27b09acc73122ab46849 Mon Sep 17 00:00:00 2001
-From: Nathan Rajlich <nathan@tootallnate.net>
-Date: Wed, 14 Nov 2012 16:48:52 -0800
-Subject: [PATCH 1/3] gyp: always install into $PRODUCT_DIR
-
----
- gyp/pylib/gyp/generator/make.py | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py
-index b88a433..9b3e4e3 100644
---- a/gyp/pylib/gyp/generator/make.py
-+++ b/gyp/pylib/gyp/generator/make.py
-@@ -1888,11 +1888,13 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
-     """Returns the location of the final output for an installable target."""
-     # Xcode puts shared_library results into PRODUCT_DIR, and some gyp files
-     # rely on this. Emulate this behavior for mac.
--    if (self.type == 'shared_library' and
--        (self.flavor != 'mac' or self.toolset != 'target')):
--      # Install all shared libs into a common directory (per toolset) for
--      # convenient access with LD_LIBRARY_PATH.
--      return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
-+
-+    # XXX(TooTallNate): disabling this code since we don't want this behavior...
-+    #if (self.type == 'shared_library' and
-+    #    (self.flavor != 'mac' or self.toolset != 'target')):
-+    #  # Install all shared libs into a common directory (per toolset) for
-+    #  # convenient access with LD_LIBRARY_PATH.
-+    #  return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
-     return '$(builddir)/' + self.alias
- 
- 
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/node_modules/node-gyp/0002-gyp-apply-https-codereview.chromium.org-11361103.patch b/node_modules/node-gyp/0002-gyp-apply-https-codereview.chromium.org-11361103.patch
deleted file mode 100644
index d1c5cac71..000000000
--- a/node_modules/node-gyp/0002-gyp-apply-https-codereview.chromium.org-11361103.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 511840e82116662aa825088fb8a52a9f799f7767 Mon Sep 17 00:00:00 2001
-From: Nathan Rajlich <nathan@tootallnate.net>
-Date: Wed, 14 Nov 2012 16:54:04 -0800
-Subject: [PATCH 2/3] gyp: apply https://codereview.chromium.org/11361103/
-
----
- gyp/pylib/gyp/generator/msvs.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/gyp/pylib/gyp/generator/msvs.py b/gyp/pylib/gyp/generator/msvs.py
-index d8e0872..c59aea1 100644
---- a/gyp/pylib/gyp/generator/msvs.py
-+++ b/gyp/pylib/gyp/generator/msvs.py
-@@ -2720,6 +2720,9 @@ def _GetMSBuildAttributes(spec, config, build_file):
-     product_name = spec.get('product_name', '$(ProjectName)')
-     target_name = prefix + product_name
-     msbuild_attributes['TargetName'] = target_name
-+  if 'TargetExt' not in msbuild_attributes and 'product_extension' in spec:
-+    ext = spec.get('product_extension')
-+    msbuild_attributes['TargetExt'] = '.' + ext
- 
-   if spec.get('msvs_external_builder'):
-     external_out_dir = spec.get('msvs_external_builder_out_dir', '.')
-@@ -2773,6 +2776,9 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
-                             attributes['OutputDirectory'])
-     _AddConditionalProperty(properties, condition, 'TargetName',
-                             attributes['TargetName'])
-+    if 'TargetExt' in attributes:
-+      _AddConditionalProperty(properties, condition, 'TargetExt',
-+                              attributes['TargetExt'])
- 
-     if attributes.get('TargetPath'):
-       _AddConditionalProperty(properties, condition, 'TargetPath',
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/node_modules/node-gyp/0003-gyp-don-t-use-links-at-all-just-copy-the-files-inste.patch b/node_modules/node-gyp/0003-gyp-don-t-use-links-at-all-just-copy-the-files-inste.patch
deleted file mode 100644
index 673a3ddd3..000000000
--- a/node_modules/node-gyp/0003-gyp-don-t-use-links-at-all-just-copy-the-files-inste.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0cd9f08a6d4f4be6643001b6c3b5ad40e094bdcc Mon Sep 17 00:00:00 2001
-From: Nathan Zadoks <nathan@nathan7.eu>
-Date: Tue, 2 Jul 2013 11:07:16 -0700
-Subject: [PATCH 3/3] gyp: don't use links at all, just copy the files instead
-
----
- gyp/pylib/gyp/generator/make.py  | 2 +-
- gyp/pylib/gyp/generator/ninja.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py
-index 9b3e4e3..b3f8a2b 100644
---- a/gyp/pylib/gyp/generator/make.py
-+++ b/gyp/pylib/gyp/generator/make.py
-@@ -372,7 +372,7 @@ cmd_touch = touch $@
- 
- quiet_cmd_copy = COPY $@
- # send stderr to /dev/null to ignore messages when linking directories.
--cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@")
-+cmd_copy = rm -rf "$@" && cp -af "$<" "$@"
- 
- %(link_commands)s
- """
-diff --git a/gyp/pylib/gyp/generator/ninja.py b/gyp/pylib/gyp/generator/ninja.py
-index 7461814..c2951a4 100644
---- a/gyp/pylib/gyp/generator/ninja.py
-+++ b/gyp/pylib/gyp/generator/ninja.py
-@@ -2020,7 +2020,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
-     master_ninja.rule(
-       'copy',
-       description='COPY $in $out',
--      command='ln -f $in $out 2>/dev/null || (rm -rf $out && cp -af $in $out)')
-+      command='rm -rf $out && cp -af $in $out')
-   master_ninja.newline()
- 
-   all_targets = set()
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/node_modules/node-gyp/CHANGELOG.md b/node_modules/node-gyp/CHANGELOG.md
index 35b906ef8..596f986f4 100644
--- a/node_modules/node-gyp/CHANGELOG.md
+++ b/node_modules/node-gyp/CHANGELOG.md
@@ -1,3 +1,22 @@
+v3.6.1 2017-04-30
+=================
+
+* [[`49801716c2`](https://github.com/nodejs/node-gyp/commit/49801716c2)] - **test**: fix test-find-python on v0.10.x buildbot. (Ben Noordhuis) [#1172](https://github.com/nodejs/node-gyp/pull/1172)
+* [[`a83a3801fc`](https://github.com/nodejs/node-gyp/commit/a83a3801fc)] - **test**: fix test/test-configure-python on AIX (Richard Lau) [#1131](https://github.com/nodejs/node-gyp/pull/1131)
+* [[`8a767145c9`](https://github.com/nodejs/node-gyp/commit/8a767145c9)] - **gyp**: Revert quote_cmd workaround (Kunal Pathak) [#1153](https://github.com/nodejs/node-gyp/pull/1153)
+* [[`c09cf7671e`](https://github.com/nodejs/node-gyp/commit/c09cf7671e)] - **doc**: add a note for using `configure` on Windows (Vse Mozhet Byt) [#1152](https://github.com/nodejs/node-gyp/pull/1152)
+* [[`da9cb5f411`](https://github.com/nodejs/node-gyp/commit/da9cb5f411)] - Delete superfluous .patch files. (Ben Noordhuis) [#1122](https://github.com/nodejs/node-gyp/pull/1122)
+
+v3.6.0 2017-03-16
+=================
+
+* [[`ae141e1906`](https://github.com/nodejs/node-gyp/commit/ae141e1906)] - **win**: find and setup for VS2017 (Refael Ackermann) [#1130](https://github.com/nodejs/node-gyp/pull/1130)
+* [[`ec5fc36a80`](https://github.com/nodejs/node-gyp/commit/ec5fc36a80)] - Add support to build node.js with chakracore for ARM. (Kunal Pathak) [#873](https://github.com/nodejs/node-gyp/pull/873)
+* [[`a04ea3051a`](https://github.com/nodejs/node-gyp/commit/a04ea3051a)] - Add support to build node.js with chakracore. (Kunal Pathak) [#873](https://github.com/nodejs/node-gyp/pull/873)
+* [[`93d7fa83c8`](https://github.com/nodejs/node-gyp/commit/93d7fa83c8)] - Upgrade semver dependency. (Ben Noordhuis) [#1107](https://github.com/nodejs/node-gyp/pull/1107)
+* [[`ff9a6fadfd`](https://github.com/nodejs/node-gyp/commit/ff9a6fadfd)] - Update link of gyp as Google code is shutting down (Peter Dave Hello) [#1061](https://github.com/nodejs/node-gyp/pull/1061)
+
+
 v3.5.0 2017-01-10
 =================
 
diff --git a/node_modules/node-gyp/README.md b/node_modules/node-gyp/README.md
index 22415430a..d5443080d 100644
--- a/node_modules/node-gyp/README.md
+++ b/node_modules/node-gyp/README.md
@@ -91,6 +91,12 @@ platform. Use `configure` for that:
 $ node-gyp configure
 ```
 
+Auto-detection fails for Visual C++ Build Tools 2015, so `--msvs_version=2015`
+needs to be added (not needed when run by npm as configured above):
+``` bash
+$ node-gyp configure --msvs_version=2015
+```
+
 __Note__: The `configure` step looks for the `binding.gyp` file in the current
 directory to process. See below for instructions on creating the `binding.gyp` file.
 
diff --git a/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py b/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py
index 2b3ae19b0..6bfad0f3b 100644
--- a/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py
+++ b/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py
@@ -354,8 +354,6 @@ def _BuildCommandLineForRuleRaw(spec, cmd, cygwin_shell, has_input_path,
       command = ['type']
     else:
       command = [cmd[0].replace('/', '\\')]
-    if quote_cmd:
-      command = ['"%s"' % i for i in command]
     # Add call before command to ensure that commands can be tied together one
     # after the other without aborting in Incredibuild, since IB makes a bat
     # file out of the raw command string, and some commands (like python) are
diff --git a/node_modules/node-gyp/lib/configure.js b/node_modules/node-gyp/lib/configure.js
index 3349e9fed..4bad1bffd 100644
--- a/node_modules/node-gyp/lib/configure.js
+++ b/node_modules/node-gyp/lib/configure.js
@@ -375,6 +375,7 @@ PythonFinder.prototype = {
   env: process.env,
   execFile: cp.execFile,
   log: log,
+  resolve: path.win32 && path.win32.resolve || path.resolve,
   stat: fs.stat,
   which: which,
   win: win,
@@ -499,8 +500,7 @@ PythonFinder.prototype = {
     if (rootDir[rootDir.length - 1] !== '\\') {
       rootDir += '\\'
     }
-    var resolve = path.win32 && path.win32.resolve || path.resolve
-    var pythonPath = resolve(rootDir, 'Python27', 'python.exe')
+    var pythonPath = this.resolve(rootDir, 'Python27', 'python.exe')
     this.log.verbose('ensuring that file exists:', pythonPath)
     this.stat(pythonPath, function (err, stat) {
       if (err) {
diff --git a/node_modules/node-gyp/node_modules/minimatch/package.json b/node_modules/node-gyp/node_modules/minimatch/package.json
index f725b2b2b..3cdb28442 100644
--- a/node_modules/node-gyp/node_modules/minimatch/package.json
+++ b/node_modules/node-gyp/node_modules/minimatch/package.json
@@ -1,7 +1,8 @@
 {
   "_from": "minimatch@^3.0.2",
-  "_id": "minimatch@3.0.3",
-  "_integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=",
+  "_id": "minimatch@3.0.4",
+  "_inBundle": false,
+  "_integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
   "_location": "/node-gyp/minimatch",
   "_phantomChildren": {},
   "_requested": {
@@ -17,9 +18,8 @@
   "_requiredBy": [
     "/node-gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
-  "_shasum": "2a4e4090b96b2db06a9d7df01055a62a77c9b774",
-  "_shrinkwrap": null,
+  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+  "_shasum": "5166e286457f03306064be5497e8dbb0c3d32083",
   "_spec": "minimatch@^3.0.2",
   "_where": "/Users/zkat/Documents/code/npm/node_modules/node-gyp",
   "author": {
@@ -27,19 +27,17 @@
     "email": "i@izs.me",
     "url": "http://blog.izs.me"
   },
-  "bin": null,
   "bugs": {
     "url": "https://github.com/isaacs/minimatch/issues"
   },
   "bundleDependencies": false,
   "dependencies": {
-    "brace-expansion": "^1.0.0"
+    "brace-expansion": "^1.1.7"
   },
   "deprecated": false,
   "description": "a glob matcher in javascript",
   "devDependencies": {
-    "standard": "^3.7.2",
-    "tap": "^5.6.0"
+    "tap": "^10.3.2"
   },
   "engines": {
     "node": "*"
@@ -51,15 +49,15 @@
   "license": "ISC",
   "main": "minimatch.js",
   "name": "minimatch",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/minimatch.git"
   },
   "scripts": {
-    "posttest": "standard minimatch.js test/*.js",
-    "test": "tap test/*.js"
+    "postpublish": "git push origin --all; git push origin --tags",
+    "postversion": "npm publish",
+    "preversion": "npm test",
+    "test": "tap test/*.js --cov"
   },
-  "version": "3.0.3"
+  "version": "3.0.4"
 }
diff --git a/node_modules/node-gyp/package.json b/node_modules/node-gyp/package.json
index e89a4ca70..9a3664d91 100644
--- a/node_modules/node-gyp/package.json
+++ b/node_modules/node-gyp/package.json
@@ -1,28 +1,29 @@
 {
-  "_from": "node-gyp@~3.6.0",
-  "_id": "node-gyp@3.6.0",
-  "_integrity": "sha1-dHT2OjoFARYd2gtjQfAi8UxCP6Y=",
+  "_from": "node-gyp@latest",
+  "_id": "node-gyp@3.6.1",
+  "_inBundle": false,
+  "_integrity": "sha1-GVYQZ/8YVGSt7UeCEmgfR/1XjLw=",
   "_location": "/node-gyp",
   "_phantomChildren": {
     "abbrev": "1.1.0"
   },
   "_requested": {
-    "type": "range",
+    "type": "tag",
     "registry": true,
-    "raw": "node-gyp@~3.6.0",
+    "raw": "node-gyp@latest",
     "name": "node-gyp",
     "escapedName": "node-gyp",
-    "rawSpec": "~3.6.0",
+    "rawSpec": "latest",
     "saveSpec": null,
-    "fetchSpec": "~3.6.0"
+    "fetchSpec": "latest"
   },
   "_requiredBy": [
+    "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz",
-  "_shasum": "7474f63a3a0501161dda0b6341f022f14c423fa6",
-  "_shrinkwrap": null,
-  "_spec": "node-gyp@~3.6.0",
+  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.1.tgz",
+  "_shasum": "19561067ff185464aded478212681f47fd578cbc",
+  "_spec": "node-gyp@latest",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Nathan Rajlich",
@@ -76,8 +77,6 @@
   "license": "MIT",
   "main": "./lib/node-gyp.js",
   "name": "node-gyp",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "preferGlobal": true,
   "repository": {
     "type": "git",
@@ -86,5 +85,5 @@
   "scripts": {
     "test": "tape test/test-*"
   },
-  "version": "3.6.0"
+  "version": "3.6.1"
 }
diff --git a/node_modules/node-gyp/test/test-configure-python.js b/node_modules/node-gyp/test/test-configure-python.js
index 2930cacff..f235bdbba 100644
--- a/node_modules/node-gyp/test/test-configure-python.js
+++ b/node_modules/node-gyp/test/test-configure-python.js
@@ -6,6 +6,8 @@ var gyp = require('../lib/node-gyp')
 var requireInject = require('require-inject')
 var configure = requireInject('../lib/configure', {
   'graceful-fs': {
+    'openSync': function (file, mode) { return 0; },
+    'closeSync': function (fd) { },
     'writeFile': function (file, data, cb) { cb() },
     'stat': function (file, cb) { cb(null, {}) }
   }
@@ -26,7 +28,7 @@ test('configure PYTHONPATH with no existing env', function (t) {
     t.equal(process.env.PYTHONPATH, EXPECTED_PYPATH)
     return SPAWN_RESULT
   }
-  configure(prog, [])
+  configure(prog, [], t.fail)
 })
 
 test('configure PYTHONPATH with existing env of one dir', function (t) {
@@ -46,7 +48,7 @@ test('configure PYTHONPATH with existing env of one dir', function (t) {
 
     return SPAWN_RESULT
   }
-  configure(prog, [])
+  configure(prog, [], t.fail)
 })
 
 test('configure PYTHONPATH with existing env of multiple dirs', function (t) {
@@ -68,5 +70,5 @@ test('configure PYTHONPATH with existing env of multiple dirs', function (t) {
 
     return SPAWN_RESULT
   }
-  configure(prog, [])
+  configure(prog, [], t.fail)
 })
diff --git a/node_modules/node-gyp/test/test-find-python.js b/node_modules/node-gyp/test/test-find-python.js
index 30ba6df78..2d9f171c5 100644
--- a/node_modules/node-gyp/test/test-find-python.js
+++ b/node_modules/node-gyp/test/test-find-python.js
@@ -1,6 +1,7 @@
 'use strict'
 
 var test = require('tape')
+var path = require('path')
 var configure = require('../lib/configure')
 var execFile = require('child_process').execFile
 var PythonFinder = configure.test.PythonFinder
@@ -34,10 +35,19 @@ function poison(object, property) {
   Object.defineProperty(object, property, descriptor)
 }
 
+// Work around a v0.10.x CI issue where path.resolve() on UNIX systems prefixes
+// Windows paths with the current working directory.  v0.12 and up are free of
+// this issue because they use path.win32.resolve() which does the right thing.
+var resolve = path.win32 && path.win32.resolve || function() {
+  function rstrip(s) { return s.replace(/\\+$/, '') }
+  return [].slice.call(arguments).map(rstrip).join('\\')
+}
+
 function TestPythonFinder() { PythonFinder.apply(this, arguments) }
 TestPythonFinder.prototype = Object.create(PythonFinder.prototype)
 poison(TestPythonFinder.prototype, 'env')
 poison(TestPythonFinder.prototype, 'execFile')
+poison(TestPythonFinder.prototype, 'resolve')
 poison(TestPythonFinder.prototype, 'stat')
 poison(TestPythonFinder.prototype, 'which')
 poison(TestPythonFinder.prototype, 'win')
@@ -287,6 +297,7 @@ test('find python - no python, no python launcher, good guess', function (t) {
     t.strictEqual(program, 'py.exe')
     cb(new Error('not found'))
   }
+  f.resolve = resolve
   f.stat = function(path, cb) {
     t.ok(re.test(path))
     cb(null, {})
@@ -313,6 +324,7 @@ test('find python - no python, no python launcher, bad guess', function (t) {
     t.strictEqual(program, 'py.exe')
     cb(new Error('not found'))
   }
+  f.resolve = resolve
   f.stat = function(path, cb) {
     t.ok(/Z:[\\\/]Python27[\\\/]python.exe/.test(path))
     var err = new Error('not found')