Skip to content

Commit 706bc41

Browse files
refackBridgeAR
refack
authored and
BridgeAR
committed
build,win: pack the install-tools scripts for dist
PR-URL: #24233 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 6c8a73d commit 706bc41

2 files changed

Lines changed: 31 additions & 28 deletions

File tree

‎tools/msvs/msi/product.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@
387387

388388
<UIRefId="WixUI_Common"/>
389389
<UIRefId="WixUI_ErrorProgressText"/>
390-
<WixVariableId="WixUIBannerBmp"Value="..\..\..\doc\thin-white-stripe.jpg"/>
391-
<WixVariableId="WixUIDialogBmp"Value="..\..\..\doc\full-white-stripe.jpg"/>
390+
<WixVariableId="WixUIBannerBmp"Value="$(var.RepoDir)\doc\thin-white-stripe.jpg"/>
391+
<WixVariableId="WixUIDialogBmp"Value="$(var.RepoDir)\doc\full-white-stripe.jpg"/>
392392
<WixVariableId="WixUILicenseRtf"Value="$(var.SourceDir)\LICENSE.rtf"/>
393393
</Product>
394394

‎vcbuild.bat‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ call :getnodeversion || exit /b 1
204204
ifdefined TAG setconfigure_flags=%configure_flags% --tag=%TAG%
205205

206206
ifnot"%target%"=="Clean"goto skip-clean
207-
rmdir /Q /S "%~dp0%config%\node-v%FULLVERSION%-win-%target_arch%">nul2>nul
207+
rmdir /Q /S "%~dp0%config%\%TARGET_NAME%">nul2>nul
208208
:skip-clean
209209

210210
ifdefined noprojgen ifdefined nobuild ifnotdefined sign ifnotdefined msi goto licensertf
@@ -339,48 +339,50 @@ if not defined stage_package goto install-doctools
339339

340340
echo Creating package...
341341
cd Release
342-
rmdir /S /Q node-v%FULLVERSION%-win-%target_arch%>nul2>nul
343-
mkdirnode-v%FULLVERSION%-win-%target_arch%>nul2>nul
344-
mkdirnode-v%FULLVERSION%-win-%target_arch%\node_modules >nul2>nul
342+
rmdir /S /Q %TARGET_NAME%>nul2>nul
343+
mkdir%TARGET_NAME%>nul2>nul
344+
mkdir%TARGET_NAME%\node_modules >nul2>nul
345345

346-
copy /Y node.exe node-v%FULLVERSION%-win-%target_arch%\ >nul
346+
copy /Y node.exe %TARGET_NAME%\ >nul
347347
iferrorlevel1echo Cannot copy node.exe &&goto package_error
348-
copy /Y ..\LICENSE node-v%FULLVERSION%-win-%target_arch%\ >nul
348+
copy /Y ..\LICENSE %TARGET_NAME%\ >nul
349349
iferrorlevel1echo Cannot copy LICENSE &&goto package_error
350-
copy /Y ..\README.md node-v%FULLVERSION%-win-%target_arch%\ >nul
350+
copy /Y ..\README.md %TARGET_NAME%\ >nul
351351
iferrorlevel1echo Cannot copy README.md &&goto package_error
352-
copy /Y ..\CHANGELOG.md node-v%FULLVERSION%-win-%target_arch%\ >nul
352+
copy /Y ..\CHANGELOG.md %TARGET_NAME%\ >nul
353353
iferrorlevel1echo Cannot copy CHANGELOG.md &&goto package_error
354-
robocopy ..\deps\npm node-v%FULLVERSION%-win-%target_arch%\node_modules\npm /e /xd test >nul
354+
robocopy ..\deps\npm %TARGET_NAME%\node_modules\npm /e /xd test >nul
355355
iferrorlevel8echo Cannot copy npm package &&goto package_error
356-
copy /Y ..\deps\npm\bin\npm node-v%FULLVERSION%-win-%target_arch%\ >nul
356+
copy /Y ..\deps\npm\bin\npm %TARGET_NAME%\ >nul
357357
iferrorlevel1echo Cannot copy npm &&goto package_error
358-
copy /Y ..\deps\npm\bin\npm.cmd node-v%FULLVERSION%-win-%target_arch%\ >nul
358+
copy /Y ..\deps\npm\bin\npm.cmd %TARGET_NAME%\ >nul
359359
iferrorlevel1echo Cannot copy npm.cmd &&goto package_error
360-
copy /Y ..\deps\npm\bin\npx node-v%FULLVERSION%-win-%target_arch%\ >nul
360+
copy /Y ..\deps\npm\bin\npx %TARGET_NAME%\ >nul
361361
iferrorlevel1echo Cannot copy npx &&goto package_error
362-
copy /Y ..\deps\npm\bin\npx.cmd node-v%FULLVERSION%-win-%target_arch%\ >nul
362+
copy /Y ..\deps\npm\bin\npx.cmd %TARGET_NAME%\ >nul
363363
iferrorlevel1echo Cannot copy npx.cmd &&goto package_error
364-
copy /Y ..\tools\msvs\nodevars.bat node-v%FULLVERSION%-win-%target_arch%\ >nul
364+
copy /Y ..\tools\msvs\nodevars.bat %TARGET_NAME%\ >nul
365365
iferrorlevel1echo Cannot copy nodevars.bat &&goto package_error
366+
copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ >nul
367+
iferrorlevel1echo Cannot copy install_tools scripts &&goto package_error
366368
ifnotdefined noetw (
367-
copy /Y ..\src\res\node_etw_provider.man node-v%FULLVERSION%-win-%target_arch%\ >nul
369+
copy /Y ..\src\res\node_etw_provider.man %TARGET_NAME%\ >nul
368370
iferrorlevel1echo Cannot copy node_etw_provider.man &&goto package_error
369371
)
370372
cd ..
371373

372374
:package
373375
ifnotdefined package goto msi
374376
cd Release
375-
echo Creating node-v%FULLVERSION%-win-%target_arch%.7z
376-
delnode-v%FULLVERSION%-win-%target_arch%.7z >nul2>nul
377-
7z a -r -mx9 -t7z node-v%FULLVERSION%-win-%target_arch%.7z node-v%FULLVERSION%-win-%target_arch%>nul
378-
iferrorlevel1echo Cannot create node-v%FULLVERSION%-win-%target_arch%.7z &&goto package_error
377+
echo Creating %TARGET_NAME%.7z
378+
del%TARGET_NAME%.7z >nul2>nul
379+
7z a -r -mx9 -t7z %TARGET_NAME%.7z %TARGET_NAME%>nul
380+
iferrorlevel1echo Cannot create %TARGET_NAME%.7z &&goto package_error
379381

380-
echo Creating node-v%FULLVERSION%-win-%target_arch%.zip
381-
delnode-v%FULLVERSION%-win-%target_arch%.zip >nul2>nul
382-
7z a -r -mx9 -tzip node-v%FULLVERSION%-win-%target_arch%.zip node-v%FULLVERSION%-win-%target_arch%>nul
383-
iferrorlevel1echo Cannot create node-v%FULLVERSION%-win-%target_arch%.zip &&goto package_error
382+
echo Creating %TARGET_NAME%.zip
383+
del%TARGET_NAME%.zip >nul2>nul
384+
7z a -r -mx9 -tzip %TARGET_NAME%.zip %TARGET_NAME%>nul
385+
iferrorlevel1echo Cannot create %TARGET_NAME%.zip &&goto package_error
384386

385387
echo Creating node_pdb.7z
386388
del node_pdb.7z >nul2>nul
@@ -433,13 +435,13 @@ scp -F %SSHCONFIG% Release\node_pdb.zip %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%F
433435
iferrorlevel1gotoexit
434436
scp -F %SSHCONFIG% Release\node_pdb.7z %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%FULLVERSION%/win-%target_arch%/node_pdb.7z
435437
iferrorlevel1gotoexit
436-
scp -F %SSHCONFIG% Release\node-v%FULLVERSION%-win-%target_arch%.7z %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%FULLVERSION%/node-v%FULLVERSION%-win-%target_arch%.7z
438+
scp -F %SSHCONFIG% Release\%TARGET_NAME%.7z %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%FULLVERSION%/%TARGET_NAME%.7z
437439
iferrorlevel1gotoexit
438-
scp -F %SSHCONFIG% Release\node-v%FULLVERSION%-win-%target_arch%.zip %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%FULLVERSION%/node-v%FULLVERSION%-win-%target_arch%.zip
440+
scp -F %SSHCONFIG% Release\%TARGET_NAME%.zip %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%FULLVERSION%/%TARGET_NAME%.zip
439441
iferrorlevel1gotoexit
440442
scp -F %SSHCONFIG% node-v%FULLVERSION%-%target_arch%.msi %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%FULLVERSION%/
441443
iferrorlevel1gotoexit
442-
ssh -F %SSHCONFIG%%STAGINGSERVER%"touch nodejs/%DISTTYPEDIR%/v%FULLVERSION%/node-v%FULLVERSION%-%target_arch%.msi.done nodejs/%DISTTYPEDIR%/v%FULLVERSION%/node-v%FULLVERSION%-win-%target_arch%.zip.done nodejs/%DISTTYPEDIR%/v%FULLVERSION%/node-v%FULLVERSION%-win-%target_arch%.7z.done nodejs/%DISTTYPEDIR%/v%FULLVERSION%/win-%target_arch%.done && chmod -R ug=rw-x+X,o=r+X nodejs/%DISTTYPEDIR%/v%FULLVERSION%/node-v%FULLVERSION%-%target_arch%.* nodejs/%DISTTYPEDIR%/v%FULLVERSION%/win-%target_arch%*"
444+
ssh -F %SSHCONFIG%%STAGINGSERVER%"touch nodejs/%DISTTYPEDIR%/v%FULLVERSION%/node-v%FULLVERSION%-%target_arch%.msi.done nodejs/%DISTTYPEDIR%/v%FULLVERSION%/%TARGET_NAME%.zip.done nodejs/%DISTTYPEDIR%/v%FULLVERSION%/%TARGET_NAME%.7z.done nodejs/%DISTTYPEDIR%/v%FULLVERSION%/win-%target_arch%.done && chmod -R ug=rw-x+X,o=r+X nodejs/%DISTTYPEDIR%/v%FULLVERSION%/node-v%FULLVERSION%-%target_arch%.* nodejs/%DISTTYPEDIR%/v%FULLVERSION%/win-%target_arch%*"
443445
iferrorlevel1gotoexit
444446

445447

@@ -733,4 +735,5 @@ set FULLVERSION=%NODE_VERSION%-%TAG%
733735

734736
:distexit
735737
ifnotdefined DISTTYPEDIR setDISTTYPEDIR=%DISTTYPE%
738+
setTARGET_NAME=node-v%FULLVERSION%-win-%target_arch%
736739
goto :EOF

0 commit comments

Comments
 (0)