Changeset 71991 in vbox for trunk/src

Timestamp:

Apr 24, 2018 7:11:35 AM (7 years ago)

Author:

vboxsync

Message:

Installer/win: Submission packing fixes. bugref:8691

Location:

trunk/src/VBox/Installer/win/Scripts

Files:

• PackDriversForSubmission.cmd (modified) (1 diff)
• UnpackBlessedDrivers.cmd (modified) (2 diffs)

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

@@ -176 +176 @@
 rem We unpack it into the bin directory in the usual location.
 rem
+rem Note! Modify the path a little to ensure windows utilities are used before
+rem       cygwin ones, and that we can use stuff from bin\tools if we like.
+rem
+set PATH=%SystemRoot%\System32;%PATH%;%_MY_OPT_BINDIR%
 if "%_MY_OPT_WITH_EXTPACK" == "0"   goto no_extpack_unpack
-set PATH=%PATH%;%_MY_OPT_BINDIR%
 set _MY_EXTPACK_DIR=%_MY_OPT_BINDIR%\ExtensionPacks\Oracle_VM_VirtualBox_Extension_Pack
 if not exist "%_MY_OPT_BINDIR%\ExtensionPacks"  ( mkdir "%_MY_OPT_BINDIR%\ExtensionPacks" || goto end_failed )

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

@@ -60 +60 @@
 
 :opt_h
-echo This script unpacks the cabinent contining the blessed driver files from
+echo This script unpacks the zip-file containing the blessed driver files from
 echo Microsoft, replacing original files in the bin directory.  The catalog files
 echo will be signed again and the Microsoft signature merged with ours.
 echo .
-echo Usage: UnpackBlessedDrivers.cmd [-b bindir] [-n/--no-sign-cat] -i input.cab
+echo Usage: UnpackBlessedDrivers.cmd [-b bindir] [-n/--no-sign-cat] -i input.zip
 echo .
 echo Warning! This script should normally be invoked from the repack directory
@@ -104 +104 @@
 rem subdirectories and just put all the files in the specified bin dir.
 rem
-expand "%_MY_OPT_INPUT%" "%_MY_OPT_BINDIR%" -i -f:* || goto end_failed
+
+rem We're getting ZIP files back now.
+rem expand "%_MY_OPT_INPUT%" "%_MY_OPT_BINDIR%" -i -f:* || goto end_failed
+echo fixme
+goto end_failed
+
 
 rem