Skip to content

Commit 03683f0

Browse files
pmedrvagg
pmed
authored and
rvagg
committed
lib: code de-duplication
Modified the result of processRelease() to return uniform names `libUrl`, `libPath` for Windows in objects named as target platforms (`ia32` and `x64`) This allows to loop over the target platforms in downloadNodeLib() and to use the universal names instead of two almost identical code parts with `libUrl32`, `libPath32` and `libUrl64`, `libPath64` names. PR-URL: #965 Reviewed-By: Rod Vagg <[email protected]>
1 parent d3478d7 commit 03683f0

File tree

3 files changed

+67
-132
lines changed

3 files changed

+67
-132
lines changed

‎lib/install.js‎

Lines changed: 33 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -301,75 +301,44 @@ function install (fs, gyp, argv, callback) {
301301

302302
function downloadNodeLib (done) {
303303
log.verbose('on Windows; need to download `' + release.name + '.lib`...')
304-
var dir32 = path.resolve(devDir, 'ia32')
305-
, dir64 = path.resolve(devDir, 'x64')
306-
, libPath32 = path.resolve(dir32, release.name + '.lib')
307-
, libPath64 = path.resolve(dir64, release.name + '.lib')
308-
309-
log.verbose('32-bit ' + release.name + '.lib dir', dir32)
310-
log.verbose('64-bit ' + release.name + '.lib dir', dir64)
311-
log.verbose('`' + release.name + '.lib` 32-bit url', release.libUrl32)
312-
log.verbose('`' + release.name + '.lib` 64-bit url', release.libUrl64)
313-
314-
var async = 2
315-
mkdir(dir32, function (err) {
316-
if (err) return done(err)
317-
log.verbose('streaming 32-bit ' + release.name + '.lib to:', libPath32)
318-
319-
try {
320-
var req = download(gyp, process.env, release.libUrl32, cb)
321-
} catch (e) {
322-
return cb(e)
323-
}
324-
325-
req.on('error', done)
326-
req.on('response', function (res) {
327-
if (res.statusCode !== 200) {
328-
done(new Error(res.statusCode + ' status code downloading 32-bit ' + release.name + '.lib'))
329-
return
304+
var archs = [ 'ia32', 'x64' ]
305+
var async = archs.length
306+
archs.forEach(function (arch) {
307+
var dir = path.resolve(devDir, arch)
308+
var targetLibPath = path.resolve(dir, release.name + '.lib')
309+
var libUrl = release[arch].libUrl
310+
var libPath = release[arch].libPath
311+
var name = arch + ' ' + release.name + '.lib'
312+
log.verbose(name, 'dir', dir)
313+
log.verbose(name, 'url', libUrl)
314+
315+
mkdir(dir, function (err) {
316+
if (err) return done(err)
317+
log.verbose('streaming', name, 'to:', targetLibPath)
318+
319+
try {
320+
var req = download(gyp, process.env, libUrl, cb)
321+
} catch (e) {
322+
return cb(e)
330323
}
331324

332-
getContentSha(res, function (_, checksum) {
333-
contentShasums[release.libPath32] = checksum
334-
log.verbose('content checksum', release.libPath32, checksum)
335-
})
336-
337-
var ws = fs.createWriteStream(libPath32)
338-
ws.on('error', cb)
339-
req.pipe(ws)
340-
})
341-
req.on('end', function () {
342-
--async || done()
343-
})
344-
})
345-
mkdir(dir64, function (err) {
346-
if (err) return done(err)
347-
log.verbose('streaming 64-bit ' + release.name + '.lib to:', libPath64)
348-
349-
try {
350-
var req = download(gyp, process.env, release.libUrl64, cb)
351-
} catch (e) {
352-
return cb(e)
353-
}
325+
req.on('error', done)
326+
req.on('response', function (res) {
327+
if (res.statusCode !== 200) {
328+
done(new Error(res.statusCode + ' status code downloading ' + name))
329+
return
330+
}
354331

355-
req.on('error', done)
356-
req.on('response', function (res) {
357-
if (res.statusCode !== 200) {
358-
done(new Error(res.statusCode + ' status code downloading 64-bit ' + release.name + '.lib'))
359-
return
360-
}
332+
getContentSha(res, function (_, checksum) {
333+
contentShasums[libPath] = checksum
334+
log.verbose('content checksum', libPath, checksum)
335+
})
361336

362-
getContentSha(res, function (_, checksum) {
363-
contentShasums[release.libPath64] = checksum
364-
log.verbose('content checksum', release.libPath64, checksum)
337+
var ws = fs.createWriteStream(targetLibPath)
338+
ws.on('error', cb)
339+
req.pipe(ws)
365340
})
366-
367-
var ws = fs.createWriteStream(libPath64)
368-
ws.on('error', cb)
369-
req.pipe(ws)
370-
})
371-
req.on('end', function () {
372-
--async || done()
341+
req.on('end', function () { --async || done() })
373342
})
374343
})
375344
} // downloadNodeLib()

‎lib/process-release.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,8 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
9797
tarballUrl: tarballUrl,
9898
shasumsUrl: url.resolve(baseUrl, 'SHASUMS256.txt'),
9999
versionDir: (name !== 'node' ? name + '-' : '') + version,
100-
libUrl32: libUrl32,
101-
libUrl64: libUrl64,
102-
libPath32: normalizePath(path.relative(url.parse(baseUrl).path, url.parse(libUrl32).path)),
103-
libPath64: normalizePath(path.relative(url.parse(baseUrl).path, url.parse(libUrl64).path))
100+
ia32: { libUrl: libUrl32, libPath: normalizePath(path.relative(url.parse(baseUrl).path, url.parse(libUrl32).path)) },
101+
x64: { libUrl: libUrl64, libPath: normalizePath(path.relative(url.parse(baseUrl).path, url.parse(libUrl64).path)) },
104102
}
105103
}
106104

‎test/test-process-release.js‎

Lines changed: 32 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ test('test process release - process.version = 0.8.20', function (t) {
1616
tarballUrl: 'https://nodejs.org/dist/v0.8.20/node-v0.8.20.tar.gz',
1717
shasumsUrl: 'https://nodejs.org/dist/v0.8.20/SHASUMS256.txt',
1818
versionDir: '0.8.20',
19-
libUrl32: 'https://nodejs.org/dist/v0.8.20/node.lib',
20-
libUrl64: 'https://nodejs.org/dist/v0.8.20/x64/node.lib',
21-
libPath32: 'node.lib',
22-
libPath64: 'x64/node.lib'
19+
ia32: { libUrl: 'https://nodejs.org/dist/v0.8.20/node.lib', libPath: 'node.lib' },
20+
x64: { libUrl: 'https://nodejs.org/dist/v0.8.20/x64/node.lib', libPath: 'x64/node.lib' },
2321
})
2422
})
2523

@@ -38,10 +36,8 @@ test('test process release - process.version = 0.10.21', function (t) {
3836
tarballUrl: 'https://nodejs.org/dist/v0.10.21/node-v0.10.21.tar.gz',
3937
shasumsUrl: 'https://nodejs.org/dist/v0.10.21/SHASUMS256.txt',
4038
versionDir: '0.10.21',
41-
libUrl32: 'https://nodejs.org/dist/v0.10.21/node.lib',
42-
libUrl64: 'https://nodejs.org/dist/v0.10.21/x64/node.lib',
43-
libPath32: 'node.lib',
44-
libPath64: 'x64/node.lib'
39+
ia32: { libUrl: 'https://nodejs.org/dist/v0.10.21/node.lib', libPath: 'node.lib' },
40+
x64: { libUrl: 'https://nodejs.org/dist/v0.10.21/x64/node.lib', libPath: 'x64/node.lib' },
4541
})
4642
})
4743

@@ -61,10 +57,8 @@ test('test process release - process.version = 0.12.9', function (t) {
6157
tarballUrl: 'https://nodejs.org/dist/v0.12.9/node-v0.12.9.tar.gz',
6258
shasumsUrl: 'https://nodejs.org/dist/v0.12.9/SHASUMS256.txt',
6359
versionDir: '0.12.9',
64-
libUrl32: 'https://nodejs.org/dist/v0.12.9/node.lib',
65-
libUrl64: 'https://nodejs.org/dist/v0.12.9/x64/node.lib',
66-
libPath32: 'node.lib',
67-
libPath64: 'x64/node.lib'
60+
ia32: { libUrl: 'https://nodejs.org/dist/v0.12.9/node.lib', libPath: 'node.lib' },
61+
x64: { libUrl: 'https://nodejs.org/dist/v0.12.9/x64/node.lib', libPath: 'x64/node.lib' },
6862
})
6963
})
7064

@@ -84,10 +78,8 @@ test('test process release - process.version = 0.10.41', function (t) {
8478
tarballUrl: 'https://nodejs.org/dist/v0.10.41/node-v0.10.41.tar.gz',
8579
shasumsUrl: 'https://nodejs.org/dist/v0.10.41/SHASUMS256.txt',
8680
versionDir: '0.10.41',
87-
libUrl32: 'https://nodejs.org/dist/v0.10.41/node.lib',
88-
libUrl64: 'https://nodejs.org/dist/v0.10.41/x64/node.lib',
89-
libPath32: 'node.lib',
90-
libPath64: 'x64/node.lib'
81+
ia32: { libUrl: 'https://nodejs.org/dist/v0.10.41/node.lib', libPath: 'node.lib' },
82+
x64: { libUrl: 'https://nodejs.org/dist/v0.10.41/x64/node.lib', libPath: 'x64/node.lib' },
9183
})
9284
})
9385

@@ -107,10 +99,8 @@ test('test process release - process.release ~ [email protected]', function (t) {
10799
tarballUrl: 'https://nodejs.org/dist/v0.10.42/node-v0.10.42-headers.tar.gz',
108100
shasumsUrl: 'https://nodejs.org/dist/v0.10.42/SHASUMS256.txt',
109101
versionDir: '0.10.42',
110-
libUrl32: 'https://nodejs.org/dist/v0.10.42/node.lib',
111-
libUrl64: 'https://nodejs.org/dist/v0.10.42/x64/node.lib',
112-
libPath32: 'node.lib',
113-
libPath64: 'x64/node.lib'
102+
ia32: { libUrl: 'https://nodejs.org/dist/v0.10.42/node.lib', libPath: 'node.lib' },
103+
x64: { libUrl: 'https://nodejs.org/dist/v0.10.42/x64/node.lib', libPath: 'x64/node.lib' },
114104
})
115105
})
116106

@@ -130,10 +120,8 @@ test('test process release - process.release ~ [email protected]', function (t) {
130120
tarballUrl: 'https://nodejs.org/dist/v0.12.10/node-v0.12.10-headers.tar.gz',
131121
shasumsUrl: 'https://nodejs.org/dist/v0.12.10/SHASUMS256.txt',
132122
versionDir: '0.12.10',
133-
libUrl32: 'https://nodejs.org/dist/v0.12.10/node.lib',
134-
libUrl64: 'https://nodejs.org/dist/v0.12.10/x64/node.lib',
135-
libPath32: 'node.lib',
136-
libPath64: 'x64/node.lib'
123+
ia32: { libUrl: 'https://nodejs.org/dist/v0.12.10/node.lib', libPath: 'node.lib' },
124+
x64: { libUrl: 'https://nodejs.org/dist/v0.12.10/x64/node.lib', libPath: 'x64/node.lib' },
137125
})
138126
})
139127

@@ -155,10 +143,8 @@ test('test process release - process.release ~ [email protected]', function (t) {
155143
tarballUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz',
156144
shasumsUrl: 'https://nodejs.org/dist/v4.1.23/SHASUMS256.txt',
157145
versionDir: '4.1.23',
158-
libUrl32: 'https://nodejs.org/dist/v4.1.23/win-x86/node.lib',
159-
libUrl64: 'https://nodejs.org/dist/v4.1.23/win-x64/node.lib',
160-
libPath32: 'win-x86/node.lib',
161-
libPath64: 'win-x64/node.lib'
146+
ia32: { libUrl: 'https://nodejs.org/dist/v4.1.23/win-x86/node.lib', libPath: 'win-x86/node.lib' },
147+
x64: { libUrl: 'https://nodejs.org/dist/v4.1.23/win-x64/node.lib', libPath: 'win-x64/node.lib' },
162148
})
163149
})
164150

@@ -180,10 +166,8 @@ test('test process release - process.release ~ [email protected] / corp build', functi
180166
tarballUrl: 'https://some.custom.location/node-v4.1.23-headers.tar.gz',
181167
shasumsUrl: 'https://some.custom.location/SHASUMS256.txt',
182168
versionDir: '4.1.23',
183-
libUrl32: 'https://some.custom.location/win-x86/node.lib',
184-
libUrl64: 'https://some.custom.location/win-x64/node.lib',
185-
libPath32: 'win-x86/node.lib',
186-
libPath64: 'win-x64/node.lib'
169+
ia32: { libUrl: 'https://some.custom.location/win-x86/node.lib', libPath: 'win-x86/node.lib' },
170+
x64: { libUrl: 'https://some.custom.location/win-x64/node.lib', libPath: 'win-x64/node.lib' },
187171
})
188172
})
189173

@@ -205,10 +189,8 @@ test('test process release - process.release ~ [email protected] --target=0.10.40', fu
205189
tarballUrl: 'https://nodejs.org/dist/v0.10.40/node-v0.10.40.tar.gz',
206190
shasumsUrl: 'https://nodejs.org/dist/v0.10.40/SHASUMS256.txt',
207191
versionDir: '0.10.40',
208-
libUrl32: 'https://nodejs.org/dist/v0.10.40/node.lib',
209-
libUrl64: 'https://nodejs.org/dist/v0.10.40/x64/node.lib',
210-
libPath32: 'node.lib',
211-
libPath64: 'x64/node.lib'
192+
ia32: { libUrl: 'https://nodejs.org/dist/v0.10.40/node.lib', libPath: 'node.lib' },
193+
x64: { libUrl: 'https://nodejs.org/dist/v0.10.40/x64/node.lib', libPath: 'x64/node.lib' },
212194
})
213195
})
214196

@@ -230,10 +212,8 @@ test('test process release - process.release ~ [email protected] --dist-url=https://fo
230212
tarballUrl: 'https://foo.bar/baz/v4.1.23/node-v4.1.23-headers.tar.gz',
231213
shasumsUrl: 'https://foo.bar/baz/v4.1.23/SHASUMS256.txt',
232214
versionDir: '4.1.23',
233-
libUrl32: 'https://foo.bar/baz/v4.1.23/win-x86/node.lib',
234-
libUrl64: 'https://foo.bar/baz/v4.1.23/win-x64/node.lib',
235-
libPath32: 'win-x86/node.lib',
236-
libPath64: 'win-x64/node.lib'
215+
ia32: { libUrl: 'https://foo.bar/baz/v4.1.23/win-x86/node.lib', libPath: 'win-x86/node.lib' },
216+
x64: { libUrl: 'https://foo.bar/baz/v4.1.23/win-x64/node.lib', libPath: 'win-x64/node.lib' },
237217
})
238218
})
239219

@@ -255,10 +235,8 @@ test('test process release - process.release ~ [email protected]', function (t
255235
tarballUrl: 'https://frankensteinjs.org/dist/v4.1.23/frankenstein-v4.1.23-headers.tar.gz',
256236
shasumsUrl: 'https://frankensteinjs.org/dist/v4.1.23/SHASUMS256.txt',
257237
versionDir: 'frankenstein-4.1.23',
258-
libUrl32: 'https://frankensteinjs.org/dist/v4.1.23/win-x86/frankenstein.lib',
259-
libUrl64: 'https://frankensteinjs.org/dist/v4.1.23/win-x64/frankenstein.lib',
260-
libPath32: 'win-x86/frankenstein.lib',
261-
libPath64: 'win-x64/frankenstein.lib'
238+
ia32: { libUrl: 'https://frankensteinjs.org/dist/v4.1.23/win-x86/frankenstein.lib', libPath: 'win-x86/frankenstein.lib' },
239+
x64: { libUrl: 'https://frankensteinjs.org/dist/v4.1.23/win-x64/frankenstein.lib', libPath: 'win-x64/frankenstein.lib' },
262240
})
263241
})
264242

@@ -281,10 +259,8 @@ test('test process release - process.release ~ [email protected] --dist-url=ht
281259
tarballUrl: 'http://foo.bar/baz/v4.1.23/frankenstein-v4.1.23-headers.tar.gz',
282260
shasumsUrl: 'http://foo.bar/baz/v4.1.23/SHASUMS256.txt',
283261
versionDir: 'frankenstein-4.1.23',
284-
libUrl32: 'http://foo.bar/baz/v4.1.23/win-x86/frankenstein.lib',
285-
libUrl64: 'http://foo.bar/baz/v4.1.23/win-x64/frankenstein.lib',
286-
libPath32: 'win-x86/frankenstein.lib',
287-
libPath64: 'win-x64/frankenstein.lib'
262+
ia32: { libUrl: 'http://foo.bar/baz/v4.1.23/win-x86/frankenstein.lib', libPath: 'win-x86/frankenstein.lib' },
263+
x64: { libUrl: 'http://foo.bar/baz/v4.1.23/win-x64/frankenstein.lib', libPath: 'win-x64/frankenstein.lib' },
288264
})
289265
})
290266

@@ -306,10 +282,8 @@ test('test process release - process.release ~ [email protected]', function (t) {
306282
tarballUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz',
307283
shasumsUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/SHASUMS256.txt',
308284
versionDir: '4.0.0-rc.4',
309-
libUrl32: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x86/node.lib',
310-
libUrl64: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x64/node.lib',
311-
libPath32: 'win-x86/node.lib',
312-
libPath64: 'win-x64/node.lib'
285+
ia32: { libUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x86/node.lib', libPath: 'win-x86/node.lib' },
286+
x64: { libUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x64/node.lib', libPath: 'win-x64/node.lib' },
313287
})
314288
})
315289

@@ -334,10 +308,8 @@ test('test process release - process.release ~ [email protected] passed as argv[0]
334308
tarballUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz',
335309
shasumsUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/SHASUMS256.txt',
336310
versionDir: '4.0.0-rc.4',
337-
libUrl32: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x86/node.lib',
338-
libUrl64: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x64/node.lib',
339-
libPath32: 'win-x86/node.lib',
340-
libPath64: 'win-x64/node.lib'
311+
ia32: { libUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x86/node.lib', libPath: 'win-x86/node.lib' },
312+
x64: { libUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x64/node.lib', libPath: 'win-x64/node.lib' },
341313
})
342314
})
343315

@@ -362,10 +334,8 @@ test('test process release - process.release ~ [email protected] - bogus string pa
362334
tarballUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz',
363335
shasumsUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/SHASUMS256.txt',
364336
versionDir: '4.0.0-rc.4',
365-
libUrl32: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x86/node.lib',
366-
libUrl64: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x64/node.lib',
367-
libPath32: 'win-x86/node.lib',
368-
libPath64: 'win-x64/node.lib'
337+
ia32: { libUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x86/node.lib', libPath: 'win-x86/node.lib' },
338+
x64: { libUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x64/node.lib', libPath: 'win-x64/node.lib' },
369339
})
370340
})
371341

@@ -389,10 +359,8 @@ test('test process release - NODEJS_ORG_MIRROR', function (t) {
389359
tarballUrl: 'http://foo.bar/v4.1.23/node-v4.1.23-headers.tar.gz',
390360
shasumsUrl: 'http://foo.bar/v4.1.23/SHASUMS256.txt',
391361
versionDir: '4.1.23',
392-
libUrl32: 'http://foo.bar/v4.1.23/win-x86/node.lib',
393-
libUrl64: 'http://foo.bar/v4.1.23/win-x64/node.lib',
394-
libPath32: 'win-x86/node.lib',
395-
libPath64: 'win-x64/node.lib'
362+
ia32: { libUrl: 'http://foo.bar/v4.1.23/win-x86/node.lib', libPath: 'win-x86/node.lib' },
363+
x64: { libUrl: 'http://foo.bar/v4.1.23/win-x64/node.lib', libPath: 'win-x64/node.lib' },
396364
})
397365

398366
delete process.env.NODEJS_ORG_MIRROR

0 commit comments

Comments
 (0)