aboutsummaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/node-gyp
diff options
context:
space:
mode:
authorRod Vagg <rod@vagg.org>2015-07-13 13:35:02 +1000
committerRod Vagg <rod@vagg.org>2015-08-04 11:56:16 -0700
commit9f727f5e03bbe6f798f0a084bf318f78f064013d (patch)
tree8fa4eebb6d89f293340f9f2af197b18be97bd167 /deps/npm/node_modules/node-gyp
parent04fd4fad462d6cb6fa3ddfe3e673903935d9cd5a (diff)
downloadandroid-node-v8-9f727f5e03bbe6f798f0a084bf318f78f064013d.tar.gz
android-node-v8-9f727f5e03bbe6f798f0a084bf318f78f064013d.tar.bz2
android-node-v8-9f727f5e03bbe6f798f0a084bf318f78f064013d.zip
node-gyp: detect RC build with x.y.z-rc.n format
PR-URL: https://github.com/nodejs/io.js/pull/2171 Reviewed-By: Alexis Campailla <alexis@janeasystems.com> Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Diffstat (limited to 'deps/npm/node_modules/node-gyp')
-rw-r--r--deps/npm/node_modules/node-gyp/lib/install.js16
1 files changed, 10 insertions, 6 deletions
diff --git a/deps/npm/node_modules/node-gyp/lib/install.js b/deps/npm/node_modules/node-gyp/lib/install.js
index 737113bbdf..79b6cd3826 100644
--- a/deps/npm/node_modules/node-gyp/lib/install.js
+++ b/deps/npm/node_modules/node-gyp/lib/install.js
@@ -460,7 +460,7 @@ 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 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
@@ -470,11 +470,15 @@ function getDefaultIojsUrl(version) {
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'))
+ assert.equal(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'))
+ assert.equal(getDefaultIojsUrl('v2.3.4-nightly12345678aaaaaaaaaa'), 'https://iojs.org/download/nightly')
+ console.log('test v2.3.4-nightly.12345678aaaaaaaaaa -> https://iojs.org/download/nightly')
+ assert.equal(getDefaultIojsUrl('v2.3.4-nightly.12345678aaaaaaaaaa'), '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'))
+ assert.equal(getDefaultIojsUrl('v2.3.4-next-nightly12345678aaaaaaaaaa'), 'https://iojs.org/download/next-nightly')
+ console.log('test v2.3.4-next-nightly.12345678aaaaaaaaaa -> https://iojs.org/download/release/next-nightly')
+ assert.equal(getDefaultIojsUrl('v2.3.4-next-nightly.12345678aaaaaaaaaa'), 'https://iojs.org/download/next-nightly')
+ console.log('test v2.3.4-rc.100 -> https://iojs.org/download/rc')
+ assert.equal(getDefaultIojsUrl('v2.3.4-rc.100'), 'https://iojs.org/download/rc')
}