Changeset 72058 in vbox for trunk/src/VBox

Timestamp:

Apr 27, 2018 12:01:51 PM (7 years ago)

Author:

vboxsync

Message:

Installer/win: Some repacking script fixes. bugref:8691

File:

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

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

@@ -216 +216 @@
 rem
 echo **************************************************************************
+echo * AMD64: Repackaging installers
+echo **************************************************************************
 echo * AMD64: Compiling WIX...
-echo **************************************************************************
 cd /d "%_MY_REPACK_DIR_AMD64%" || goto end_failed
 for %%i in (1-*.cmd) do (call %%i || goto end_failed)
@@ -235 +236 @@
 rem
 echo **************************************************************************
+echo * X86: Repackaging installers
+echo **************************************************************************
 echo * X86: Compiling WIX...
-echo **************************************************************************
 cd /d "%_MY_REPACK_DIR_X86%" || goto end_failed
 for %%i in (1-*.cmd) do (call %%i || goto end_failed)
@@ -256 +258 @@
 for %%i in (VirtualBox-*MultiArch*exe) do (
     copy /y "%%i" "%_MY_OPT_OUTDIR%" || goto end_failed
-    set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
 )
 
@@ -272 +274 @@
 for %%i in (%_MY_TMP_OUT%) do (
     set _MY_TMP_OUT=%_MY_OPT_OUTDIR%\%%~nxi
-    set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nix
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nix
 )
 call "%_MY_REPACK_DIR_X86%\RepackExtPack.cmd" --bindir-amd64 "%_MY_BINDIR_AMD64%" --bindir-x86 "%_MY_BINDIR_X86%" ^
@@ -282 +284 @@
 for %%i in (%_MY_TMP_OUT%) do (
     set _MY_TMP_OUT=%_MY_OPT_OUTDIR%\%%~nxi
-    set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nix
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nix
 )
 call "%_MY_REPACK_DIR_X86%\RepackExtPack.cmd" --bindir-amd64 "%_MY_BINDIR_AMD64%" --bindir-x86 "%_MY_BINDIR_X86%" ^