nodejs
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

node-gyp: make aware of nightly, next-nightly & rc 

A temporary fix only, node-gyp needs to be made more intelligent
upstream about figuring out where to find the download file by
inspecting the binary.

Floating patch on npm.

PR-URL: https://github.com/nodejs/io.js/pull/2066
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Ryan Graham <r.m.graham@gmail.com>
This commit is contained in:
Rod Vagg 2015-06-26 22:17:02 +10:00
parent 1057d1186b
commit 902c9ca51d
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
deps/npm/node_modules/node-gyp/lib/install.js generated vendored
View File

@ -39,8 +39,8 @@ function install (gyp, argv, callback) {
}
}
var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || 'https://iojs.org/dist'
var defaultUrl = getDefaultIojsUrl(process.version)
var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || defaultUrl
// Determine which node dev files version we are installing
var versionStr = argv[0] || gyp.opts.target || process.version
@ -455,3 +455,26 @@ function install (gyp, argv, callback) {
}
}
// pick out 'nightly', 'next-nightly' or 'rc' from the version string if it's there
// adjust URL accordingly
function getDefaultIojsUrl(version) {
var versionMatch = version.match(/^v\d+\.\d+\.\d+-(?:(?:(nightly|next-nightly)\d{8}[0-9a-f]{10})|(?:(rc)\d+))$/)
var distType = versionMatch ? versionMatch[1] || versionMatch[2] : 'release'
var defaultUrl = `https://iojs.org/download/${distType}`
return defaultUrl
}
if (require.main === module) {
var assert = require('assert')
console.log('test v2.3.4 -> https://iojs.org/download/release')
assert(getDefaultIojsUrl('v2.3.4', 'https://iojs.org/download/release'))
console.log('test v2.3.4-nightly12345678aaaaaaaaaa -> https://iojs.org/download/nightly')
assert(getDefaultIojsUrl('v2.3.4-nightly12345678aaaaaaaaaa', 'https://iojs.org/download/nightly'))
console.log('test v2.3.4-next-nightly12345678aaaaaaaaaa -> https://iojs.org/download/release/next-nightly')
assert(getDefaultIojsUrl('v2.3.4-next-nightly12345678aaaaaaaaaa', 'https://iojs.org/download/next-nightly'))
console.log('test v2.3.4-rc100 -> https://iojs.org/download/rc')
assert(getDefaultIojsUrl('v2.3.4-rc100', 'https://iojs.org/download/rc'))
}