Changeset 72056 in vbox for trunk/src/VBox

Timestamp:

Apr 27, 2018 11:38:50 AM (7 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Installer/win/Scripts

Files:

• Combined-1-Prepare.cmd (modified) (1 diff)
• Combined-3-Repack.cmd (modified) (1 diff)
• UnpackBlessedDrivers.cmd (modified) (1 diff)

trunk/src/VBox/Installer/win/Scripts/Combined-1-Prepare.cmd

@@ -154 +154 @@
 
 set _MY_BINDIR_AMD64=%_MY_OPT_UNTAR_DIR%\win.amd64\%_MY_OPT_BUILD_TYPE%\bin
-set _MY_BINDIR_X86=%_MY_OPT_UNTAR_DIR%\win.amd64\%_MY_OPT_BUILD_TYPE%\bin
+set _MY_BINDIR_X86=%_MY_OPT_UNTAR_DIR%\win.x86\%_MY_OPT_BUILD_TYPE%\bin
 if not exist "%_MY_BINDIR_AMD64%"       goto error_amd64_bindir_not_found
 if not exist "%_MY_BINDIR_X86%"         goto error_x86_bindir_not_found

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

@@ -176 +176 @@
 
 set _MY_BINDIR_AMD64=%_MY_OPT_UNTAR_DIR%\win.amd64\%_MY_OPT_BUILD_TYPE%\bin
-set _MY_BINDIR_X86=%_MY_OPT_UNTAR_DIR%\win.amd64\%_MY_OPT_BUILD_TYPE%\bin
+set _MY_BINDIR_X86=%_MY_OPT_UNTAR_DIR%\win.x86\%_MY_OPT_BUILD_TYPE%\bin
 if not exist "%_MY_BINDIR_AMD64%"       goto error_amd64_bindir_not_found
 if not exist "%_MY_BINDIR_X86%"         goto error_x86_bindir_not_found

trunk/src/VBox/Installer/win/Scripts/UnpackBlessedDrivers.cmd

@@ -136 +136 @@
 rem
 if "%_MY_OPT_SIGN_CAT%" == "0" goto no_sign_cat
+set PATH=%PATH%;%_MY_OPT_BINDIR%
 for %%d in (%_MY_DRIVER_BASE_NAMES%) do (
     copy /y "%_MY_OPT_BINDIR%\%%d.cat" "%_MY_OPT_BINDIR%\%%d.cat.ms" || goto end_failed
     call sign-dual.cmd "%_MY_OPT_BINDIR%\%%d.cat" || goto end_failed
-    "%_MY_OPT_BINDIR%\tools\RTSignTool.exe"  add-nested-exe-signature -v "%_MY_OPT_BINDIR%\%%d.cat" "%_MY_OPT_BINDIR%\%%d.cat.ms" || goto end_failed
+    "%_MY_OPT_BINDIR%\tools\RTSignTool.exe"  add-nested-cat-signature -v "%_MY_OPT_BINDIR%\%%d.cat" "%_MY_OPT_BINDIR%\%%d.cat.ms" || goto end_failed
 )
 :no_sign_cat