Skip to content

Commit 4748f6a

Browse files
bnoordhuisbnoordhuis
committed
Remove deprecated compatibility code.
* Remove support for the IOJS_ORG_MIRROR, NVM_IOJS_ORG_MIRROR and NVM_NODEJS_ORG_MIRROR enviroment variables. * Remove obsolete support for io.js. It's been out of support for over three years now. PR-URL: #1670 Reviewed-By: Richard Lau <riclau@uk.ibm.com>
1 parent 7a71d68 commit 4748f6a

File tree

3 files changed

+5
-317
lines changed

3 files changed

+5
-317
lines changed

‎lib/process-release.js

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
1717
, versionSemver = semver.parse(version)
1818
, overrideDistUrl = gyp.opts['dist-url'] || gyp.opts.disturl
1919
, isDefaultVersion
20-
, isIojs
2120
, name
2221
, distBaseUrl
2322
, baseUrl
@@ -42,45 +41,24 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
4241

4342
if (defaultRelease) {
4443
// v3 onward, has process.release
45-
name = defaultRelease.name.replace(/io\.js/, 'iojs') // remove the '.' for directory naming purposes
46-
isIojs = name === 'iojs'
44+
name = defaultRelease.name
4745
} else {
4846
// old node or alternative --target=
4947
// semver.satisfies() doesn't like prerelease tags so test major directly
50-
isIojs = versionSemver.major >= 1 && versionSemver.major < 4
51-
name = isIojs ? 'iojs' : 'node'
48+
name = 'node'
5249
}
5350

5451
// check for the nvm.sh standard mirror env variables
55-
if (!overrideDistUrl) {
56-
if (isIojs) {
57-
if (process.env.IOJS_ORG_MIRROR) {
58-
overrideDistUrl = process.env.IOJS_ORG_MIRROR
59-
} else if (process.env.NVM_IOJS_ORG_MIRROR) {// remove on next semver-major
60-
overrideDistUrl = process.env.NVM_IOJS_ORG_MIRROR
61-
log.warn('download',
62-
'NVM_IOJS_ORG_MIRROR is deprecated and will be removed in node-gyp v4, ' +
63-
'please use IOJS_ORG_MIRROR')
64-
}
65-
} else {
66-
if (process.env.NODEJS_ORG_MIRROR) {
67-
overrideDistUrl = process.env.NODEJS_ORG_MIRROR
68-
} else if (process.env.NVM_NODEJS_ORG_MIRROR) {// remove on next semver-major
69-
overrideDistUrl = process.env.NVM_NODEJS_ORG_MIRROR
70-
log.warn('download',
71-
'NVM_NODEJS_ORG_MIRROR is deprecated and will be removed in node-gyp v4, ' +
72-
'please use NODEJS_ORG_MIRROR')
73-
}
74-
}
75-
}
52+
if (!overrideDistUrl && process.env.NODEJS_ORG_MIRROR)
53+
overrideDistUrl = process.env.NODEJS_ORG_MIRROR
7654

7755
if (overrideDistUrl)
7856
log.verbose('download', 'using dist-url', overrideDistUrl)
7957

8058
if (overrideDistUrl)
8159
distBaseUrl = overrideDistUrl.replace(/\/+$/, '')
8260
else
83-
distBaseUrl = isIojs ? 'https://iojs.org/download/release' : 'https://nodejs.org/dist'
61+
distBaseUrl = 'https://nodejs.org/dist'
8462
distBaseUrl += '/v' + version + '/'
8563

8664
// new style, based on process.release so we have a lot of the data we need

‎test/docker.sh

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#set -e
44

55
test_node_versions="0.8.28 0.10.40 0.12.7 4.3.0 5.6.0"
6-
test_iojs_versions="1.8.4 2.4.0 3.3.0"
76

87
myuid=$(id -u)
98
mygid=$(id -g)
@@ -77,25 +76,6 @@ for v in $test_node_versions; do
7776
"
7877
done
7978

80-
# An image for each of the io.js versions we want to test with that version installed and the latest npm
81-
for v in $test_iojs_versions; do
82-
setup_container "node-gyp-test/${v}" "node-gyp-test/clones" "
83-
curl -sL https://iojs.org/dist/v${v}/iojs-v${v}-linux-x64.tar.gz | tar -zxv --strip-components=1 -C /usr/ &&
84-
npm install npm@latest -g &&
85-
node -v && npm -v
86-
"
87-
done
88-
89-
# Run the tests for all of the test images we've created,
90-
# we should see node-gyp doing its download, configure and run thing
91-
# _NOTE: bignum doesn't compile on 0.8 currently so it'll fail for that version only_
92-
for v in $test_node_versions $test_iojs_versions; do
93-
run_tests $v "
94-
cd node-buffertools && npm install --loglevel=info && npm test && cd
95-
"
96-
# removed for now, too noisy: cd node-bignum && npm install --loglevel=info && npm test
97-
done
98-
9979
# Test use of --target=x.y.z to compile against alternate versions
10080
test_download_node_version() {
10181
local run_with_ver="$1"
@@ -112,9 +92,7 @@ test_download_node_version() {
11292
}
11393

11494
test_download_node_version "0.12.7" "0.10.30/src" "0.10.30"
115-
test_download_node_version "3.3.0" "iojs-1.8.4/src" "1.8.4"
11695
# should download the headers file
117-
test_download_node_version "3.3.0" "iojs-3.3.0/include/node" "3.3.0"
11896
test_download_node_version "4.3.0" "4.3.0/include/node" "4.3.0"
11997
test_download_node_version "5.6.0" "5.6.0/include/node" "5.6.0"
12098

@@ -124,36 +102,6 @@ test_download_node_version "5.6.0" "5.6.0/include/node" "5.6.0"
124102
# point for tarballs
125103
# we can test whether it uses the proxy because after 2 connections the proxy will
126104
# die and therefore should not be running at the end of the test, `nc` can tell us this
127-
run_tests "3.3.0" "
128-
(node /node-gyp-src/test/simple-proxy.js 8080 /foobar/ https://iojs.org/dist/ &) &&
129-
cd node-buffertools &&
130-
/node-gyp-src/bin/node-gyp.js --loglevel=info --dist-url=http://localhost:8080/foobar/ rebuild &&
131-
nc -z localhost 8080 && echo -e \"\\n\\n\\033[31mFAILED TO USE LOCAL PROXY\\033[39m\\n\\n\"
132-
"
133-
134-
# REMOVE after next semver-major
135-
run_tests "3.3.0" "
136-
(node /node-gyp-src/test/simple-proxy.js 8080 /doobar/ https://iojs.org/dist/ &) &&
137-
cd node-buffertools &&
138-
NVM_IOJS_ORG_MIRROR=http://localhost:8080/doobar/ /node-gyp-src/bin/node-gyp.js --loglevel=info rebuild &&
139-
nc -z localhost 8080 && echo -e \"\\n\\n\\033[31mFAILED TO USE LOCAL PROXY\\033[39m\\n\\n\"
140-
"
141-
142-
# REMOVE after next semver-major
143-
run_tests "0.12.7" "
144-
(node /node-gyp-src/test/simple-proxy.js 8080 /boombar/ https://nodejs.org/dist/ &) &&
145-
cd node-buffertools &&
146-
NVM_NODEJS_ORG_MIRROR=http://localhost:8080/boombar/ /node-gyp-src/bin/node-gyp.js --loglevel=info rebuild &&
147-
nc -z localhost 8080 && echo -e \"\\n\\n\\033[31mFAILED TO USE LOCAL PROXY\\033[39m\\n\\n\"
148-
"
149-
150-
run_tests "3.3.0" "
151-
(node /node-gyp-src/test/simple-proxy.js 8080 /doobar/ https://iojs.org/dist/ &) &&
152-
cd node-buffertools &&
153-
IOJS_ORG_MIRROR=http://localhost:8080/doobar/ /node-gyp-src/bin/node-gyp.js --loglevel=info rebuild &&
154-
nc -z localhost 8080 && echo -e \"\\n\\n\\033[31mFAILED TO USE LOCAL PROXY\\033[39m\\n\\n\"
155-
"
156-
157105
run_tests "0.12.7" "
158106
(node /node-gyp-src/test/simple-proxy.js 8080 /boombar/ https://nodejs.org/dist/ &) &&
159107
cd node-buffertools &&

‎test/test-process-release.js

Lines changed: 0 additions & 238 deletions
Original file line numberDiff line numberDiff line change
@@ -187,131 +187,6 @@ test('test process release - process.release ~ node@4.1.23 / corp build', functi
187187
})
188188
})
189189

190-
test('test process release - process.version = 1.8.4', function (t) {
191-
t.plan(2)
192-
193-
var release = processRelease([], { opts: {} }, 'v1.8.4', null)
194-
195-
t.equal(release.semver.version, '1.8.4')
196-
delete release.semver
197-
198-
t.deepEqual(release, {
199-
version: '1.8.4',
200-
name: 'iojs',
201-
baseUrl: 'https://iojs.org/download/release/v1.8.4/',
202-
tarballUrl: 'https://iojs.org/download/release/v1.8.4/iojs-v1.8.4.tar.gz',
203-
shasumsUrl: 'https://iojs.org/download/release/v1.8.4/SHASUMS256.txt',
204-
versionDir: 'iojs-1.8.4',
205-
libUrl32: 'https://iojs.org/download/release/v1.8.4/win-x86/iojs.lib',
206-
libUrl64: 'https://iojs.org/download/release/v1.8.4/win-x64/iojs.lib',
207-
libPath32: 'win-x86/iojs.lib',
208-
libPath64: 'win-x64/iojs.lib'
209-
})
210-
})
211-
212-
test('test process release - process.release ~ iojs@3.2.24', function (t) {
213-
t.plan(2)
214-
215-
var release = processRelease([], { opts: {} }, 'v3.2.24', {
216-
name: 'io.js',
217-
headersUrl: 'https://iojs.org/download/release/v3.2.24/iojs-v3.2.24-headers.tar.gz'
218-
})
219-
220-
t.equal(release.semver.version, '3.2.24')
221-
delete release.semver
222-
223-
t.deepEqual(release, {
224-
version: '3.2.24',
225-
name: 'iojs',
226-
baseUrl: 'https://iojs.org/download/release/v3.2.24/',
227-
tarballUrl: 'https://iojs.org/download/release/v3.2.24/iojs-v3.2.24-headers.tar.gz',
228-
shasumsUrl: 'https://iojs.org/download/release/v3.2.24/SHASUMS256.txt',
229-
versionDir: 'iojs-3.2.24',
230-
libUrl32: 'https://iojs.org/download/release/v3.2.24/win-x86/iojs.lib',
231-
libUrl64: 'https://iojs.org/download/release/v3.2.24/win-x64/iojs.lib',
232-
libPath32: 'win-x86/iojs.lib',
233-
libPath64: 'win-x64/iojs.lib'
234-
})
235-
})
236-
237-
test('test process release - process.release ~ iojs@3.2.11 +libUrl32', function (t) {
238-
t.plan(2)
239-
240-
var release = processRelease([], { opts: {} }, 'v3.2.11', {
241-
name: 'io.js',
242-
headersUrl: 'https://iojs.org/download/release/v3.2.11/iojs-v3.2.11-headers.tar.gz',
243-
libUrl: 'https://iojs.org/download/release/v3.2.11/win-x86/iojs.lib' // custom
244-
})
245-
246-
t.equal(release.semver.version, '3.2.11')
247-
delete release.semver
248-
249-
t.deepEqual(release, {
250-
version: '3.2.11',
251-
name: 'iojs',
252-
baseUrl: 'https://iojs.org/download/release/v3.2.11/',
253-
tarballUrl: 'https://iojs.org/download/release/v3.2.11/iojs-v3.2.11-headers.tar.gz',
254-
shasumsUrl: 'https://iojs.org/download/release/v3.2.11/SHASUMS256.txt',
255-
versionDir: 'iojs-3.2.11',
256-
libUrl32: 'https://iojs.org/download/release/v3.2.11/win-x86/iojs.lib',
257-
libUrl64: 'https://iojs.org/download/release/v3.2.11/win-x64/iojs.lib',
258-
libPath32: 'win-x86/iojs.lib',
259-
libPath64: 'win-x64/iojs.lib'
260-
})
261-
})
262-
263-
test('test process release - process.release ~ iojs@3.2.101 +libUrl64', function (t) {
264-
t.plan(2)
265-
266-
var release = processRelease([], { opts: {} }, 'v3.2.101', {
267-
name: 'io.js',
268-
headersUrl: 'https://iojs.org/download/release/v3.2.101/iojs-v3.2.101-headers.tar.gz',
269-
libUrl: 'https://iojs.org/download/release/v3.2.101/win-x64/iojs.lib' // custom
270-
})
271-
272-
t.equal(release.semver.version, '3.2.101')
273-
delete release.semver
274-
275-
t.deepEqual(release, {
276-
version: '3.2.101',
277-
name: 'iojs',
278-
baseUrl: 'https://iojs.org/download/release/v3.2.101/',
279-
tarballUrl: 'https://iojs.org/download/release/v3.2.101/iojs-v3.2.101-headers.tar.gz',
280-
shasumsUrl: 'https://iojs.org/download/release/v3.2.101/SHASUMS256.txt',
281-
versionDir: 'iojs-3.2.101',
282-
libUrl32: 'https://iojs.org/download/release/v3.2.101/win-x86/iojs.lib',
283-
libUrl64: 'https://iojs.org/download/release/v3.2.101/win-x64/iojs.lib',
284-
libPath32: 'win-x86/iojs.lib',
285-
libPath64: 'win-x64/iojs.lib'
286-
})
287-
})
288-
289-
test('test process release - process.release ~ iojs@3.3.0 - borked win-ia32', function (t) {
290-
t.plan(2)
291-
292-
var release = processRelease([], { opts: {} }, 'v3.2.101', {
293-
name: 'io.js',
294-
headersUrl: 'https://iojs.org/download/release/v3.2.101/iojs-v3.2.101-headers.tar.gz',
295-
libUrl: 'https://iojs.org/download/release/v3.2.101/win-ia32/iojs.lib' // custom
296-
})
297-
298-
t.equal(release.semver.version, '3.2.101')
299-
delete release.semver
300-
301-
t.deepEqual(release, {
302-
version: '3.2.101',
303-
name: 'iojs',
304-
baseUrl: 'https://iojs.org/download/release/v3.2.101/',
305-
tarballUrl: 'https://iojs.org/download/release/v3.2.101/iojs-v3.2.101-headers.tar.gz',
306-
shasumsUrl: 'https://iojs.org/download/release/v3.2.101/SHASUMS256.txt',
307-
versionDir: 'iojs-3.2.101',
308-
libUrl32: 'https://iojs.org/download/release/v3.2.101/win-x86/iojs.lib',
309-
libUrl64: 'https://iojs.org/download/release/v3.2.101/win-x64/iojs.lib',
310-
libPath32: 'win-x86/iojs.lib',
311-
libPath64: 'win-x64/iojs.lib'
312-
})
313-
})
314-
315190
test('test process release - process.release ~ node@4.1.23 --target=0.10.40', function (t) {
316191
t.plan(2)
317192

@@ -337,31 +212,6 @@ test('test process release - process.release ~ node@4.1.23 --target=0.10.40', fu
337212
})
338213
})
339214

340-
test('test process release - process.release ~ node@4.1.23 --target=1.8.4', function (t) {
341-
t.plan(2)
342-
343-
var release = processRelease([], { opts: { target: '1.8.4' } }, 'v4.1.23', {
344-
name: 'node',
345-
headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz'
346-
})
347-
348-
t.equal(release.semver.version, '1.8.4')
349-
delete release.semver
350-
351-
t.deepEqual(release, {
352-
version: '1.8.4',
353-
name: 'iojs',
354-
baseUrl: 'https://iojs.org/download/release/v1.8.4/',
355-
tarballUrl: 'https://iojs.org/download/release/v1.8.4/iojs-v1.8.4.tar.gz',
356-
shasumsUrl: 'https://iojs.org/download/release/v1.8.4/SHASUMS256.txt',
357-
versionDir: 'iojs-1.8.4',
358-
libUrl32: 'https://iojs.org/download/release/v1.8.4/win-x86/iojs.lib',
359-
libUrl64: 'https://iojs.org/download/release/v1.8.4/win-x64/iojs.lib',
360-
libPath32: 'win-x86/iojs.lib',
361-
libPath64: 'win-x64/iojs.lib'
362-
})
363-
})
364-
365215
test('test process release - process.release ~ node@4.1.23 --dist-url=https://foo.bar/baz', function (t) {
366216
t.plan(2)
367217

@@ -547,91 +397,3 @@ test('test process release - NODEJS_ORG_MIRROR', function (t) {
547397

548398
delete process.env.NODEJS_ORG_MIRROR
549399
})
550-
551-
test('test process release - NVM_NODEJS_ORG_MIRROR', function (t) {
552-
t.plan(2)
553-
554-
process.env.NVM_NODEJS_ORG_MIRROR = 'http://foo.bar'
555-
556-
var release = processRelease([], { opts: {} }, 'v4.1.23', {
557-
name: 'node',
558-
headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz'
559-
})
560-
561-
t.equal(release.semver.version, '4.1.23')
562-
delete release.semver
563-
564-
t.deepEqual(release, {
565-
version: '4.1.23',
566-
name: 'node',
567-
baseUrl: 'http://foo.bar/v4.1.23/',
568-
tarballUrl: 'http://foo.bar/v4.1.23/node-v4.1.23-headers.tar.gz',
569-
shasumsUrl: 'http://foo.bar/v4.1.23/SHASUMS256.txt',
570-
versionDir: '4.1.23',
571-
libUrl32: 'http://foo.bar/v4.1.23/win-x86/node.lib',
572-
libUrl64: 'http://foo.bar/v4.1.23/win-x64/node.lib',
573-
libPath32: 'win-x86/node.lib',
574-
libPath64: 'win-x64/node.lib'
575-
})
576-
577-
delete process.env.NVM_NODEJS_ORG_MIRROR
578-
})
579-
580-
test('test process release - IOJS_ORG_MIRROR', function (t) {
581-
t.plan(2)
582-
583-
process.env.IOJS_ORG_MIRROR = 'http://foo.bar'
584-
585-
var release = processRelease([], { opts: {} }, 'v3.2.24', {
586-
name: 'io.js',
587-
headersUrl: 'https://iojs.org/download/release/v3.2.24/iojs-v3.2.24-headers.tar.gz'
588-
})
589-
590-
t.equal(release.semver.version, '3.2.24')
591-
delete release.semver
592-
593-
t.deepEqual(release, {
594-
version: '3.2.24',
595-
name: 'iojs',
596-
baseUrl: 'http://foo.bar/v3.2.24/',
597-
tarballUrl: 'http://foo.bar/v3.2.24/iojs-v3.2.24-headers.tar.gz',
598-
shasumsUrl: 'http://foo.bar/v3.2.24/SHASUMS256.txt',
599-
versionDir: 'iojs-3.2.24',
600-
libUrl32: 'http://foo.bar/v3.2.24/win-x86/iojs.lib',
601-
libUrl64: 'http://foo.bar/v3.2.24/win-x64/iojs.lib',
602-
libPath32: 'win-x86/iojs.lib',
603-
libPath64: 'win-x64/iojs.lib'
604-
})
605-
606-
delete process.env.IOJS_ORG_MIRROR
607-
})
608-
609-
610-
test('test process release - NVM_IOJS_ORG_MIRROR', function (t) {
611-
t.plan(2)
612-
613-
process.env.NVM_IOJS_ORG_MIRROR = 'http://foo.bar'
614-
615-
var release = processRelease([], { opts: {} }, 'v3.2.24', {
616-
name: 'io.js',
617-
headersUrl: 'https://iojs.org/download/release/v3.2.24/iojs-v3.2.24-headers.tar.gz'
618-
})
619-
620-
t.equal(release.semver.version, '3.2.24')
621-
delete release.semver
622-
623-
t.deepEqual(release, {
624-
version: '3.2.24',
625-
name: 'iojs',
626-
baseUrl: 'http://foo.bar/v3.2.24/',
627-
tarballUrl: 'http://foo.bar/v3.2.24/iojs-v3.2.24-headers.tar.gz',
628-
shasumsUrl: 'http://foo.bar/v3.2.24/SHASUMS256.txt',
629-
versionDir: 'iojs-3.2.24',
630-
libUrl32: 'http://foo.bar/v3.2.24/win-x86/iojs.lib',
631-
libUrl64: 'http://foo.bar/v3.2.24/win-x64/iojs.lib',
632-
libPath32: 'win-x86/iojs.lib',
633-
libPath64: 'win-x64/iojs.lib'
634-
})
635-
636-
delete process.env.NVM_IOJS_ORG_MIRROR
637-
})

0 commit comments

Comments
 (0)