Changeset 82226 in vbox for trunk/src/VBox/Installer

Timestamp:

Nov 26, 2019 6:18:16 PM (5 years ago)

Author:

vboxsync

Message:

PackDriversForSubmission.cmd: GuestAdditions packing for M$ signing (bugref:9587)

File:

• trunk/src/VBox/Installer/win/Scripts/PackDriversForSubmission.cmd (modified) (12 diffs)

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

@@ -26 +26 @@
 set _MY_OPT_BINDIR=..\bin
 set _MY_OPT_PDBDIR=
+set _MY_OPT_GADIR=
+set _MY_OPT_WITH_MAIN=1
 set _MY_OPT_WITH_PDB=1
 set _MY_OPT_EXTPACK=
 set _MY_OPT_WITH_EXTPACK=1
+set _MY_OPT_WITH_GA=0
 set _MY_OPT_OUTPUT=
 set _MY_OPT_DDF_FILE=
-set _MY_OPT_ARCH=@KBUILD_TARGET_ARCH@
+set _MY_OPT_ARCH=amd64
 
 :argument_loop
@@ -52 +55 @@
 if ".%1" == ".-e"           goto opt_e
 if ".%1" == ".--extpack"    goto opt_e
+if ".%1" == ".--no-main"    goto opt_m
 if ".%1" == ".-n"           goto opt_n
 if ".%1" == ".--no-pdb"     goto opt_n
@@ -60 +64 @@
 if ".%1" == ".-x"           goto opt_x
 if ".%1" == ".--no-extpack" goto opt_x
+if ".%1" == ".-g"           goto opt_g
+if ".%1" == ".--ga"         goto opt_g
+if ".%1" == ".--additions"  goto opt_g
 echo syntax error: Unknown option: %1
 echo               Try --help to list valid options.
@@ -94 +101 @@
 echo Microsoft to run on recent Windows 10 installations.
 echo .
-echo Usage: PackDriversForSubmission.cmd [-b bindir] [-p pdbdir] [-n/--no-pdb]
-echo           [-e expack] [-x/--no-extpack] [-o output.cab] [-p output.ddf] [-a x86/amd64]
+echo Usage: PackDriversForSubmission.cmd [-b bindir] [-p pdbdir] [--no-main] [-n/--no-pdb] [-e expack]
+echo           [-x/--no-extpack] [-g/--ga/--additions] [-o output.cab] [-p output.ddf] [-a x86/amd64] 
 echo .
 echo Warning! This script should normally be invoked from the repack directory w/o any parameters.
 goto end_failed
 
+:opt_m
+set _MY_OPT_WITH_MAIN=0
+shift
+goto argument_loop
+
 :opt_n
 set _MY_OPT_WITH_PDB=0
@@ -120 +132 @@
 goto argument_loop
 
+:opt_g
+set _MY_OPT_WITH_GA=1
+shift
+goto argument_loop
+
+
 :syntax_error_missing_value
 echo syntax error: missing or empty option value after %1
@@ -139 +157 @@
 echo syntax error: Specified extension pack does not exist: "%_MY_OPT_EXTPACK%"
 goto end_failed
+
+:error_additions_does_not_exist
+echo syntax error: Specified guest additions does not exist: "%_MY_OPT_GADIR%"
+goto end_failed
+
 
 :error_output_exists
@@ -152 +175 @@
 if not exist "%_MY_OPT_BINDIR%"     goto error_bindir_does_not_exist
 
-if "%_MY_OPT_WITH_PDB" == "0"       goto no_pdbdir_validation
+if "%_MY_OPT_WITH_PDB%" == "0"      goto no_pdbdir_validation
 if ".%_MY_OPT_PDBDIR%" == "."       set _MY_OPT_PDBDIR=%_MY_OPT_BINDIR%\..\stage\debug\bin
 if not exist "%_MY_OPT_PDBDIR%"     goto error_pdbdir_does_not_exist
 :no_pdbdir_validation
 
-if "%_MY_OPT_WITH_EXTPACK" == "0"   goto no_extpack_validation
+if "%_MY_OPT_WITH_EXTPACK%" == "0"  goto no_extpack_validation
 if ".%_MY_OPT_EXTPACK%" == "."      set _MY_OPT_EXTPACK=%_MY_OPT_BINDIR%\Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack
 if not exist "%_MY_OPT_EXTPACK%"    goto error_extpack_does_not_exist
-:no_extack_validation
-
-if ".%_MY_OPT_OUTPUT%" == "."       set _MY_OPT_OUTPUT=VBoxDrivers-@VBOX_VERSION_STRING@r@VBOX_SVN_REV@-%_MY_OPT_ARCH%.cab
+:no_extpack_validation
+
+if "%_MY_OPT_WITH_GA%" == "0"       goto no_additions_validation
+if ".%_MY_OPT_GADIR%" == "."        set _MY_OPT_GADIR=%_MY_OPT_BINDIR%\additions
+if not exist "%_MY_OPT_GADIR%"      goto error_additions_does_not_exist
+:no_additions_validation
+
+if ".%_MY_OPT_OUTPUT%" == "."       set _MY_OPT_OUTPUT=VBoxDrivers-6.1.0_RC1_SPBr135037-%_MY_OPT_ARCH%.cab
 if exist "%_MY_OPT_OUTPUT%"         goto error_output_exists
 
@@ -177 +205 @@
 rem
 set PATH=%SystemRoot%\System32;%PATH%;%_MY_OPT_BINDIR%
-if "%_MY_OPT_WITH_EXTPACK" == "0"   goto no_extpack_unpack
+if "%_MY_OPT_WITH_EXTPACK%" == "0" goto no_extpack_unpack
 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 )
@@ -202 +230 @@
 echo .Set RptFileName=%_MY_OPT_OUTPUT%.rpt>>                                            "%_MY_OPT_DDF_FILE%"
 
+if %_MY_OPT_WITH_MAIN% == 0 goto skip_main_package
 echo .Set DestinationDir=VBoxDrv>>                                                      "%_MY_OPT_DDF_FILE%"
 echo %_MY_OPT_BINDIR%\VBoxDrv.inf VBoxDrv.inf>>                                         "%_MY_OPT_DDF_FILE%"
@@ -232 +261 @@
 if "%_MY_OPT_WITH_PDB%" == "1" echo %_MY_OPT_PDBDIR%\VMMR0.pdb VMMR0.pdb>>              "%_MY_OPT_DDF_FILE%"
 echo %_MY_OPT_BINDIR%\VBoxDDR0.r0 VBoxDDR0.r0>>                                         "%_MY_OPT_DDF_FILE%"
+:skip_main_package
+
 if "%_MY_OPT_WITH_PDB%" == "1" echo %_MY_OPT_PDBDIR%\VBoxDDR0.pdb VBoxDDR0.pdb>>        "%_MY_OPT_DDF_FILE%"
 
-if "%_MY_OPT_WITH_EXTPACK" == "0"   goto no_extpack_ddf
+if "%_MY_OPT_WITH_EXTPACK%" == "0" goto no_extpack_ddf
 echo .Set DestinationDir=VBoxExtPackPuel>>                                              "%_MY_OPT_DDF_FILE%"
 echo .\VBoxExtPackPuel.inf VBoxExtPackPuel.inf>>                                        "%_MY_OPT_DDF_FILE%"
@@ -242 +273 @@
 :no_extpack_ddf
 
+if "%_MY_OPT_WITH_GA%" == "0"   goto no_additions_ddf
+echo .Set DestinationDir=VBoxGuestAdditions>>                                           "%_MY_OPT_DDF_FILE%"
+echo %_MY_OPT_GADIR%\VBoxGuest.inf>>                                                    "%_MY_OPT_DDF_FILE%"
+echo %_MY_OPT_GADIR%\VBoxGuest.sys>>                                                    "%_MY_OPT_DDF_FILE%"
+echo %_MY_OPT_GADIR%\VBoxMouse.inf>>                                                    "%_MY_OPT_DDF_FILE%"
+echo %_MY_OPT_GADIR%\VBoxMouse.sys>>                                                    "%_MY_OPT_DDF_FILE%"
+rem echo %_MY_OPT_GADIR%\VBoxSF.sys>>                                                       "%_MY_OPT_DDF_FILE%"
+echo %_MY_OPT_GADIR%\VBoxVideo.inf>>                                                    "%_MY_OPT_DDF_FILE%"
+echo %_MY_OPT_GADIR%\VBoxVideo.sys>>                                                    "%_MY_OPT_DDF_FILE%"
+echo %_MY_OPT_GADIR%\VBoxWddm.inf>>                                                     "%_MY_OPT_DDF_FILE%"
+echo %_MY_OPT_GADIR%\VBoxWddm.sys>>                                                     "%_MY_OPT_DDF_FILE%"
+:no_additions_ddf
+
 rem
 rem Create the cabient file.
@@ -265 +309 @@
 @endlocal
 @endlocal
-