Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/node-gyp/lib/build.js')
-rw-r--r--node_modules/node-gyp/lib/build.js33
1 files changed, 3 insertions, 30 deletions
diff --git a/node_modules/node-gyp/lib/build.js b/node_modules/node-gyp/lib/build.js
index 525310985..0445fb645 100644
--- a/node_modules/node-gyp/lib/build.js
+++ b/node_modules/node-gyp/lib/build.js
@@ -11,7 +11,6 @@ var fs = require('graceful-fs')
, glob = require('glob')
, log = require('npmlog')
, which = require('which')
- , mkdirp = require('mkdirp')
, exec = require('child_process').exec
, processRelease = require('./process-release')
, win = process.platform === 'win32'
@@ -36,7 +35,6 @@ function build (gyp, argv, callback) {
, config
, arch
, nodeDir
- , copyDevLib
loadConfigGypi()
@@ -60,7 +58,6 @@ function build (gyp, argv, callback) {
buildType = config.target_defaults.default_configuration
arch = config.variables.target_arch
nodeDir = config.variables.nodedir
- copyDevLib = config.variables.copy_dev_lib == 'true'
if ('debug' in gyp.opts) {
buildType = gyp.opts.debug ? 'Debug' : 'Release'
@@ -115,7 +112,7 @@ function build (gyp, argv, callback) {
return
}
log.verbose('`which` succeeded for `' + command + '`', execPath)
- copyNodeLib()
+ doBuild()
})
}
@@ -127,7 +124,7 @@ function build (gyp, argv, callback) {
if (config.variables.msbuild_path) {
command = config.variables.msbuild_path
log.verbose('using MSBuild:', command)
- copyNodeLib()
+ doBuild()
return
}
@@ -180,36 +177,12 @@ function build (gyp, argv, callback) {
return
}
command = msbuildPath
- copyNodeLib()
+ doBuild()
})
})()
})
}
- /**
- * 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)
- })
- }
/**
* Actually spawn the process and compile the module.