summaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/node-gyp
diff options
context:
space:
mode:
Diffstat (limited to 'deps/npm/node_modules/node-gyp')
-rw-r--r--deps/npm/node_modules/node-gyp/README.md2
-rw-r--r--deps/npm/node_modules/node-gyp/addon.gypi19
-rw-r--r--deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py37
-rw-r--r--deps/npm/node_modules/node-gyp/lib/Find-VS2017.cs268
-rw-r--r--deps/npm/node_modules/node-gyp/lib/build.js13
-rw-r--r--deps/npm/node_modules/node-gyp/lib/configure.js34
-rw-r--r--deps/npm/node_modules/node-gyp/lib/find-vs2017.js46
-rw-r--r--deps/npm/node_modules/node-gyp/package.json74
8 files changed, 431 insertions, 62 deletions
diff --git a/deps/npm/node_modules/node-gyp/README.md b/deps/npm/node_modules/node-gyp/README.md
index 7d13b038ee..22415430a0 100644
--- a/deps/npm/node_modules/node-gyp/README.md
+++ b/deps/npm/node_modules/node-gyp/README.md
@@ -3,7 +3,7 @@ node-gyp
### Node.js native addon build tool
`node-gyp` is a cross-platform command-line tool written in Node.js for compiling
-native addon modules for Node.js. It bundles the [gyp](https://code.google.com/p/gyp/)
+native addon modules for Node.js. It bundles the [gyp](https://gyp.gsrc.io)
project used by the Chromium team and takes away the pain of dealing with the
various differences in build platforms. It is the replacement to the `node-waf`
program which is removed for node `v0.8`. If you have a native addon for node that
diff --git a/deps/npm/node_modules/node-gyp/addon.gypi b/deps/npm/node_modules/node-gyp/addon.gypi
index 3be0f591bd..1422900390 100644
--- a/deps/npm/node_modules/node-gyp/addon.gypi
+++ b/deps/npm/node_modules/node-gyp/addon.gypi
@@ -1,14 +1,25 @@
{
+ 'variables' : {
+ 'node_engine_include_dir%': 'deps/v8/include',
+ },
'target_defaults': {
'type': 'loadable_module',
'win_delay_load_hook': 'true',
'product_prefix': '',
+ 'conditions': [
+ [ 'node_engine=="chakracore"', {
+ 'variables': {
+ 'node_engine_include_dir%': 'deps/chakrashim/include'
+ },
+ }]
+ ],
+
'include_dirs': [
'<(node_root_dir)/include/node',
'<(node_root_dir)/src',
'<(node_root_dir)/deps/uv/include',
- '<(node_root_dir)/deps/v8/include'
+ '<(node_root_dir)/<(node_engine_include_dir)'
],
'defines!': [
'BUILDING_UV_SHARED=1', # Inherited from common.gypi.
@@ -79,6 +90,12 @@
],
}],
[ 'OS=="win"', {
+ 'conditions': [
+ ['node_engine=="chakracore"', {
+ 'library_dirs': [ '<(node_root_dir)/$(ConfigurationName)' ],
+ 'libraries': [ '<@(node_engine_libs)' ],
+ }],
+ ],
'libraries': [
'-lkernel32.lib',
'-luser32.lib',
diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py
index 2ecf964c68..2b3ae19b0c 100644
--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py
+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py
@@ -285,6 +285,22 @@ def _ConfigFullName(config_name, config_data):
return '%s|%s' % (_ConfigBaseName(config_name, platform_name), platform_name)
+def _ConfigWindowsTargetPlatformVersion(config_data):
+ ver = config_data.get('msvs_windows_target_platform_version')
+ if not ver or re.match(r'^\d+', ver):
+ return ver
+ for key in [r'HKLM\Software\Microsoft\Microsoft SDKs\Windows\%s',
+ r'HKLM\Software\Wow6432Node\Microsoft\Microsoft SDKs\Windows\%s']:
+ sdkdir = MSVSVersion._RegistryGetValue(key % ver, 'InstallationFolder')
+ if not sdkdir:
+ continue
+ version = MSVSVersion._RegistryGetValue(key % ver, 'ProductVersion') or ''
+ # find a matching entry in sdkdir\include
+ names = sorted([x for x in os.listdir(r'%s\include' % sdkdir) \
+ if x.startswith(version)], reverse = True)
+ return names[0]
+
+
def _BuildCommandLineForRuleRaw(spec, cmd, cygwin_shell, has_input_path,
quote_cmd, do_setup_env):
@@ -338,6 +354,8 @@ 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
@@ -2662,6 +2680,22 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
else:
properties[0].append(['ApplicationType', 'Windows Store'])
+ platform_name = None
+ msvs_windows_target_platform_version = None
+ for configuration in spec['configurations'].itervalues():
+ platform_name = platform_name or _ConfigPlatform(configuration)
+ msvs_windows_target_platform_version = \
+ msvs_windows_target_platform_version or \
+ _ConfigWindowsTargetPlatformVersion(configuration)
+ if platform_name and msvs_windows_target_platform_version:
+ break
+
+ if platform_name == 'ARM':
+ properties[0].append(['WindowsSDKDesktopARMSupport', 'true'])
+ if msvs_windows_target_platform_version:
+ properties[0].append(['WindowsTargetPlatformVersion', \
+ str(msvs_windows_target_platform_version)])
+
return properties
def _GetMSBuildConfigurationDetails(spec, build_file):
@@ -3209,6 +3243,9 @@ def _GetMSBuildProjectReferences(project):
['ReferenceOutputAssembly', 'false']
]
for config in dependency.spec.get('configurations', {}).itervalues():
+ if config.get('msvs_use_library_dependency_inputs', 0):
+ project_ref.append(['UseLibraryDependencyInputs', 'true'])
+ break
# If it's disabled in any config, turn it off in the reference.
if config.get('msvs_2010_disable_uldi_when_referenced', 0):
project_ref.append(['UseLibraryDependencyInputs', 'false'])
diff --git a/deps/npm/node_modules/node-gyp/lib/Find-VS2017.cs b/deps/npm/node_modules/node-gyp/lib/Find-VS2017.cs
new file mode 100644
index 0000000000..a41a354f61
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/lib/Find-VS2017.cs
@@ -0,0 +1,268 @@
+// Copyright 2017 - Refael Ackermann
+// Distributed under MIT style license
+// See accompanying file LICENSE at https://github.com/node4good/windows-autoconf
+
+// Usage:
+// powershell -ExecutionPolicy Unrestricted -Version "2.0" -Command "&{Add-Type -Path Find-VS2017.cs; [VisualStudioConfiguration.Main]::Query()}"
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace VisualStudioConfiguration
+{
+ [Flags]
+ public enum InstanceState : uint
+ {
+ None = 0,
+ Local = 1,
+ Registered = 2,
+ NoRebootRequired = 4,
+ NoErrors = 8,
+ Complete = 4294967295,
+ }
+
+ [Guid("6380BCFF-41D3-4B2E-8B2E-BF8A6810C848")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ [ComImport]
+ public interface IEnumSetupInstances
+ {
+
+ void Next([MarshalAs(UnmanagedType.U4), In] int celt,
+ [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.Interface), Out] ISetupInstance[] rgelt,
+ [MarshalAs(UnmanagedType.U4)] out int pceltFetched);
+
+ void Skip([MarshalAs(UnmanagedType.U4), In] int celt);
+
+ void Reset();
+
+ [return: MarshalAs(UnmanagedType.Interface)]
+ IEnumSetupInstances Clone();
+ }
+
+ [Guid("42843719-DB4C-46C2-8E7C-64F1816EFD5B")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ [ComImport]
+ public interface ISetupConfiguration
+ {
+ }
+
+ [Guid("26AAB78C-4A60-49D6-AF3B-3C35BC93365D")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ [ComImport]
+ public interface ISetupConfiguration2 : ISetupConfiguration
+ {
+
+ [return: MarshalAs(UnmanagedType.Interface)]
+ IEnumSetupInstances EnumInstances();
+
+ [return: MarshalAs(UnmanagedType.Interface)]
+ ISetupInstance GetInstanceForCurrentProcess();
+
+ [return: MarshalAs(UnmanagedType.Interface)]
+ ISetupInstance GetInstanceForPath([MarshalAs(UnmanagedType.LPWStr), In] string path);
+
+ [return: MarshalAs(UnmanagedType.Interface)]
+ IEnumSetupInstances EnumAllInstances();
+ }
+
+ [Guid("B41463C3-8866-43B5-BC33-2B0676F7F42E")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ [ComImport]
+ public interface ISetupInstance
+ {
+ }
+
+ [Guid("89143C9A-05AF-49B0-B717-72E218A2185C")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ [ComImport]
+ public interface ISetupInstance2 : ISetupInstance
+ {
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetInstanceId();
+
+ [return: MarshalAs(UnmanagedType.Struct)]
+ System.Runtime.InteropServices.ComTypes.FILETIME GetInstallDate();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetInstallationName();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetInstallationPath();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetInstallationVersion();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetDisplayName([MarshalAs(UnmanagedType.U4), In] int lcid);
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetDescription([MarshalAs(UnmanagedType.U4), In] int lcid);
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string ResolvePath([MarshalAs(UnmanagedType.LPWStr), In] string pwszRelativePath);
+
+ [return: MarshalAs(UnmanagedType.U4)]
+ InstanceState GetState();
+
+ [return: MarshalAs(UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_UNKNOWN)]
+ ISetupPackageReference[] GetPackages();
+
+ ISetupPackageReference GetProduct();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetProductPath();
+
+ [return: MarshalAs(UnmanagedType.VariantBool)]
+ bool IsLaunchable();
+
+ [return: MarshalAs(UnmanagedType.VariantBool)]
+ bool IsComplete();
+
+ [return: MarshalAs(UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_UNKNOWN)]
+ ISetupPropertyStore GetProperties();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetEnginePath();
+ }
+
+ [Guid("DA8D8A16-B2B6-4487-A2F1-594CCCCD6BF5")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ [ComImport]
+ public interface ISetupPackageReference
+ {
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetId();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetVersion();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetChip();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetLanguage();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetBranch();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetType();
+
+ [return: MarshalAs(UnmanagedType.BStr)]
+ string GetUniqueId();
+
+ [return: MarshalAs(UnmanagedType.VariantBool)]
+ bool GetIsExtension();
+ }
+
+ [Guid("c601c175-a3be-44bc-91f6-4568d230fc83")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ [ComImport]
+ public interface ISetupPropertyStore
+ {
+
+ [return: MarshalAs(UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_BSTR)]
+ string[] GetNames();
+
+ object GetValue([MarshalAs(UnmanagedType.LPWStr), In] string pwszName);
+ }
+
+ [Guid("42843719-DB4C-46C2-8E7C-64F1816EFD5B")]
+ [CoClass(typeof(SetupConfigurationClass))]
+ [ComImport]
+ public interface SetupConfiguration : ISetupConfiguration2, ISetupConfiguration
+ {
+ }
+
+ [Guid("177F0C4A-1CD3-4DE7-A32C-71DBBB9FA36D")]
+ [ClassInterface(ClassInterfaceType.None)]
+ [ComImport]
+ public class SetupConfigurationClass
+ {
+ }
+
+ public static class Main
+ {
+ public static void Query()
+ {
+ ISetupConfiguration query = new SetupConfiguration();
+ ISetupConfiguration2 query2 = (ISetupConfiguration2)query;
+ IEnumSetupInstances e = query2.EnumAllInstances();
+
+ int pceltFetched;
+ ISetupInstance2[] rgelt = new ISetupInstance2[1];
+ StringBuilder log = new StringBuilder();
+ while (true)
+ {
+ e.Next(1, rgelt, out pceltFetched);
+ if (pceltFetched <= 0)
+ {
+ Console.WriteLine(String.Format("{{\"log\":\"{0}\"}}", log.ToString()));
+ return;
+ }
+ if (CheckInstance(rgelt[0], ref log))
+ return;
+ }
+ }
+
+ private static bool CheckInstance(ISetupInstance2 setupInstance2, ref StringBuilder log)
+ {
+ // Visual Studio Community 2017 component directory:
+ // https://www.visualstudio.com/en-us/productinfo/vs2017-install-product-Community.workloads
+
+ string path = setupInstance2.GetInstallationPath().Replace("\\", "\\\\");
+ log.Append(String.Format("Found installation at: {0}\\n", path));
+
+ bool hasMSBuild = false;
+ bool hasVCTools = false;
+ uint Win10SDKVer = 0;
+ bool hasWin8SDK = false;
+
+ foreach (ISetupPackageReference package in setupInstance2.GetPackages())
+ {
+ const string Win10SDKPrefix = "Microsoft.VisualStudio.Component.Windows10SDK.";
+
+ string id = package.GetId();
+ if (id == "Microsoft.VisualStudio.VC.MSBuild.Base")
+ hasMSBuild = true;
+ else if (id == "Microsoft.VisualStudio.Component.VC.Tools.x86.x64")
+ hasVCTools = true;
+ else if (id.StartsWith(Win10SDKPrefix))
+ Win10SDKVer = Math.Max(Win10SDKVer, UInt32.Parse(id.Substring(Win10SDKPrefix.Length)));
+ else if (id == "Microsoft.VisualStudio.Component.Windows81SDK")
+ hasWin8SDK = true;
+ else
+ continue;
+
+ log.Append(String.Format(" - Found {0}\\n", id));
+ }
+
+ if (!hasMSBuild)
+ log.Append(" - Missing Visual Studio C++ core features (Microsoft.VisualStudio.VC.MSBuild.Base)\\n");
+ if (!hasVCTools)
+ log.Append(" - Missing VC++ 2017 v141 toolset (x86,x64) (Microsoft.VisualStudio.Component.VC.Tools.x86.x64)\\n");
+ if ((Win10SDKVer == 0) && (!hasWin8SDK))
+ log.Append(" - Missing a Windows SDK (Microsoft.VisualStudio.Component.Windows10SDK.* or Microsoft.VisualStudio.Component.Windows81SDK)\\n");
+
+ if (hasMSBuild && hasVCTools)
+ {
+ if (Win10SDKVer > 0)
+ {
+ log.Append(" - Using this installation with Windows 10 SDK"/*\\n*/);
+ Console.WriteLine(String.Format("{{\"log\":\"{0}\",\"path\":\"{1}\",\"sdk\":\"10.0.{2}.0\"}}", log.ToString(), path, Win10SDKVer));
+ return true;
+ }
+ else if (hasWin8SDK)
+ {
+ log.Append(" - Using this installation with Windows 8.1 SDK"/*\\n*/);
+ Console.WriteLine(String.Format("{{\"log\":\"{0}\",\"path\":\"{1}\",\"sdk\":\"8.1\"}}", log.ToString(), path));
+ return true;
+ }
+ }
+
+ log.Append(" - Some required components are missing, not using this installation\\n");
+ return false;
+ }
+ }
+}
diff --git a/deps/npm/node_modules/node-gyp/lib/build.js b/deps/npm/node_modules/node-gyp/lib/build.js
index 22f2583694..5253109857 100644
--- a/deps/npm/node_modules/node-gyp/lib/build.js
+++ b/deps/npm/node_modules/node-gyp/lib/build.js
@@ -14,7 +14,7 @@ var fs = require('graceful-fs')
, mkdirp = require('mkdirp')
, exec = require('child_process').exec
, processRelease = require('./process-release')
- , win = process.platform == 'win32'
+ , win = process.platform === 'win32'
exports.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the module'
@@ -124,6 +124,13 @@ function build (gyp, argv, callback) {
*/
function findMsbuild () {
+ if (config.variables.msbuild_path) {
+ command = config.variables.msbuild_path
+ log.verbose('using MSBuild:', command)
+ copyNodeLib()
+ return
+ }
+
log.verbose('could not find "msbuild.exe" in PATH - finding location in registry')
var notfoundErr = 'Can\'t find "msbuild.exe". Do you have Microsoft Visual Studio C++ 2008+ installed?'
var cmd = 'reg query "HKLM\\Software\\Microsoft\\MSBuild\\ToolsVersions" /s'
@@ -226,7 +233,9 @@ function build (gyp, argv, callback) {
// Specify the build type, Release by default
if (win) {
- var p = arch === 'x64' ? 'x64' : 'Win32'
+ var archLower = arch.toLowerCase()
+ var p = archLower === 'x64' ? 'x64' :
+ (archLower === 'arm' ? 'ARM' : 'Win32')
argv.push('/p:Configuration=' + buildType + ';Platform=' + p)
if (jobs) {
var j = parseInt(jobs, 10)
diff --git a/deps/npm/node_modules/node-gyp/lib/configure.js b/deps/npm/node_modules/node-gyp/lib/configure.js
index 66c33e6947..3349e9fedf 100644
--- a/deps/npm/node_modules/node-gyp/lib/configure.js
+++ b/deps/npm/node_modules/node-gyp/lib/configure.js
@@ -19,9 +19,11 @@ var fs = require('graceful-fs')
, cp = require('child_process')
, extend = require('util')._extend
, processRelease = require('./process-release')
- , win = process.platform == 'win32'
+ , win = process.platform === 'win32'
, findNodeDirectory = require('./find-node-directory')
, msgFormat = require('util').format
+if (win)
+ var findVS2017 = require('./find-vs2017')
exports.usage = 'Generates ' + (win ? 'MSVC project files' : 'a Makefile') + ' for the current module'
@@ -86,11 +88,22 @@ function configure (gyp, argv, callback) {
mkdirp(buildDir, function (err, isNew) {
if (err) return callback(err)
log.verbose('build dir', '"build" dir needed to be created?', isNew)
- createConfigFile()
+ if (win && (!gyp.opts.msvs_version || gyp.opts.msvs_version === '2017')) {
+ findVS2017(function (err, vsSetup) {
+ if (err) {
+ log.verbose('Not using VS2017:', err.message)
+ createConfigFile()
+ } else {
+ createConfigFile(null, vsSetup)
+ }
+ })
+ } else {
+ createConfigFile()
+ }
})
}
- function createConfigFile (err) {
+ function createConfigFile (err, vsSetup) {
if (err) return callback(err)
var configFilename = 'config.gypi'
@@ -137,6 +150,19 @@ function configure (gyp, argv, callback) {
// disable -T "thin" static archives by default
variables.standalone_static_library = gyp.opts.thin ? 0 : 1
+ if (vsSetup) {
+ // GYP doesn't (yet) have support for VS2017, so we force it to VS2015
+ // to avoid pulling a floating patch that has not landed upstream.
+ // Ref: https://chromium-review.googlesource.com/#/c/433540/
+ gyp.opts.msvs_version = '2015'
+ process.env['GYP_MSVS_VERSION'] = 2015
+ process.env['GYP_MSVS_OVERRIDE_PATH'] = vsSetup.path
+ defaults['msbuild_toolset'] = 'v141'
+ defaults['msvs_windows_target_platform_version'] = vsSetup.sdk
+ variables['msbuild_path'] = path.join(vsSetup.path, 'MSBuild', '15.0',
+ 'Bin', 'MSBuild.exe')
+ }
+
// loop through the rest of the opts and add the unknown ones as variables.
// this allows for module-specific configure flags like:
//
@@ -272,6 +298,8 @@ function configure (gyp, argv, callback) {
argv.push('-Dnode_gyp_dir=' + nodeGypDir)
argv.push('-Dnode_lib_file=' + release.name + '.lib')
argv.push('-Dmodule_root_dir=' + process.cwd())
+ argv.push('-Dnode_engine=' +
+ (gyp.opts.node_engine || process.jsEngine || 'v8'))
argv.push('--depth=.')
argv.push('--no-parallel')
diff --git a/deps/npm/node_modules/node-gyp/lib/find-vs2017.js b/deps/npm/node_modules/node-gyp/lib/find-vs2017.js
new file mode 100644
index 0000000000..8c79e9ec9b
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/lib/find-vs2017.js
@@ -0,0 +1,46 @@
+var log = require('npmlog')
+ , execFile = require('child_process').execFile
+ , path = require('path')
+
+function findVS2017(callback) {
+ var ps = path.join(process.env.SystemRoot, 'System32', 'WindowsPowerShell',
+ 'v1.0', 'powershell.exe')
+ var csFile = path.join(__dirname, 'Find-VS2017.cs')
+ var psArgs = ['-ExecutionPolicy', 'Unrestricted', '-Command',
+ '&{Add-Type -Path \'' + csFile +
+ '\'; [VisualStudioConfiguration.Main]::Query()}']
+
+ log.silly('find vs2017', 'Running', ps, psArgs)
+ var child = execFile(ps, psArgs, { encoding: 'utf8' },
+ function (err, stdout, stderr) {
+ log.silly('find vs2017', 'PS err:', err)
+ log.silly('find vs2017', 'PS stdout:', stdout)
+ log.silly('find vs2017', 'PS stderr:', stderr)
+
+ if (err)
+ return callback(new Error('Could not use PowerShell to find VS2017'))
+
+ var vsSetup
+ try {
+ vsSetup = JSON.parse(stdout)
+ } catch (e) {
+ log.silly('find vs2017', e)
+ return callback(new Error('Could not use PowerShell to find VS2017'))
+ }
+ log.silly('find vs2017', 'vsSetup:', vsSetup)
+
+ if (vsSetup && vsSetup.log)
+ log.verbose('find vs2017', vsSetup.log.trimRight())
+
+ if (!vsSetup || !vsSetup.path || !vsSetup.sdk) {
+ return callback(new Error('No usable installation of VS2017 found'))
+ }
+
+ log.verbose('find vs2017', 'using installation:', vsSetup.path)
+ callback(null, { "path": vsSetup.path, "sdk": vsSetup.sdk })
+ })
+
+ child.stdin.end()
+}
+
+module.exports = findVS2017
diff --git a/deps/npm/node_modules/node-gyp/package.json b/deps/npm/node_modules/node-gyp/package.json
index 3dedc97e0f..968fa1eb19 100644
--- a/deps/npm/node_modules/node-gyp/package.json
+++ b/deps/npm/node_modules/node-gyp/package.json
@@ -2,51 +2,41 @@
"_args": [
[
{
- "raw": "node-gyp@3.5.0",
+ "raw": "node-gyp@3.6.0",
"scope": null,
"escapedName": "node-gyp",
"name": "node-gyp",
- "rawSpec": "3.5.0",
- "spec": "3.5.0",
+ "rawSpec": "3.6.0",
+ "spec": "3.6.0",
"type": "version"
},
"/Users/rebecca/code/npm"
]
],
- "_from": "node-gyp@3.5.0",
- "_id": "node-gyp@3.5.0",
- "_inCache": true,
+ "_from": "node-gyp@3.6.0",
+ "_hasShrinkwrap": false,
+ "_id": "node-gyp@3.6.0",
"_location": "/node-gyp",
- "_nodeVersion": "7.2.1",
- "_npmOperationalInternal": {
- "host": "packages-18-east.internal.npmjs.com",
- "tmp": "tmp/node-gyp-3.5.0.tgz_1484012223403_0.9361806979868561"
- },
- "_npmUser": {
- "name": "rvagg",
- "email": "rod@vagg.org"
- },
- "_npmVersion": "3.10.10",
"_phantomChildren": {
- "abbrev": "1.0.9"
+ "abbrev": "1.1.0"
},
"_requested": {
- "raw": "node-gyp@3.5.0",
+ "raw": "node-gyp@3.6.0",
"scope": null,
"escapedName": "node-gyp",
"name": "node-gyp",
- "rawSpec": "3.5.0",
- "spec": "3.5.0",
+ "rawSpec": "3.6.0",
+ "spec": "3.6.0",
"type": "version"
},
"_requiredBy": [
"#USER",
"/"
],
- "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz",
- "_shasum": "a8fe5e611d079ec16348a3eb960e78e11c85274a",
+ "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz",
+ "_shasum": "7474f63a3a0501161dda0b6341f022f14c423fa6",
"_shrinkwrap": null,
- "_spec": "node-gyp@3.5.0",
+ "_spec": "node-gyp@3.6.0",
"_where": "/Users/rebecca/code/npm",
"author": {
"name": "Nathan Rajlich",
@@ -70,7 +60,7 @@
"osenv": "0",
"request": "2",
"rimraf": "2",
- "semver": "2.x || 3.x || 4 || 5",
+ "semver": "~5.3.0",
"tar": "^2.0.0",
"which": "1"
},
@@ -83,13 +73,12 @@
},
"directories": {},
"dist": {
- "shasum": "a8fe5e611d079ec16348a3eb960e78e11c85274a",
- "tarball": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"
+ "shasum": "7474f63a3a0501161dda0b6341f022f14c423fa6",
+ "tarball": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz"
},
"engines": {
"node": ">= 0.8.0"
},
- "gitHead": "4793e1dcb8f16182d6292fd2af579082fc11294f",
"homepage": "https://github.com/nodejs/node-gyp#readme",
"installVersion": 9,
"keywords": [
@@ -103,36 +92,11 @@
],
"license": "MIT",
"main": "./lib/node-gyp.js",
- "maintainers": [
- {
- "name": "TooTallNate",
- "email": "nathan@tootallnate.net"
- },
- {
- "name": "bnoordhuis",
- "email": "info@bnoordhuis.nl"
- },
- {
- "name": "fishrock123",
- "email": "fishrock123@rocketmail.com"
- },
- {
- "name": "isaacs",
- "email": "i@izs.me"
- },
- {
- "name": "rvagg",
- "email": "rod@vagg.org"
- },
- {
- "name": "tootallnate",
- "email": "nathan@tootallnate.net"
- }
- ],
"name": "node-gyp",
"optionalDependencies": {},
"preferGlobal": true,
- "readme": "ERROR: No README data found!",
+ "readme": "node-gyp\n=========\n### Node.js native addon build tool\n\n`node-gyp` is a cross-platform command-line tool written in Node.js for compiling\nnative addon modules for Node.js. It bundles the [gyp](https://gyp.gsrc.io)\nproject used by the Chromium team and takes away the pain of dealing with the\nvarious differences in build platforms. It is the replacement to the `node-waf`\nprogram which is removed for node `v0.8`. If you have a native addon for node that\nstill has a `wscript` file, then you should definitely add a `binding.gyp` file\nto support the latest versions of node.\n\nMultiple target versions of node are supported (i.e. `0.8`, ..., `4`, `5`, `6`,\netc.), regardless of what version of node is actually installed on your system\n(`node-gyp` downloads the necessary development files or headers for the target version).\n\n#### Features:\n\n * Easy to use, consistent interface\n * Same commands to build your module on every platform\n * Supports multiple target versions of Node\n\n\nInstallation\n------------\n\nYou can install with `npm`:\n\n``` bash\n$ npm install -g node-gyp\n```\n\nYou will also need to install:\n\n * On Unix:\n * `python` (`v2.7` recommended, `v3.x.x` is __*not*__ supported)\n * `make`\n * A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org)\n * On Mac OS X:\n * `python` (`v2.7` recommended, `v3.x.x` is __*not*__ supported) (already installed on Mac OS X)\n * [Xcode](https://developer.apple.com/xcode/download/)\n * You also need to install the `Command Line Tools` via Xcode. You can find this under the menu `Xcode -> Preferences -> Downloads`\n * This step will install `gcc` and the related toolchain containing `make`\n * On Windows:\n * Option 1: Install all the required tools and configurations using Microsoft's [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools) using `npm install --global --production windows-build-tools` from an elevated PowerShell or CMD.exe (run as Administrator).\n * Option 2: Install tools and configuration manually:\n * Visual C++ Build Environment:\n * Option 1: Install [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools) using the **Default Install** option.\n\n * Option 2: Install [Visual Studio 2015](https://www.visualstudio.com/products/visual-studio-community-vs) (or modify an existing installation) and select *Common Tools for Visual C++* during setup. This also works with the free Community and Express for Desktop editions.\n\n > :bulb: [Windows Vista / 7 only] requires [.NET Framework 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40773)\n\n * Install [Python 2.7](https://www.python.org/downloads/) (`v3.x.x` is not supported), and run `npm config set python python2.7` (or see below for further instructions on specifying the proper Python version and path.)\n * Launch cmd, `npm config set msvs_version 2015`\n\n If the above steps didn't work for you, please visit [Microsoft's Node.js Guidelines for Windows](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules) for additional tips.\n\nIf you have multiple Python versions installed, you can identify which Python\nversion `node-gyp` uses by setting the '--python' variable:\n\n``` bash\n$ node-gyp --python /path/to/python2.7\n```\n\nIf `node-gyp` is called by way of `npm` *and* you have multiple versions of\nPython installed, then you can set `npm`'s 'python' config key to the appropriate\nvalue:\n\n``` bash\n$ npm config set python /path/to/executable/python2.7\n```\n\nNote that OS X is just a flavour of Unix and so needs `python`, `make`, and C/C++.\nAn easy way to obtain these is to install XCode from Apple,\nand then use it to install the command line tools (under Preferences -> Downloads).\n\nHow to Use\n----------\n\nTo compile your native addon, first go to its root directory:\n\n``` bash\n$ cd my_node_addon\n```\n\nThe next step is to generate the appropriate project build files for the current\nplatform. Use `configure` for that:\n\n``` bash\n$ node-gyp configure\n```\n\n__Note__: The `configure` step looks for the `binding.gyp` file in the current\ndirectory to process. See below for instructions on creating the `binding.gyp` file.\n\nNow you will have either a `Makefile` (on Unix platforms) or a `vcxproj` file\n(on Windows) in the `build/` directory. Next invoke the `build` command:\n\n``` bash\n$ node-gyp build\n```\n\nNow you have your compiled `.node` bindings file! The compiled bindings end up\nin `build/Debug/` or `build/Release/`, depending on the build mode. At this point\nyou can require the `.node` file with Node and run your tests!\n\n__Note:__ To create a _Debug_ build of the bindings file, pass the `--debug` (or\n`-d`) switch when running either the `configure`, `build` or `rebuild` command.\n\n\nThe \"binding.gyp\" file\n----------------------\n\nPreviously when node had `node-waf` you had to write a `wscript` file. The\nreplacement for that is the `binding.gyp` file, which describes the configuration\nto build your module in a JSON-like format. This file gets placed in the root of\nyour package, alongside the `package.json` file.\n\nA barebones `gyp` file appropriate for building a node addon looks like:\n\n``` python\n{\n \"targets\": [\n {\n \"target_name\": \"binding\",\n \"sources\": [ \"src/binding.cc\" ]\n }\n ]\n}\n```\n\nSome additional resources for addons and writing `gyp` files:\n\n * [\"Going Native\" a nodeschool.io tutorial](http://nodeschool.io/#goingnative)\n * [\"Hello World\" node addon example](https://github.com/nodejs/node/tree/master/test/addons/hello-world)\n * [gyp user documentation](https://gyp.gsrc.io/docs/UserDocumentation.md)\n * [gyp input format reference](https://gyp.gsrc.io/docs/InputFormatReference.md)\n * [*\"binding.gyp\" files out in the wild* wiki page](https://github.com/nodejs/node-gyp/wiki/%22binding.gyp%22-files-out-in-the-wild)\n\n\nCommands\n--------\n\n`node-gyp` responds to the following commands:\n\n| **Command** | **Description**\n|:--------------|:---------------------------------------------------------------\n| `help` | Shows the help dialog\n| `build` | Invokes `make`/`msbuild.exe` and builds the native addon\n| `clean` | Removes the `build` directory if it exists\n| `configure` | Generates project build files for the current platform\n| `rebuild` | Runs `clean`, `configure` and `build` all in a row\n| `install` | Installs node header files for the given version\n| `list` | Lists the currently installed node header versions\n| `remove` | Removes the node header files for the given version\n\n\nCommand Options\n--------\n\n`node-gyp` accepts the following command options:\n\n| **Command** | **Description**\n|:----------------------------------|:------------------------------------------\n| `-j n`, `--jobs n` | Run make in parallel\n| `--target=v6.2.1` | Node version to build for (default=process.version)\n| `--silly`, `--loglevel=silly` | Log all progress to console\n| `--verbose`, `--loglevel=verbose` | Log most progress to console\n| `--silent`, `--loglevel=silent` | Don't log anything to console\n| `debug`, `--debug` | Make Debug build (default=Release)\n| `--release`, `--no-debug` | Make Release build\n| `-C $dir`, `--directory=$dir` | Run command in different directory\n| `--make=$make` | Override make command (e.g. gmake)\n| `--thin=yes` | Enable thin static libraries\n| `--arch=$arch` | Set target architecture (e.g. ia32)\n| `--tarball=$path` | Get headers from a local tarball\n| `--devdir=$path` | SDK download directory (default=~/.node-gyp)\n| `--ensure` | Don't reinstall headers if already present\n| `--dist-url=$url` | Download header tarball from custom URL\n| `--proxy=$url` | Set HTTP proxy for downloading header tarball\n| `--cafile=$cafile` | Override default CA chain (to download tarball)\n| `--nodedir=$path` | Set the path to the node binary\n| `--python=$path` | Set path to the python (2) binary\n| `--msvs_version=$version` | Set Visual Studio version (win)\n| `--solution=$solution` | Set Visual Studio Solution version (win)\n\n\nLicense\n-------\n\n(The MIT License)\n\nCopyright (c) 2012 Nathan Rajlich &lt;nathan@tootallnate.net&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\n\n[python-v2.7.10]: https://www.python.org/downloads/release/python-2710/\n[msvc2013]: https://www.microsoft.com/en-gb/download/details.aspx?id=44914\n[win7sdk]: https://www.microsoft.com/en-us/download/details.aspx?id=8279\n[compiler update for the Windows SDK 7.1]: https://www.microsoft.com/en-us/download/details.aspx?id=4422\n",
+ "readmeFilename": "README.md",
"repository": {
"type": "git",
"url": "git://github.com/nodejs/node-gyp.git"
@@ -140,5 +104,5 @@
"scripts": {
"test": "tape test/test-*"
},
- "version": "3.5.0"
+ "version": "3.6.0"
}