node-gyp@2.0.2

6 files changed, 45 insertions, 24 deletions

diff --git a/node_modules/node-gyp/History.md b/node_modules/node-gyp/History.md
index a2af92175..8768081ea 100644
--- a/node_modules/node-gyp/History.md
+++ b/node_modules/node-gyp/History.md
@@ -1,8 +1,22 @@
 
+2.0.2 / 2015-07-14
+==================
+
+  * Use HTTPS for dist url (#656, @SonicHedgehog)
+  * Merge pull request #648 from nevosegal/master
+  * Merge pull request #650 from magic890/patch-1
+  * Updated Installation section on README
+  * Updated link to gyp user documentation
+  * Fix download error message spelling (#643, @tomxtobin)
+  * Merge pull request #637 from lygstate/master
+  * Set NODE_GYP_DIR for addon.gypi to setting absolute path for
+    src/win_delay_load_hook.c, and fixes of the long relative path issue on Win32.
+    Fixes #636 (#637, @lygstate).
+
 2.0.1 / 2015-05-28
 ==================
 
-  * configure: try/catcht the semver range.test() call
+  * configure: try/catch the semver range.test() call
   * README: update for visual studio 2013 (#510, @samccone)
 
 2.0.0 / 2015-05-24
diff --git a/node_modules/node-gyp/README.md b/node_modules/node-gyp/README.md
index 386e54eb8..edde1f6c3 100644
--- a/node_modules/node-gyp/README.md
+++ b/node_modules/node-gyp/README.md
@@ -35,13 +35,18 @@ You will also need to install:
   * On Unix:
     * `python` (`v2.7` recommended, `v3.x.x` is __*not*__ supported)
     * `make`
-    * A proper C/C++ compiler toolchain, like GCC
+    * A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org)
+  * On Mac OS X:
+    * `python` (`v2.7` recommended, `v3.x.x` is __*not*__ supported) (already installed on Mac OS X)
+    * [Xcode](https://developer.apple.com/xcode/downloads/)
+      * You also need to install the `Command Line Tools` via Xcode. You can find this under the menu `Xcode -> Preferences -> Downloads`
+      * This step will install `gcc` and the related toolchain containing `make`
   * On Windows:
     * [Python][windows-python] ([`v2.7.3`][windows-python-v2.7.3] recommended, `v3.x.x` is __*not*__ supported)
-      * Make sure that you have a PYTHON environment variable, and it is set to drive:\path\to\python.exe not to a folder.
+      * Make sure that you have a PYTHON environment variable, and it is set to drive:\path\to\python.exe not to a folder
     * Windows XP/Vista/7:
       * Microsoft Visual Studio C++ 2013 ([Express][msvc2013] version works well)
-        * If the install fails, try uninstalling any C++ 2010 x64&x86 Redistributable that you have installed first.
+        * If the install fails, try uninstalling any C++ 2010 x64&x86 Redistributable that you have installed first
         * If you get errors that the 64-bit compilers are not installed you may also need the [compiler update for the Windows SDK 7.1]
     * Windows 7/8:
       * Microsoft Visual Studio C++ 2013 for Windows Desktop ([Express][msvc2013] version works well)
@@ -132,8 +137,8 @@ Some additional resources for addons and writing `gyp` files:
 
  * ["Going Native" a nodeschool.io tutorial](http://nodeschool.io/#goingnative)
  * ["Hello World" node addon example](https://github.com/joyent/node/tree/master/test/addons/hello-world)
- * [gyp user documentation](http://code.google.com/p/gyp/wiki/GypUserDocumentation)
- * [gyp input format reference](http://code.google.com/p/gyp/wiki/InputFormatReference)
+ * [gyp user documentation](https://chromium.googlesource.com/external/gyp/+/master/docs/UserDocumentation.md)
+ * [gyp input format reference](https://chromium.googlesource.com/external/gyp/+/master/docs/InputFormatReference.md)
  * [*"binding.gyp" files out in the wild* wiki page](https://github.com/TooTallNate/node-gyp/wiki/%22binding.gyp%22-files-out-in-the-wild)
 
 
diff --git a/node_modules/node-gyp/addon.gypi b/node_modules/node-gyp/addon.gypi
index 7f6264ac6..337794242 100644
--- a/node_modules/node-gyp/addon.gypi
+++ b/node_modules/node-gyp/addon.gypi
@@ -40,7 +40,7 @@
         'conditions': [
           [ 'OS=="win"', {
             'sources': [
-              'src/win_delay_load_hook.c',
+              '<(node_gyp_dir)/src/win_delay_load_hook.c',
             ],
             'msvs_settings': {
               'VCLinkerTool': {
diff --git a/node_modules/node-gyp/lib/configure.js b/node_modules/node-gyp/lib/configure.js
index 0a33e7008..e8c2029b5 100644
--- a/node_modules/node-gyp/lib/configure.js
+++ b/node_modules/node-gyp/lib/configure.js
@@ -316,12 +316,14 @@ function configure (gyp, argv, callback) {
       // Windows expects an absolute path
       output_dir = buildDir
     }
+    var nodeGypDir = path.resolve(__dirname, '..')
 
     argv.push('-I', addon_gypi)
     argv.push('-I', common_gypi)
     argv.push('-Dlibrary=shared_library')
     argv.push('-Dvisibility=default')
     argv.push('-Dnode_root_dir=' + nodeDir)
+    argv.push('-Dnode_gyp_dir=' + nodeGypDir)
     argv.push('-Dmodule_root_dir=' + process.cwd())
     argv.push('--depth=.')
     argv.push('--no-parallel')
diff --git a/node_modules/node-gyp/lib/install.js b/node_modules/node-gyp/lib/install.js
index 89e4956a8..6cbcdb8f7 100644
--- a/node_modules/node-gyp/lib/install.js
+++ b/node_modules/node-gyp/lib/install.js
@@ -39,7 +39,7 @@ function install (gyp, argv, callback) {
     }
   }
 
-  var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || 'http://nodejs.org/dist'
+  var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || 'https://nodejs.org/dist'
 
 
   // Determine which node dev files version we are installing
@@ -248,7 +248,7 @@ function install (gyp, argv, callback) {
       req.on('response', function (res) {
         if (res.statusCode !== 200) {
           badDownload = true
-          cb(new Error(res.statusCode + ' response dowloading ' + tarballUrl))
+          cb(new Error(res.statusCode + ' response downloading ' + tarballUrl))
           return
         }
         // content checksum
diff --git a/node_modules/node-gyp/package.json b/node_modules/node-gyp/package.json
index a0aa020be..3f60d6bee 100644
--- a/node_modules/node-gyp/package.json
+++ b/node_modules/node-gyp/package.json
@@ -1,20 +1,20 @@
 {
   "_args": [
     [
-      "node-gyp@~2.0.1",
+      "node-gyp@~2.0.2",
       "/Users/rebecca/code/npm"
     ]
   ],
-  "_from": "node-gyp@>=2.0.1 <2.1.0",
-  "_id": "node-gyp@2.0.1",
+  "_from": "node-gyp@>=2.0.2 <2.1.0",
+  "_id": "node-gyp@2.0.2",
   "_inCache": true,
   "_location": "/node-gyp",
-  "_nodeVersion": "0.12.3",
+  "_nodeVersion": "0.12.6",
   "_npmUser": {
     "email": "nathan@tootallnate.net",
     "name": "tootallnate"
   },
-  "_npmVersion": "2.9.1",
+  "_npmVersion": "2.11.2",
   "_phantomChildren": {
     "block-stream": "0.0.8",
     "brace-expansion": "1.1.0",
@@ -27,19 +27,19 @@
   },
   "_requested": {
     "name": "node-gyp",
-    "raw": "node-gyp@~2.0.1",
-    "rawSpec": "~2.0.1",
+    "raw": "node-gyp@~2.0.2",
+    "rawSpec": "~2.0.2",
     "scope": null,
-    "spec": ">=2.0.1 <2.1.0",
+    "spec": ">=2.0.2 <2.1.0",
     "type": "range"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-2.0.1.tgz",
-  "_shasum": "38e9c5b54df7115cd0953cee67863f839d0c7888",
+  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-2.0.2.tgz",
+  "_shasum": "6350760aaba74ba108fdc368afd8864e14b6ad91",
   "_shrinkwrap": null,
-  "_spec": "node-gyp@~2.0.1",
+  "_spec": "node-gyp@~2.0.2",
   "_where": "/Users/rebecca/code/npm",
   "author": {
     "email": "nathan@tootallnate.net",
@@ -72,13 +72,13 @@
   "devDependencies": {},
   "directories": {},
   "dist": {
-    "shasum": "38e9c5b54df7115cd0953cee67863f839d0c7888",
-    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-2.0.1.tgz"
+    "shasum": "6350760aaba74ba108fdc368afd8864e14b6ad91",
+    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-2.0.2.tgz"
   },
   "engines": {
     "node": ">= 0.8.0"
   },
-  "gitHead": "0b9790ab6b885e2020e83936e402ac23c9e84726",
+  "gitHead": "f403e263b87f6a8ad130add248c90565d49427f7",
   "homepage": "https://github.com/TooTallNate/node-gyp#readme",
   "installVersion": 9,
   "keywords": [
@@ -114,5 +114,5 @@
     "url": "git://github.com/TooTallNate/node-gyp.git"
   },
   "scripts": {},
-  "version": "2.0.1"
+  "version": "2.0.2"
 }