@@ -204,7 +204,7 @@ call :getnodeversion || exit /b 1 |
204 | 204 | if defined TAG set configure_flags=%configure_flags% --tag=%TAG% |
205 | 205 |
|
206 | 206 | if not "%target%"=="Clean" goto skip-clean |
207 | | -rmdir /Q /S "%~dp0%config%\node-v%FULLVERSION%-win-%target_arch%" > nul 2> nul |
| 207 | +rmdir /Q /S "%~dp0%config%\%TARGET_NAME%" > nul 2> nul |
208 | 208 | :skip-clean |
209 | 209 |
|
210 | 210 | if defined noprojgen if defined nobuild if not defined sign if not defined msi goto licensertf |
@@ -339,48 +339,50 @@ if not defined stage_package goto install-doctools |
339 | 339 |
|
340 | 340 | echo Creating package... |
341 | 341 | cd Release |
342 | | -rmdir /S /Q node-v%FULLVERSION%-win-%target_arch% > nul 2> nul |
343 | | -mkdir node-v%FULLVERSION%-win-%target_arch% > nul 2> nul |
344 | | -mkdir node-v%FULLVERSION%-win-%target_arch%\node_modules > nul 2>nul |
| 342 | +rmdir /S /Q %TARGET_NAME% > nul 2> nul |
| 343 | +mkdir %TARGET_NAME% > nul 2> nul |
| 344 | +mkdir %TARGET_NAME%\node_modules > nul 2>nul |
345 | 345 |
|
346 | | -copy /Y node.exe node-v%FULLVERSION%-win-%target_arch%\ > nul |
| 346 | +copy /Y node.exe %TARGET_NAME%\ > nul |
347 | 347 | if errorlevel 1 echo 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 |
349 | 349 | if errorlevel 1 echo 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 |
351 | 351 | if errorlevel 1 echo 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 |
353 | 353 | if errorlevel 1 echo 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 |
355 | 355 | if errorlevel 8 echo 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 |
357 | 357 | if errorlevel 1 echo 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 |
359 | 359 | if errorlevel 1 echo 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 |
361 | 361 | if errorlevel 1 echo 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 |
363 | 363 | if errorlevel 1 echo 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 |
365 | 365 | if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error |
| 366 | +copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ > nul |
| 367 | +if errorlevel 1 echo Cannot copy install_tools scripts && goto package_error |
366 | 368 | if not defined 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 |
368 | 370 | if errorlevel 1 echo Cannot copy node_etw_provider.man && goto package_error |
369 | 371 | ) |
370 | 372 | cd .. |
371 | 373 |
|
372 | 374 | :package |
373 | 375 | if not defined package goto msi |
374 | 376 | cd Release |
375 | | -echo Creating node-v%FULLVERSION%-win-%target_arch%.7z |
376 | | -del node-v%FULLVERSION%-win-%target_arch%.7z > nul 2> nul |
377 | | -7z a -r -mx9 -t7z node-v%FULLVERSION%-win-%target_arch%.7z node-v%FULLVERSION%-win-%target_arch% > nul |
378 | | -if errorlevel 1 echo Cannot create node-v%FULLVERSION%-win-%target_arch%.7z && goto package_error |
| 377 | +echo Creating %TARGET_NAME%.7z |
| 378 | +del %TARGET_NAME%.7z > nul 2> nul |
| 379 | +7z a -r -mx9 -t7z %TARGET_NAME%.7z %TARGET_NAME% > nul |
| 380 | +if errorlevel 1 echo Cannot create %TARGET_NAME%.7z && goto package_error |
379 | 381 |
|
380 | | -echo Creating node-v%FULLVERSION%-win-%target_arch%.zip |
381 | | -del node-v%FULLVERSION%-win-%target_arch%.zip > nul 2> nul |
382 | | -7z a -r -mx9 -tzip node-v%FULLVERSION%-win-%target_arch%.zip node-v%FULLVERSION%-win-%target_arch% > nul |
383 | | -if errorlevel 1 echo Cannot create node-v%FULLVERSION%-win-%target_arch%.zip && goto package_error |
| 382 | +echo Creating %TARGET_NAME%.zip |
| 383 | +del %TARGET_NAME%.zip > nul 2> nul |
| 384 | +7z a -r -mx9 -tzip %TARGET_NAME%.zip %TARGET_NAME% > nul |
| 385 | +if errorlevel 1 echo Cannot create %TARGET_NAME%.zip && goto package_error |
384 | 386 |
|
385 | 387 | echo Creating node_pdb.7z |
386 | 388 | del node_pdb.7z > nul 2> nul |
@@ -433,13 +435,13 @@ scp -F %SSHCONFIG% Release\node_pdb.zip %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%F |
433 | 435 | if errorlevel 1 goto exit |
434 | 436 | scp -F %SSHCONFIG% Release\node_pdb.7z %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%FULLVERSION%/win-%target_arch%/node_pdb.7z |
435 | 437 | if errorlevel 1 goto exit |
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 |
437 | 439 | if errorlevel 1 goto exit |
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 |
439 | 441 | if errorlevel 1 goto exit |
440 | 442 | scp -F %SSHCONFIG% node-v%FULLVERSION%-%target_arch%.msi %STAGINGSERVER%:nodejs/%DISTTYPEDIR%/v%FULLVERSION%/ |
441 | 443 | if errorlevel 1 goto exit |
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%*" |
443 | 445 | if errorlevel 1 goto exit |
444 | 446 |
|
445 | 447 |
|
@@ -733,4 +735,5 @@ set FULLVERSION=%NODE_VERSION%-%TAG% |
733 | 735 |
|
734 | 736 | :distexit |
735 | 737 | if not defined DISTTYPEDIR set DISTTYPEDIR=%DISTTYPE% |
| 738 | +set TARGET_NAME=node-v%FULLVERSION%-win-%target_arch% |
736 | 739 | goto :EOF |