Comparing version 3.6.1 to 3.6.2
@@ -0,1 +1,11 @@ | ||
v3.6.2 2017-06-01 | ||
================= | ||
* [[`72afdd62cd`](https://github.com/nodejs/node-gyp/commit/72afdd62cd)] - **build**: rename copyNodeLib() to doBuild() (Liu Chao) [#1206](https://github.com/nodejs/node-gyp/pull/1206) | ||
* [[`bad903ac70`](https://github.com/nodejs/node-gyp/commit/bad903ac70)] - **win**: more robust parsing of SDK version (Refael Ackermann) [#1198](https://github.com/nodejs/node-gyp/pull/1198) | ||
* [[`241752f381`](https://github.com/nodejs/node-gyp/commit/241752f381)] - Log dist-url. (Ben Noordhuis) [#1170](https://github.com/nodejs/node-gyp/pull/1170) | ||
* [[`386746c7d1`](https://github.com/nodejs/node-gyp/commit/386746c7d1)] - **configure**: use full path in node_lib_file GYP var (Pavel Medvedev) [#964](https://github.com/nodejs/node-gyp/pull/964) | ||
* [[`0913b2dd99`](https://github.com/nodejs/node-gyp/commit/0913b2dd99)] - **build, win**: use target_arch to link with node.lib (Pavel Medvedev) [#964](https://github.com/nodejs/node-gyp/pull/964) | ||
* [[`c307b302f7`](https://github.com/nodejs/node-gyp/commit/c307b302f7)] - **doc**: blorb about setting `npm_config_OPTION_NAME` (Refael Ackermann) [#1185](https://github.com/nodejs/node-gyp/pull/1185) | ||
v3.6.1 2017-04-30 | ||
@@ -2,0 +12,0 @@ ================= |
@@ -14,3 +14,2 @@ | ||
, which = require('which') | ||
, mkdirp = require('mkdirp') | ||
, exec = require('child_process').exec | ||
@@ -40,3 +39,2 @@ , processRelease = require('./process-release') | ||
, nodeDir | ||
, copyDevLib | ||
@@ -65,3 +63,2 @@ loadConfigGypi() | ||
nodeDir = config.variables.nodedir | ||
copyDevLib = config.variables.copy_dev_lib == 'true' | ||
@@ -121,3 +118,3 @@ if ('debug' in gyp.opts) { | ||
log.verbose('`which` succeeded for `' + command + '`', execPath) | ||
copyNodeLib() | ||
doBuild() | ||
}) | ||
@@ -134,3 +131,3 @@ } | ||
log.verbose('using MSBuild:', command) | ||
copyNodeLib() | ||
doBuild() | ||
return | ||
@@ -188,3 +185,3 @@ } | ||
command = msbuildPath | ||
copyNodeLib() | ||
doBuild() | ||
}) | ||
@@ -195,27 +192,3 @@ })() | ||
/** | ||
* Copies the node.lib file for the current target architecture into the | ||
* current proper dev dir location. | ||
*/ | ||
function copyNodeLib () { | ||
if (!win || !copyDevLib) return doBuild() | ||
var buildDir = path.resolve(nodeDir, buildType) | ||
, archNodeLibPath = path.resolve(nodeDir, arch, release.name + '.lib') | ||
, buildNodeLibPath = path.resolve(buildDir, release.name + '.lib') | ||
mkdirp(buildDir, function (err, isNew) { | ||
if (err) return callback(err) | ||
log.verbose('"' + buildType + '" dir needed to be created?', isNew) | ||
var rs = fs.createReadStream(archNodeLibPath) | ||
, ws = fs.createWriteStream(buildNodeLibPath) | ||
log.verbose('copying "' + release.name + '.lib" for ' + arch, buildNodeLibPath) | ||
rs.pipe(ws) | ||
rs.on('error', callback) | ||
ws.on('error', callback) | ||
rs.on('end', doBuild) | ||
}) | ||
} | ||
/** | ||
@@ -222,0 +195,0 @@ * Actually spawn the process and compile the module. |
@@ -147,5 +147,2 @@ module.exports = exports = configure | ||
// don't copy dev libraries with nodedir option | ||
variables.copy_dev_lib = !gyp.opts.nodedir | ||
// disable -T "thin" static archives by default | ||
@@ -290,2 +287,5 @@ variables.standalone_static_library = gyp.opts.thin ? 0 : 1 | ||
var nodeGypDir = path.resolve(__dirname, '..') | ||
var nodeLibFile = path.join(nodeDir, | ||
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)', | ||
release.name + '.lib') | ||
@@ -301,3 +301,3 @@ argv.push('-I', addon_gypi) | ||
argv.push('-Dnode_gyp_dir=' + nodeGypDir) | ||
argv.push('-Dnode_lib_file=' + release.name + '.lib') | ||
argv.push('-Dnode_lib_file=' + nodeLibFile) | ||
argv.push('-Dmodule_root_dir=' + process.cwd()) | ||
@@ -304,0 +304,0 @@ argv.push('-Dnode_engine=' + |
@@ -77,2 +77,4 @@ var semver = require('semver') | ||
if (overrideDistUrl) | ||
log.verbose('download', 'using dist-url', overrideDistUrl) | ||
@@ -79,0 +81,0 @@ if (overrideDistUrl) |
@@ -14,3 +14,3 @@ { | ||
], | ||
"version": "3.6.1", | ||
"version": "3.6.2", | ||
"installVersion": 9, | ||
@@ -17,0 +17,0 @@ "author": "Nathan Rajlich <nathan@tootallnate.net> (http://tootallnate.net)", |
@@ -195,2 +195,19 @@ node-gyp | ||
Configuration | ||
-------- | ||
__`node-gyp` responds to environment variables or `npm` configuration__ | ||
1. Environment variables take the form `npm_config_OPTION_NAME` for any of the | ||
options listed above (dashes in option names should be replaced by underscores). | ||
These work also when `node-gyp` is invoked directly: | ||
`$ export npm_config_devdir=/tmp/.gyp` | ||
or on Windows | ||
`> set npm_config_devdir=c:\temp\.gyp` | ||
2. As `npm` configuration, variables take the form `OPTION_NAME`. | ||
This way only works when `node-gyp` is executed by `npm`: | ||
`$ npm config set [--global] devdir /tmp/.gyp` | ||
`$ npm i buffertools` | ||
License | ||
@@ -197,0 +214,0 @@ ------- |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1663121
243
2944