Changeset 77351 in vbox for trunk/src/VBox/Installer/win/Scripts/Combined-3-Repack.cmd

Timestamp:

Feb 18, 2019 6:46:41 PM (6 years ago)

Author:

vboxsync

Message:

Installer/win: Fix typos breaking the re-packing scripts. Include the target arch in the name of the MSM files (helps when copying them all to the output directory after repacking). Move most of the clean up out of the defines (where it needs eval) to normal OTHER_CLEAN. bugref:8691

File:

• trunk/src/VBox/Installer/win/Scripts/Combined-3-Repack.cmd (modified) (4 diffs)

trunk/src/VBox/Installer/win/Scripts/Combined-3-Repack.cmd

@@ -80 +80 @@
 
 :opt_h
-echo Toplevel combined package: Prepare both x86 and amd64 for submission.
-echo .
-echo Usage: Combined-1-Prepare.cmd [-o output-dir] [-e/--extpack puel.vbox-extpack]
+echo Toplevel combined package: Repack the installer and extpacks.
+echo .
+echo Usage: Combined-3-Repack.cmd [-o output-dir] [-e/--extpack puel.vbox-extpack]
 echo            [-s/--extpack-enterprise puel-enterprise.vbox-extpack]
 echo            [-u/--vboxall-dir unpacked-vboxall-dir] [-t build-type]
+echo            [--signed-amd64 signed-amd64.zip]
+echo            [--signed-x86 signed-x86.zip]
 echo
 echo .
@@ -256 +258 @@
 
 set _MY_OUT_FILES=
+cd /d "%_MY_REPACK_DIR_AMD64%" || goto end_failed
+for %%i in (VBoxMerge*msm) do (
+    copy /y "%%i" "%_MY_OPT_OUTDIR%" || goto end_failed
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
+)
+cd /d "%_MY_REPACK_DIR_X86%" || goto end_failed
+for %%i in (VBoxMerge*msm) do (
+    copy /y "%%i" "%_MY_OPT_OUTDIR%" || goto end_failed
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
+)
 for %%i in (VirtualBox-*MultiArch*exe) do (
     copy /y "%%i" "%_MY_OPT_OUTDIR%" || goto end_failed
@@ -274 +286 @@
 for %%i in (%_MY_TMP_OUT%) do (
     set _MY_TMP_OUT=%_MY_OPT_OUTDIR%\%%~nxi
-    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nix
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
 )
 call "%_MY_REPACK_DIR_X86%\RepackExtPack.cmd" --bindir-amd64 "%_MY_BINDIR_AMD64%" --bindir-x86 "%_MY_BINDIR_X86%" ^
@@ -284 +296 @@
 for %%i in (%_MY_TMP_OUT%) do (
     set _MY_TMP_OUT=%_MY_OPT_OUTDIR%\%%~nxi
-    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nix
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
 )
 call "%_MY_REPACK_DIR_X86%\RepackExtPack.cmd" --bindir-amd64 "%_MY_BINDIR_AMD64%" --bindir-x86 "%_MY_BINDIR_X86%" ^