Add io.js support #564
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| test: build-buffertools build-leveldown | ||
|
|
||
| build-buffertools: | ||
| cd node_modules/buffertools/ && \ | ||
| ../../bin/node-gyp.js rebuild | ||
|
|
||
| build-leveldown: | ||
| cd node_modules/leveldown/ && \ | ||
| ../../bin/node-gyp.js rebuild | ||
|
|
||
| test-docker-node: | ||
| docker run \ | ||
| --rm=true -i -v `pwd`:/opt/node-gyp/ \ | ||
| nodesource/node:wheezy \ | ||
| bash -c 'rm -rf /root/.node-gyp/ && cd /opt/node-gyp && make test' | ||
|
|
||
| test-docker-iojs: | ||
| docker run \ | ||
| --rm=true -i -v `pwd`:/opt/node-gyp/ \ | ||
| iojs/iojs:1.0 \ | ||
| bash -c 'rm -rf /root/.node-gyp/ && cd /opt/node-gyp && make test' | ||
|
|
||
| test-docker: test-docker-node test-docker-iojs | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,8 @@ var fs = require('graceful-fs') | |
| , mkdirp = require('mkdirp') | ||
| , exec = require('child_process').exec | ||
| , win = process.platform == 'win32' | ||
| , semver = require('semver') | ||
| , runtime = semver.parse(process.version).major < 1 ? 'node' : 'iojs' | ||
|
There was a problem hiding this comment. Won't this be a problem when node v1 is released? There was a problem hiding this comment. Can there be an override for this as an env variable? e.g. tcr/pangyp@b9209b8 If I want to enable There was a problem hiding this comment. in iojs you can check for To set as a target I would recommend to use same notation as nvm: |
||
|
|
||
| exports.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the module' | ||
|
|
||
|
|
@@ -181,15 +183,15 @@ function build (gyp, argv, callback) { | |
| if (!win || !copyDevLib) return doBuild() | ||
|
|
||
| var buildDir = path.resolve(nodeDir, buildType) | ||
| , archNodeLibPath = path.resolve(nodeDir, arch, runtime + '.lib') | ||
| , buildNodeLibPath = path.resolve(buildDir, runtime + '.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 "' + runtime + '.lib" for ' + arch, buildNodeLibPath) | ||
| rs.pipe(ws) | ||
| rs.on('error', callback) | ||
| ws.on('error', callback) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,50 +15,45 @@ var fs = require('graceful-fs') | |
| , crypto = require('crypto') | ||
| , zlib = require('zlib') | ||
| , log = require('npmlog') | ||
| , fstream = require('fstream') | ||
| , request = require('request') | ||
| , minimatch = require('minimatch') | ||
| , mkdir = require('mkdirp') | ||
| , getRelease = require('./util/release') | ||
| , win = process.platform == 'win32' | ||
|
|
||
|
There was a problem hiding this comment. Any idea to support nvm custom dist url env by default? https://github.com/creationix/nvm/blob/master/nvm.sh#L73 There was a problem hiding this comment. @fengmk2 would this be to support mirrors, like in China? I'm tinkering around in there currently and it wouldn't be hard to bring in custom URLs from where my local version is at. There was a problem hiding this comment. Not only for mirrors, but also can be used in private NPM services. @rvagg There was a problem hiding this comment. @rvagg yes, it will be very helpful for us. |
||
| function install (gyp, argv, callback) { | ||
|
|
||
| // Determine which node dev files version we are installing | ||
| var release | ||
| try { | ||
| release = getRelease(gyp, argv[0] || gyp.opts.target) | ||
| } catch (e) { | ||
| return callback(e) | ||
| } | ||
|
|
||
| console.log(release) | ||
|
|
||
|
|
||
| log.verbose('install', 'input version string %j', release.versionStr) | ||
|
|
||
| // ensure no double-callbacks happen | ||
| function cb (err) { | ||
| if (cb.done) return | ||
| cb.done = true | ||
| if (err) { | ||
| log.warn('install', 'got an error, rolling back install') | ||
| // roll-back the install if anything went wrong | ||
| gyp.commands.remove([ release.version.version ], function (err2) { | ||
| callback(err) | ||
| }) | ||
| } else { | ||
| callback(null, release) | ||
| } | ||
| } | ||
|
|
||
| // 0.x.y-pre versions are not published yet and cannot be installed. Bail. | ||
| if (release.version.prerelease[0] === 'pre') { | ||
| log.verbose('detected "pre" node version', release.versionStr) | ||
| if (gyp.opts.nodedir) { | ||
| log.verbose('--nodedir flag was passed; skipping install', gyp.opts.nodedir) | ||
| callback() | ||
|
|
@@ -69,23 +64,16 @@ function install (gyp, argv, callback) { | |
| } | ||
|
|
||
| // flatten version into String | ||
| log.verbose('install', 'installing version: %s', release.version.version) | ||
|
|
||
| // If '--ensure' was passed, then don't *always* install the version; | ||
| // check if it is already installed, and only install when needed | ||
| if (gyp.opts.ensure) { | ||
| log.verbose('install', '--ensure was passed, so won\'t reinstall if already installed') | ||
| fs.stat(release.devDir, function (err, stat) { | ||
| if (err) { | ||
| if (err.code == 'ENOENT') { | ||
| log.verbose('install', 'version not already installed, continuing with install', release.versionStr) | ||
| go() | ||
| } else if (err.code == 'EACCES') { | ||
| eaccesFallback() | ||
|
|
@@ -95,7 +83,7 @@ function install (gyp, argv, callback) { | |
| return | ||
| } | ||
| log.verbose('install', 'version is already installed, need to check "installVersion"') | ||
| var installVersionFile = path.resolve(release.devDir, 'installVersion') | ||
| fs.readFile(installVersionFile, 'ascii', function (err, ver) { | ||
| if (err && err.code != 'ENOENT') { | ||
| return cb(err) | ||
|
|
@@ -156,7 +144,7 @@ function install (gyp, argv, callback) { | |
| } | ||
|
|
||
| function getContentSha(res, callback) { | ||
| var shasum = crypto.createHash(release.checksumAlgo) | ||
| res.on('data', function (chunk) { | ||
| shasum.update(chunk) | ||
| }).on('end', function () { | ||
|
|
@@ -166,10 +154,10 @@ function install (gyp, argv, callback) { | |
|
|
||
| function go () { | ||
|
|
||
| log.verbose('ensuring nodedir is created', release.devDir) | ||
|
|
||
| // first create the dir for the node dev files | ||
| mkdir(release.devDir, function (err, created) { | ||
| if (err) { | ||
| if (err.code == 'EACCES') { | ||
| eaccesFallback() | ||
|
|
@@ -184,33 +172,32 @@ function install (gyp, argv, callback) { | |
| } | ||
|
|
||
| // now download the node tarball | ||
| var tarPath = gyp.opts.tarball | ||
| , badDownload = false | ||
| , extractCount = 0 | ||
| , gunzip = zlib.createGunzip() | ||
| , extracter = tar.Extract({ path: release.devDir, strip: 1, filter: isValid }) | ||
|
|
||
| var contentShasums = {} | ||
| var expectShasums = {} | ||
|
|
||
| // checks if a file to be extracted from the tarball is valid. | ||
| // only .h header files and the gyp files get extracted | ||
| function isValid () { | ||
| var name = this.path.substring(release.devDir.length + 1) | ||
| var validName = valid(name) | ||
| if (name === '' && this.type === 'Directory') { | ||
| // the first directory entry is ok | ||
| return true | ||
| } | ||
| if (validName) { | ||
| log.verbose('extracted file from tarball', name) | ||
| extractCount++ | ||
| } else { | ||
| // invalid | ||
| log.silly('ignoring from tarball', name) | ||
| } | ||
| return validName | ||
| } | ||
|
|
||
| gunzip.on('error', cb) | ||
|
|
@@ -220,12 +207,12 @@ function install (gyp, argv, callback) { | |
| // download the tarball, gunzip and extract! | ||
|
|
||
| if (tarPath) { | ||
| var input = fs.createReadStream(release.sourceUrl) | ||
| input.pipe(gunzip).pipe(extracter) | ||
| return | ||
| } | ||
|
|
||
| var req = download(release.sourceUrl) | ||
| if (!req) return | ||
|
|
||
| // something went wrong downloading the tarball? | ||
|
|
@@ -248,7 +235,7 @@ function install (gyp, argv, callback) { | |
| } | ||
| // content checksum | ||
| getContentSha(res, function (_, checksum) { | ||
| var filename = path.basename(release.sourceUrl).trim() | ||
| contentShasums[filename] = checksum | ||
| log.verbose('content checksum', filename, checksum) | ||
| }) | ||
|
|
@@ -274,7 +261,7 @@ function install (gyp, argv, callback) { | |
|
|
||
| // write the "installVersion" file | ||
| async++ | ||
| var installVersionPath = path.resolve(release.devDir, 'installVersion') | ||
| fs.writeFile(installVersionPath, gyp.package.installVersion + '\n', deref) | ||
|
|
||
| // download SHASUMS.txt | ||
|
|
@@ -306,13 +293,11 @@ function install (gyp, argv, callback) { | |
| } | ||
|
|
||
| function downloadShasums(done) { | ||
| log.verbose('check download content checksum, need to download `' + release.shasumsFile + '`...') | ||
| var shasumsPath = path.resolve(release.devDir, release.shasumsFile) | ||
|
|
||
| log.verbose('checksum url', release.shasumsUrl) | ||
| var req = download(release.shasumsUrl) | ||
| if (!req) return | ||
| req.on('error', done) | ||
| req.on('response', function (res) { | ||
|
|
@@ -343,36 +328,38 @@ function install (gyp, argv, callback) { | |
| } | ||
|
|
||
| function downloadNodeLib (done) { | ||
| log.verbose('on Windows; need to download `' + runtime + '.lib`...') | ||
| var dir32 = path.resolve(release.devDir, 'ia32') | ||
| , dir64 = path.resolve(release.devDir, 'x64') | ||
| , nodeLibPath32 = path.resolve(dir32, runtime + '.lib') | ||
| , nodeLibPath64 = path.resolve(dir64, runtime + '.lib') | ||
| , nodeLibUrlFile32 = (runtime == 'node' ? 'node.lib' : 'win-x86/iojs.lib') | ||
| , nodeLibUrlFile64 = (runtime == 'node' ? 'x64/node.lib' : 'win-x64/iojs.lib') | ||
| , nodeLibUrl32 = distUrl + '/v' + version + '/' + nodeLibUrlFile32 | ||
| , nodeLibUrl64 = distUrl + '/v' + version + '/' + nodeLibUrlFile64 | ||
|
|
||
| log.verbose('32-bit ' + runtime + '.lib dir', dir32) | ||
| log.verbose('64-bit ' + runtime + '.lib dir', dir64) | ||
| log.verbose('`' + runtime + '.lib` 32-bit url', nodeLibUrl32) | ||
| log.verbose('`' + runtime + '.lib` 64-bit url', nodeLibUrl64) | ||
|
|
||
| var async = 2 | ||
| mkdir(dir32, function (err) { | ||
| if (err) return done(err) | ||
| log.verbose('streaming 32-bit ' + runtime + '.lib to:', nodeLibPath32) | ||
|
|
||
| var req = download(nodeLibUrl32) | ||
| if (!req) return | ||
| req.on('error', done) | ||
| req.on('response', function (res) { | ||
| if (res.statusCode !== 200) { | ||
| done(new Error(res.statusCode + ' status code downloading 32-bit ' + runtime + '.lib')) | ||
| return | ||
| } | ||
|
|
||
| getContentSha(res, function (_, checksum) { | ||
| contentShasums[nodeLibUrlFile32] = checksum | ||
| log.verbose('content checksum', nodeLibUrlFile32, checksum) | ||
| }) | ||
|
|
||
| var ws = fs.createWriteStream(nodeLibPath32) | ||
|
|
@@ -385,20 +372,20 @@ function install (gyp, argv, callback) { | |
| }) | ||
| mkdir(dir64, function (err) { | ||
| if (err) return done(err) | ||
| log.verbose('streaming 64-bit ' + runtime + '.lib to:', nodeLibPath64) | ||
|
|
||
| var req = download(nodeLibUrl64) | ||
| if (!req) return | ||
| req.on('error', done) | ||
| req.on('response', function (res) { | ||
| if (res.statusCode !== 200) { | ||
| done(new Error(res.statusCode + ' status code downloading 64-bit ' + runtime + '.lib')) | ||
| return | ||
| } | ||
|
|
||
| getContentSha(res, function (_, checksum) { | ||
| contentShasums[nodeLibUrlFile64] = checksum | ||
| log.verbose('content checksum', nodeLibUrlFile64, checksum) | ||
| }) | ||
|
|
||
| var ws = fs.createWriteStream(nodeLibPath64) | ||
|
|
@@ -437,7 +424,7 @@ function install (gyp, argv, callback) { | |
| function eaccesFallback () { | ||
| var tmpdir = osenv.tmpdir() | ||
| gyp.devDir = path.resolve(tmpdir, '.node-gyp') | ||
| log.warn('EACCES', 'user "%s" does not have permission to access the dev dir "%s"', osenv.user(), release.devDir) | ||
| log.warn('EACCES', 'attempting to reinstall using temporary dev dir "%s"', gyp.devDir) | ||
| if (process.cwd() == tmpdir) { | ||
| log.verbose('tmpdir == cwd', 'automatically will remove dev files after to save disk space') | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This and
build-leveldownshould probably depend on annpm installtask if you want these tests to be self-contained for CI.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
howso? that's why they are in devDependencies, doesn't that suffice?