Skip to content

Commit 71fc3a7

Browse files
MSP-GregMSP-Greg
committed
ucrt, rename a few variables
1 parent 4662c37 commit 71fc3a7

File tree

2 files changed

+44
-42
lines changed

2 files changed

+44
-42
lines changed

‎dist/index.js‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,10 @@ let old_pkgs
316316
let RELEASE_ASSET
317317

318318
// clean inputs
319-
let mingw = getInput('mingw')
320-
let msys2 = getInput('msys2')
319+
let mingwPkgs = getInput('mingw')
320+
let msys2Pkgs = getInput('msys2')
321321

322-
let pre // set in setRuby, ' mingw-w64-x86_64-' or ' mingw-w64-i686-'
322+
let pre // package prefix, set in setRuby
323323
// standard pacman args
324324
const args = '--noconfirm --noprogressbar --needed'
325325

@@ -378,7 +378,7 @@ const openssl = async () => {
378378
await download(uri, fn)
379379
execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
380380
grpEnd(msSt)
381-
mingw = mingw.replace(/\bopenssl\b/gi, '').trim()
381+
mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim()
382382
}
383383
}
384384

@@ -416,34 +416,34 @@ const runMingw = async () => {
416416
grpEnd(msSt)
417417
}
418418

419-
if (mingw.includes('_upgrade_')) {
419+
if (mingwPkgs.includes('_upgrade_')) {
420420
if (ruby.abiVers >= '2.4') {
421421
await updateGCC()
422422
msys2Sync = '-S'
423423
}
424-
mingw = mingw.replace(/\b_upgrade_\b/g, '').trim()
424+
mingwPkgs = mingwPkgs.replace(/\b_upgrade_\b/g, '').trim()
425425
}
426426

427427
/* _msvc_ can be used when building mswin Rubies
428428
* when using an installed mingw Ruby, normally _upgrade_ should be used
429429
*/
430-
if (mingw.includes('_msvc_')) {
430+
if (mingwPkgs.includes('_msvc_')) {
431431
await __nccwpck_require__(956).addVCVARSEnv()
432432
return
433433
}
434434

435-
if (mingw !== '') {
435+
if (mingwPkgs !== '') {
436436
if (ruby.abiVers >= '2.4.0') {
437-
if (mingw.includes('openssl')) {
437+
if (mingwPkgs.includes('openssl')) {
438438
await openssl()
439439
}
440-
if (mingw !== '') {
441-
let pkgs = mingw.split(/\s+/)
440+
if (mingwPkgs !== '') {
441+
let pkgs = mingwPkgs.split(/\s+/)
442442
pkgs.unshift('')
443443
let list = pkgs.join(pre)
444-
if (msys2 !== '') {
445-
list += ' ' + msys2
446-
msys2 = ''
444+
if (msys2Pkgs !== '') {
445+
list += ' ' + msys2Pkgs
446+
msys2Pkgs = ''
447447
}
448448
msSt = grpSt(`pacman.exe -S ${list}`)
449449
execSync(`pacman.exe ${msys2Sync} ${args} ${list}`)
@@ -452,7 +452,7 @@ const runMingw = async () => {
452452
} else {
453453
// install old DevKit packages
454454
let toInstall = []
455-
let pkgs = mingw.split(/\s+/)
455+
let pkgs = mingwPkgs.split(/\s+/)
456456
pkgs.forEach( (pkg) => {
457457
if (old_pkgs[pkg]) {
458458
toInstall.push({ pkg: pkg, uri: old_pkgs[pkg]})
@@ -481,14 +481,15 @@ const runMSYS2 = async () => {
481481
if (ruby.abiVers < '2.4.0') {
482482
pacman = 'C:\\msys64\\usr\\bin\\pacman.exe'
483483
}
484-
msSt = grpSt(`pacman.exe ${msys2Sync} ${msys2}`)
485-
execSync(`${pacman} ${msys2Sync} ${args} ${msys2}`)
484+
msSt = grpSt(`pacman.exe ${msys2Sync} ${msys2Pkgs}`)
485+
execSync(`${pacman} ${msys2Sync} ${args} ${msys2Pkgs}`)
486486
grpEnd(msSt)
487487
}
488488

489489
const setRuby = (_ruby) => {
490490
ruby = _ruby
491-
pre = (ruby.platform === 'x64-mingw32') ? ' mingw-w64-x86_64-' : ' mingw-w64-i686-'
491+
pre = (ruby.platform === 'x64-mingw-ucrt') ? ' mingw-w64-ucrt-x86_64-' :
492+
(ruby.platform === 'x64-mingw32') ? ' mingw-w64-x86_64-' : ' mingw-w64-i686-'
492493
}
493494

494495
const run = async () => {
@@ -501,7 +502,7 @@ const run = async () => {
501502

502503
// await updateKeyRing('1~20210213-1')
503504

504-
if (mingw !== '' || msys2 !== '') {
505+
if (mingwPkgs !== '' || msys2Pkgs !== '') {
505506
if (ruby.abiVers >= '2.4.0') {
506507
// remove pacman CheckSpace, move cache dir to SSD
507508
const conf_fn = 'C:\\msys64\\etc\\pacman.conf'
@@ -537,8 +538,8 @@ const run = async () => {
537538
}
538539

539540
// install user specificied packages
540-
if (mingw !== '') { await runMingw() }
541-
if (msys2 !== '') { await runMSYS2() }
541+
if (mingwPkgs !== '') { await runMingw() }
542+
if (msys2Pkgs !== '') { await runMSYS2() }
542543
}
543544

544545
if (ruby.abiVers >= '2.4.0') {

‎mingw.js‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ let old_pkgs
2828
let RELEASE_ASSET
2929

3030
// clean inputs
31-
let mingw = getInput('mingw')
32-
let msys2 = getInput('msys2')
31+
let mingwPkgs = getInput('mingw')
32+
let msys2Pkgs = getInput('msys2')
3333

34-
let pre // set in setRuby, ' mingw-w64-x86_64-' or ' mingw-w64-i686-'
34+
let pre // package prefix, set in setRuby
3535
// standard pacman args
3636
const args = '--noconfirm --noprogressbar --needed'
3737

@@ -90,7 +90,7 @@ const openssl = async () => {
9090
await download(uri, fn)
9191
execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
9292
grpEnd(msSt)
93-
mingw = mingw.replace(/\bopenssl\b/gi, '').trim()
93+
mingwPkgs = mingwPkgs.replace(/\bopenssl\b/gi, '').trim()
9494
}
9595
}
9696

@@ -128,34 +128,34 @@ const runMingw = async () => {
128128
grpEnd(msSt)
129129
}
130130

131-
if (mingw.includes('_upgrade_')) {
131+
if (mingwPkgs.includes('_upgrade_')) {
132132
if (ruby.abiVers >= '2.4') {
133133
await updateGCC()
134134
msys2Sync = '-S'
135135
}
136-
mingw = mingw.replace(/\b_upgrade_\b/g, '').trim()
136+
mingwPkgs = mingwPkgs.replace(/\b_upgrade_\b/g, '').trim()
137137
}
138138

139139
/* _msvc_ can be used when building mswin Rubies
140140
* when using an installed mingw Ruby, normally _upgrade_ should be used
141141
*/
142-
if (mingw.includes('_msvc_')) {
142+
if (mingwPkgs.includes('_msvc_')) {
143143
await require('./mswin').addVCVARSEnv()
144144
return
145145
}
146146

147-
if (mingw !== '') {
147+
if (mingwPkgs !== '') {
148148
if (ruby.abiVers >= '2.4.0') {
149-
if (mingw.includes('openssl')) {
149+
if (mingwPkgs.includes('openssl')) {
150150
await openssl()
151151
}
152-
if (mingw !== '') {
153-
let pkgs = mingw.split(/\s+/)
152+
if (mingwPkgs !== '') {
153+
let pkgs = mingwPkgs.split(/\s+/)
154154
pkgs.unshift('')
155155
let list = pkgs.join(pre)
156-
if (msys2 !== '') {
157-
list += ' ' + msys2
158-
msys2 = ''
156+
if (msys2Pkgs !== '') {
157+
list += ' ' + msys2Pkgs
158+
msys2Pkgs = ''
159159
}
160160
msSt = grpSt(`pacman.exe -S ${list}`)
161161
execSync(`pacman.exe ${msys2Sync} ${args} ${list}`)
@@ -164,7 +164,7 @@ const runMingw = async () => {
164164
} else {
165165
// install old DevKit packages
166166
let toInstall = []
167-
let pkgs = mingw.split(/\s+/)
167+
let pkgs = mingwPkgs.split(/\s+/)
168168
pkgs.forEach( (pkg) => {
169169
if (old_pkgs[pkg]) {
170170
toInstall.push({ pkg: pkg, uri: old_pkgs[pkg]})
@@ -193,14 +193,15 @@ const runMSYS2 = async () => {
193193
if (ruby.abiVers < '2.4.0') {
194194
pacman = 'C:\\msys64\\usr\\bin\\pacman.exe'
195195
}
196-
msSt = grpSt(`pacman.exe ${msys2Sync} ${msys2}`)
197-
execSync(`${pacman} ${msys2Sync} ${args} ${msys2}`)
196+
msSt = grpSt(`pacman.exe ${msys2Sync} ${msys2Pkgs}`)
197+
execSync(`${pacman} ${msys2Sync} ${args} ${msys2Pkgs}`)
198198
grpEnd(msSt)
199199
}
200200

201201
export const setRuby = (_ruby) => {
202202
ruby = _ruby
203-
pre = (ruby.platform === 'x64-mingw32') ? ' mingw-w64-x86_64-' : ' mingw-w64-i686-'
203+
pre = (ruby.platform === 'x64-mingw-ucrt') ? ' mingw-w64-ucrt-x86_64-' :
204+
(ruby.platform === 'x64-mingw32') ? ' mingw-w64-x86_64-' : ' mingw-w64-i686-'
204205
}
205206

206207
export const run = async () => {
@@ -213,7 +214,7 @@ export const run = async () => {
213214

214215
// await updateKeyRing('1~20210213-1')
215216

216-
if (mingw !== '' || msys2 !== '') {
217+
if (mingwPkgs !== '' || msys2Pkgs !== '') {
217218
if (ruby.abiVers >= '2.4.0') {
218219
// remove pacman CheckSpace, move cache dir to SSD
219220
const conf_fn = 'C:\\msys64\\etc\\pacman.conf'
@@ -249,8 +250,8 @@ export const run = async () => {
249250
}
250251

251252
// install user specificied packages
252-
if (mingw !== '') { await runMingw() }
253-
if (msys2 !== '') { await runMSYS2() }
253+
if (mingwPkgs !== '') { await runMingw() }
254+
if (msys2Pkgs !== '') { await runMSYS2() }
254255
}
255256

256257
if (ruby.abiVers >= '2.4.0') {

0 commit comments

Comments
 (0)