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 <rod@vagg.org>
1 parent d3478d7 commit 03683f0

3 files changed

Lines changed: 67 additions & 132 deletions

File tree

‎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
functiondownloadNodeLib(done){
303303
log.verbose('on Windows; need to download `'+release.name+'.lib`...')
304-
vardir32=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-
varasync=2
315-
mkdir(dir32,function(err){
316-
if(err)returndone(err)
317-
log.verbose('streaming 32-bit '+release.name+'.lib to:',libPath32)
318-
319-
try{
320-
varreq=download(gyp,process.env,release.libUrl32,cb)
321-
}catch(e){
322-
returncb(e)
323-
}
324-
325-
req.on('error',done)
326-
req.on('response',function(res){
327-
if(res.statusCode!==200){
328-
done(newError(res.statusCode+' status code downloading 32-bit '+release.name+'.lib'))
329-
return
304+
vararchs=['ia32','x64']
305+
varasync=archs.length
306+
archs.forEach(function(arch){
307+
vardir=path.resolve(devDir,arch)
308+
vartargetLibPath=path.resolve(dir,release.name+'.lib')
309+
varlibUrl=release[arch].libUrl
310+
varlibPath=release[arch].libPath
311+
varname=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)returndone(err)
317+
log.verbose('streaming',name,'to:',targetLibPath)
318+
319+
try{
320+
varreq=download(gyp,process.env,libUrl,cb)
321+
}catch(e){
322+
returncb(e)
330323
}
331324

332-
getContentSha(res,function(_,checksum){
333-
contentShasums[release.libPath32]=checksum
334-
log.verbose('content checksum',release.libPath32,checksum)
335-
})
336-
337-
varws=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)returndone(err)
347-
log.verbose('streaming 64-bit '+release.name+'.lib to:',libPath64)
348-
349-
try{
350-
varreq=download(gyp,process.env,release.libUrl64,cb)
351-
}catch(e){
352-
returncb(e)
353-
}
325+
req.on('error',done)
326+
req.on('response',function(res){
327+
if(res.statusCode!==200){
328+
done(newError(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(newError(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+
varws=fs.createWriteStream(targetLibPath)
338+
ws.on('error',cb)
339+
req.pipe(ws)
365340
})
366-
367-
varws=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 ~ node@0.10.42', 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 ~ node@0.12.10', 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 ~ node@4.1.23', 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 ~ node@4.1.23 / 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 ~ node@4.1.23 --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 ~ node@4.1.23 --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 ~ frankenstein@4.1.23', 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 ~ frankenstein@4.1.23 --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 ~ node@4.0.0-rc.4', 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 ~ node@4.0.0-rc.4 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 ~ node@4.0.0-rc.4 - 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
deleteprocess.env.NODEJS_ORG_MIRROR

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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 <rod@vagg.org>
1 parent d3478d7 commit 03683f0
3 files changed
Lines changed: 67 additions & 132 deletions
File tree
‎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
functiondownloadNodeLib(done){
303303
log.verbose('on Windows; need to download `'+release.name+'.lib`...')
304-
vardir32=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-
varasync=2
315-
mkdir(dir32,function(err){
316-
if(err)returndone(err)
317-
log.verbose('streaming 32-bit '+release.name+'.lib to:',libPath32)
318-
319-
try{
320-
varreq=download(gyp,process.env,release.libUrl32,cb)
321-
}catch(e){
322-
returncb(e)
323-
}
324-
325-
req.on('error',done)
326-
req.on('response',function(res){
327-
if(res.statusCode!==200){
328-
done(newError(res.statusCode+' status code downloading 32-bit '+release.name+'.lib'))
329-
return
304+
vararchs=['ia32','x64']
305+
varasync=archs.length
306+
archs.forEach(function(arch){
307+
vardir=path.resolve(devDir,arch)
308+
vartargetLibPath=path.resolve(dir,release.name+'.lib')
309+
varlibUrl=release[arch].libUrl
310+
varlibPath=release[arch].libPath
311+
varname=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)returndone(err)
317+
log.verbose('streaming',name,'to:',targetLibPath)
318+
319+
try{
320+
varreq=download(gyp,process.env,libUrl,cb)
321+
}catch(e){
322+
returncb(e)
330323
}
331324

332-
getContentSha(res,function(_,checksum){
333-
contentShasums[release.libPath32]=checksum
334-
log.verbose('content checksum',release.libPath32,checksum)
335-
})
336-
337-
varws=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)returndone(err)
347-
log.verbose('streaming 64-bit '+release.name+'.lib to:',libPath64)
348-
349-
try{
350-
varreq=download(gyp,process.env,release.libUrl64,cb)
351-
}catch(e){
352-
returncb(e)
353-
}
325+
req.on('error',done)
326+
req.on('response',function(res){
327+
if(res.statusCode!==200){
328+
done(newError(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(newError(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+
varws=fs.createWriteStream(targetLibPath)
338+
ws.on('error',cb)
339+
req.pipe(ws)
365340
})
366-
367-
varws=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 ~ node@0.10.42', 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 ~ node@0.12.10', 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 ~ node@4.1.23', 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 ~ node@4.1.23 / 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 ~ node@4.1.23 --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 ~ node@4.1.23 --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 ~ frankenstein@4.1.23', 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 ~ frankenstein@4.1.23 --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 ~ node@4.0.0-rc.4', 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 ~ node@4.0.0-rc.4 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 ~ node@4.0.0-rc.4 - 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
deleteprocess.env.NODEJS_ORG_MIRROR
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 <rod@vagg.org>
1 parent d3478d7 commit 03683f0
3 files changed
Lines changed: 67 additions & 132 deletions
File tree
‎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
functiondownloadNodeLib(done){
303303
log.verbose('on Windows; need to download `'+release.name+'.lib`...')
304-
vardir32=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-
varasync=2
315-
mkdir(dir32,function(err){
316-
if(err)returndone(err)
317-
log.verbose('streaming 32-bit '+release.name+'.lib to:',libPath32)
318-
319-
try{
320-
varreq=download(gyp,process.env,release.libUrl32,cb)
321-
}catch(e){
322-
returncb(e)
323-
}
324-
325-
req.on('error',done)
326-
req.on('response',function(res){
327-
if(res.statusCode!==200){
328-
done(newError(res.statusCode+' status code downloading 32-bit '+release.name+'.lib'))
329-
return
304+
vararchs=['ia32','x64']
305+
varasync=archs.length
306+
archs.forEach(function(arch){
307+
vardir=path.resolve(devDir,arch)
308+
vartargetLibPath=path.resolve(dir,release.name+'.lib')
309+
varlibUrl=release[arch].libUrl
310+
varlibPath=release[arch].libPath
311+
varname=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)returndone(err)
317+
log.verbose('streaming',name,'to:',targetLibPath)
318+
319+
try{
320+
varreq=download(gyp,process.env,libUrl,cb)
321+
}catch(e){
322+
returncb(e)
330323
}
331324

332-
getContentSha(res,function(_,checksum){
333-
contentShasums[release.libPath32]=checksum
334-
log.verbose('content checksum',release.libPath32,checksum)
335-
})
336-
337-
varws=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)returndone(err)
347-
log.verbose('streaming 64-bit '+release.name+'.lib to:',libPath64)
348-
349-
try{
350-
varreq=download(gyp,process.env,release.libUrl64,cb)
351-
}catch(e){
352-
returncb(e)
353-
}
325+
req.on('error',done)
326+
req.on('response',function(res){
327+
if(res.statusCode!==200){
328+
done(newError(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(newError(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+
varws=fs.createWriteStream(targetLibPath)
338+
ws.on('error',cb)
339+
req.pipe(ws)
365340
})
366-
367-
varws=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 ~ node@0.10.42', 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 ~ node@0.12.10', 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 ~ node@4.1.23', 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 ~ node@4.1.23 / 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 ~ node@4.1.23 --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 ~ node@4.1.23 --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 ~ frankenstein@4.1.23', 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 ~ frankenstein@4.1.23 --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 ~ node@4.0.0-rc.4', 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 ~ node@4.0.0-rc.4 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 ~ node@4.0.0-rc.4 - 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
deleteprocess.env.NODEJS_ORG_MIRROR
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 <rod@vagg.org>
1 parent d3478d7 commit 03683f0
3 files changed
Lines changed: 67 additions & 132 deletions
File tree
‎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
functiondownloadNodeLib(done){
303303
log.verbose('on Windows; need to download `'+release.name+'.lib`...')
304-
vardir32=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-
varasync=2
315-
mkdir(dir32,function(err){
316-
if(err)returndone(err)
317-
log.verbose('streaming 32-bit '+release.name+'.lib to:',libPath32)
318-
319-
try{
320-
varreq=download(gyp,process.env,release.libUrl32,cb)
321-
}catch(e){
322-
returncb(e)
323-
}
324-
325-
req.on('error',done)
326-
req.on('response',function(res){
327-
if(res.statusCode!==200){
328-
done(newError(res.statusCode+' status code downloading 32-bit '+release.name+'.lib'))
329-
return
304+
vararchs=['ia32','x64']
305+
varasync=archs.length
306+
archs.forEach(function(arch){
307+
vardir=path.resolve(devDir,arch)
308+
vartargetLibPath=path.resolve(dir,release.name+'.lib')
309+
varlibUrl=release[arch].libUrl
310+
varlibPath=release[arch].libPath
311+
varname=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)returndone(err)
317+
log.verbose('streaming',name,'to:',targetLibPath)
318+
319+
try{
320+
varreq=download(gyp,process.env,libUrl,cb)
321+
}catch(e){
322+
returncb(e)
330323
}
331324

332-
getContentSha(res,function(_,checksum){
333-
contentShasums[release.libPath32]=checksum
334-
log.verbose('content checksum',release.libPath32,checksum)
335-
})
336-
337-
varws=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)returndone(err)
347-
log.verbose('streaming 64-bit '+release.name+'.lib to:',libPath64)
348-
349-
try{
350-
varreq=download(gyp,process.env,release.libUrl64,cb)
351-
}catch(e){
352-
returncb(e)
353-
}
325+
req.on('error',done)
326+
req.on('response',function(res){
327+
if(res.statusCode!==200){
328+
done(newError(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(newError(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+
varws=fs.createWriteStream(targetLibPath)
338+
ws.on('error',cb)
339+
req.pipe(ws)
365340
})
366-
367-
varws=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 ~ node@0.10.42', 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 ~ node@0.12.10', 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 ~ node@4.1.23', 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 ~ node@4.1.23 / 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 ~ node@4.1.23 --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 ~ node@4.1.23 --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 ~ frankenstein@4.1.23', 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 ~ frankenstein@4.1.23 --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 ~ node@4.0.0-rc.4', 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 ~ node@4.0.0-rc.4 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 ~ node@4.0.0-rc.4 - 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
deleteprocess.env.NODEJS_ORG_MIRROR
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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 <rod@vagg.org>
1 parent d3478d7 commit 03683f0
3 files changed
Lines changed: 67 additions & 132 deletions
File tree
‎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
functiondownloadNodeLib(done){
303303
log.verbose('on Windows; need to download `'+release.name+'.lib`...')
304-
vardir32=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-
varasync=2
315-
mkdir(dir32,function(err){
316-
if(err)returndone(err)
317-
log.verbose('streaming 32-bit '+release.name+'.lib to:',libPath32)
318-
319-
try{
320-
varreq=download(gyp,process.env,release.libUrl32,cb)
321-
}catch(e){
322-
returncb(e)
323-
}
324-
325-
req.on('error',done)
326-
req.on('response',function(res){
327-
if(res.statusCode!==200){
328-
done(newError(res.statusCode+' status code downloading 32-bit '+release.name+'.lib'))
329-
return
304+
vararchs=['ia32','x64']
305+
varasync=archs.length
306+
archs.forEach(function(arch){
307+
vardir=path.resolve(devDir,arch)
308+
vartargetLibPath=path.resolve(dir,release.name+'.lib')
309+
varlibUrl=release[arch].libUrl
310+
varlibPath=release[arch].libPath
311+
varname=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)returndone(err)
317+
log.verbose('streaming',name,'to:',targetLibPath)
318+
319+
try{
320+
varreq=download(gyp,process.env,libUrl,cb)
321+
}catch(e){
322+
returncb(e)
330323
}
331324

332-
getContentSha(res,function(_,checksum){
333-
contentShasums[release.libPath32]=checksum
334-
log.verbose('content checksum',release.libPath32,checksum)
335-
})
336-
337-
varws=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)returndone(err)
347-
log.verbose('streaming 64-bit '+release.name+'.lib to:',libPath64)
348-
349-
try{
350-
varreq=download(gyp,process.env,release.libUrl64,cb)
351-
}catch(e){
352-
returncb(e)
353-
}
325+
req.on('error',done)
326+
req.on('response',function(res){
327+
if(res.statusCode!==200){
328+
done(newError(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(newError(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+
varws=fs.createWriteStream(targetLibPath)
338+
ws.on('error',cb)
339+
req.pipe(ws)
365340
})
366-
367-
varws=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 ~ node@0.10.42', 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 ~ node@0.12.10', 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 ~ node@4.1.23', 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 ~ node@4.1.23 / 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 ~ node@4.1.23 --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 ~ node@4.1.23 --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 ~ frankenstein@4.1.23', 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 ~ frankenstein@4.1.23 --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 ~ node@4.0.0-rc.4', 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 ~ node@4.0.0-rc.4 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 ~ node@4.0.0-rc.4 - 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
deleteprocess.env.NODEJS_ORG_MIRROR
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 <rod@vagg.org>
1 parent d3478d7 commit 03683f0
3 files changed
Lines changed: 67 additions & 132 deletions
File tree
‎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
functiondownloadNodeLib(done){
303303
log.verbose('on Windows; need to download `'+release.name+'.lib`...')
304-
vardir32=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-
varasync=2
315-
mkdir(dir32,function(err){
316-
if(err)returndone(err)
317-
log.verbose('streaming 32-bit '+release.name+'.lib to:',libPath32)
318-
319-
try{
320-
varreq=download(gyp,process.env,release.libUrl32,cb)
321-
}catch(e){
322-
returncb(e)
323-
}
324-
325-
req.on('error',done)
326-
req.on('response',function(res){
327-
if(res.statusCode!==200){
328-
done(newError(res.statusCode+' status code downloading 32-bit '+release.name+'.lib'))
329-
return
304+
vararchs=['ia32','x64']
305+
varasync=archs.length
306+
archs.forEach(function(arch){
307+
vardir=path.resolve(devDir,arch)
308+
vartargetLibPath=path.resolve(dir,release.name+'.lib')
309+
varlibUrl=release[arch].libUrl
310+
varlibPath=release[arch].libPath
311+
varname=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)returndone(err)
317+
log.verbose('streaming',name,'to:',targetLibPath)
318+
319+
try{
320+
varreq=download(gyp,process.env,libUrl,cb)
321+
}catch(e){
322+
returncb(e)
330323
}
331324

332-
getContentSha(res,function(_,checksum){
333-
contentShasums[release.libPath32]=checksum
334-
log.verbose('content checksum',release.libPath32,checksum)
335-
})
336-
337-
varws=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)returndone(err)
347-
log.verbose('streaming 64-bit '+release.name+'.lib to:',libPath64)
348-
349-
try{
350-
varreq=download(gyp,process.env,release.libUrl64,cb)
351-
}catch(e){
352-
returncb(e)
353-
}
325+
req.on('error',done)
326+
req.on('response',function(res){
327+
if(res.statusCode!==200){
328+
done(newError(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(newError(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+
varws=fs.createWriteStream(targetLibPath)
338+
ws.on('error',cb)
339+
req.pipe(ws)
365340
})
366-
367-
varws=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 ~ node@0.10.42', 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 ~ node@0.12.10', 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 ~ node@4.1.23', 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 ~ node@4.1.23 / 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 ~ node@4.1.23 --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 ~ node@4.1.23 --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 ~ frankenstein@4.1.23', 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 ~ frankenstein@4.1.23 --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 ~ node@4.0.0-rc.4', 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 ~ node@4.0.0-rc.4 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 ~ node@4.0.0-rc.4 - 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
deleteprocess.env.NODEJS_ORG_MIRROR
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 <rod@vagg.org>
1 parent d3478d7 commit 03683f0
3 files changed
Lines changed: 67 additions & 132 deletions
File tree
‎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
functiondownloadNodeLib(done){
303303
log.verbose('on Windows; need to download `'+release.name+'.lib`...')
304-
vardir32=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-
varasync=2
315-
mkdir(dir32,function(err){
316-
if(err)returndone(err)
317-
log.verbose('streaming 32-bit '+release.name+'.lib to:',libPath32)
318-
319-
try{
320-
varreq=download(gyp,process.env,release.libUrl32,cb)
321-
}catch(e){
322-
returncb(e)
323-
}
324-
325-
req.on('error',done)
326-
req.on('response',function(res){
327-
if(res.statusCode!==200){
328-
done(newError(res.statusCode+' status code downloading 32-bit '+release.name+'.lib'))
329-
return
304+
vararchs=['ia32','x64']
305+
varasync=archs.length
306+
archs.forEach(function(arch){
307+
vardir=path.resolve(devDir,arch)
308+
vartargetLibPath=path.resolve(dir,release.name+'.lib')
309+
varlibUrl=release[arch].libUrl
310+
varlibPath=release[arch].libPath
311+
varname=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)returndone(err)
317+
log.verbose('streaming',name,'to:',targetLibPath)
318+
319+
try{
320+
varreq=download(gyp,process.env,libUrl,cb)
321+
}catch(e){
322+
returncb(e)
330323
}
331324

332-
getContentSha(res,function(_,checksum){
333-
contentShasums[release.libPath32]=checksum
334-
log.verbose('content checksum',release.libPath32,checksum)
335-
})
336-
337-
varws=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)returndone(err)
347-
log.verbose('streaming 64-bit '+release.name+'.lib to:',libPath64)
348-
349-
try{
350-
varreq=download(gyp,process.env,release.libUrl64,cb)
351-
}catch(e){
352-
returncb(e)
353-
}
325+
req.on('error',done)
326+
req.on('response',function(res){
327+
if(res.statusCode!==200){
328+
done(newError(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(newError(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+
varws=fs.createWriteStream(targetLibPath)
338+
ws.on('error',cb)
339+
req.pipe(ws)
365340
})
366-
367-
varws=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 ~ node@0.10.42', 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 ~ node@0.12.10', 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 ~ node@4.1.23', 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 ~ node@4.1.23 / 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 ~ node@4.1.23 --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 ~ node@4.1.23 --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 ~ frankenstein@4.1.23', 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 ~ frankenstein@4.1.23 --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 ~ node@4.0.0-rc.4', 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 ~ node@4.0.0-rc.4 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 ~ node@4.0.0-rc.4 - 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
deleteprocess.env.NODEJS_ORG_MIRROR
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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 <rod@vagg.org>
1 parent d3478d7 commit 03683f0
3 files changed
Lines changed: 67 additions & 132 deletions
File tree
‎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
functiondownloadNodeLib(done){
303303
log.verbose('on Windows; need to download `'+release.name+'.lib`...')
304-
vardir32=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-
varasync=2
315-
mkdir(dir32,function(err){
316-
if(err)returndone(err)
317-
log.verbose('streaming 32-bit '+release.name+'.lib to:',libPath32)
318-
319-
try{
320-
varreq=download(gyp,process.env,release.libUrl32,cb)
321-
}catch(e){
322-
returncb(e)
323-
}
324-
325-
req.on('error',done)
326-
req.on('response',function(res){
327-
if(res.statusCode!==200){
328-
done(newError(res.statusCode+' status code downloading 32-bit '+release.name+'.lib'))
329-
return
304+
vararchs=['ia32','x64']
305+
varasync=archs.length
306+
archs.forEach(function(arch){
307+
vardir=path.resolve(devDir,arch)
308+
vartargetLibPath=path.resolve(dir,release.name+'.lib')
309+
varlibUrl=release[arch].libUrl
310+
varlibPath=release[arch].libPath
311+
varname=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)returndone(err)
317+
log.verbose('streaming',name,'to:',targetLibPath)
318+
319+
try{
320+
varreq=download(gyp,process.env,libUrl,cb)
321+
}catch(e){
322+
returncb(e)
330323
}
331324

332-
getContentSha(res,function(_,checksum){
333-
contentShasums[release.libPath32]=checksum
334-
log.verbose('content checksum',release.libPath32,checksum)
335-
})
336-
337-
varws=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)returndone(err)
347-
log.verbose('streaming 64-bit '+release.name+'.lib to:',libPath64)
348-
349-
try{
350-
varreq=download(gyp,process.env,release.libUrl64,cb)
351-
}catch(e){
352-
returncb(e)
353-
}
325+
req.on('error',done)
326+
req.on('response',function(res){
327+
if(res.statusCode!==200){
328+
done(newError(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(newError(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+
varws=fs.createWriteStream(targetLibPath)
338+
ws.on('error',cb)
339+
req.pipe(ws)
365340
})
366-
367-
varws=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 ~ node@0.10.42', 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 ~ node@0.12.10', 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 ~ node@4.1.23', 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 ~ node@4.1.23 / 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 ~ node@4.1.23 --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 ~ node@4.1.23 --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 ~ frankenstein@4.1.23', 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 ~ frankenstein@4.1.23 --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 ~ node@4.0.0-rc.4', 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 ~ node@4.0.0-rc.4 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 ~ node@4.0.0-rc.4 - 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
deleteprocess.env.NODEJS_ORG_MIRROR
0 commit comments
Comments
 (0)