Changeset 82271 in vbox

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135089

Message:

Repack scripts: first dirty hard-coded version. bugref:9587

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (2 diffs)
• Scripts/Combined-1-Prepare.cmd (modified) (10 diffs)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -1161 +1161 @@
  RePackScripts_SOURCES += \
         $(RePackScripts_0_OUTDIR)/Combined-1-Prepare.cmd \
-        $(RePackScripts_0_OUTDIR)/Combined-3-Repack.cmd
+        $(RePackScripts_0_OUTDIR)/Combined-3-Repack.cmd \
+        $(RePackScripts_0_OUTDIR)/Combined-3-RepackAdditions.cmd
  endif
 else
  RePackScripts_SOURCES += \
         $(RePackScripts_0_OUTDIR)/Single-1-Prepare.cmd \
-        $(RePackScripts_0_OUTDIR)/Single-3-Repack.cmd
+        $(RePackScripts_0_OUTDIR)/Single-3-Repack.cmd \
+        $(RePackScripts_0_OUTDIR)/Combined-3-RepackAdditions.cmd
 endif
 RePackScripts_CLEAN = \
@@ -1181 +1183 @@
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd)
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-3-Repack.cmd,Combined-3-Repack.cmd)
+$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-3-RepackAdditions.cmd,Combined-3-RepackAdditions.cmd)
 else
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Single-1-Prepare.cmd,Single-1-Prepare.cmd)

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

@@ -29 +29 @@
 set _MY_SAVED_CD=%CD%
 set _MY_VER_REV=@VBOX_VERSION_STRING@r@VBOX_SVN_REV@
+set _MY_PACK_EXTPACK=1
+set _MY_PACK_ADDITIONS=0
 
 rem
 rem Parse arguments.
 rem
-set _MY_OPT_UNTAR_DIR=%_MY_SCRIPT_DIR%\..\..\..\
+set _MY_OPT_UNTAR_DIR=%_MY_SCRIPT_DIR%\..\..\..
 for %%i in (%_MY_OPT_UNTAR_DIR%) do set _MY_OPT_UNTAR_DIR=%%~fi
 set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
@@ -51 +53 @@
 if ".%1" == ".--help"       goto opt_h
 
+if ".%1" == ".-g"                   goto opt_g
+if ".%1" == ".--additions"          goto opt_g
 if ".%1" == ".-e"                   goto opt_e
 if ".%1" == ".--extpack"            goto opt_e
+if ".%1" == ".--no-extpack"         goto opt_ne
 if ".%1" == ".-o"                   goto opt_o
 if ".%1" == ".--outdir"             goto opt_o
@@ -70 +75 @@
 goto argument_loop
 
+:opt_g
+set _MY_PACK_ADDITIONS=1
+shift
+goto argument_loop
+
 :opt_e
 if ".%~2" == "."            goto syntax_error_missing_value
 set _MY_OPT_EXTPACK=%~f2
 goto argument_loop_next_with_value
+
+:opt_ne
+set _MY_PACK_EXTPACK=0
+shift
+goto argument_loop
 
 :opt_h
@@ -80 +95 @@
 echo Usage: Combined-1-Prepare.cmd [-o output-dir] [-e/--extpack puel.vbox-extpack]
 echo            [-s/--extpack-enterprise puel-enterprise.vbox-extpack]
+echo            [--no-extpack] [-g/--additions]
 echo            [-u/--vboxall-dir unpacked-vboxall-dir] [-t build-type]
 echo .
@@ -144 +160 @@
 goto end_failed
 
-
+:error_extpack_and_additions_together
+echo usage error: You can't prepare extPack and GuestAdditions in one call
+goto end_failed
 
 :no_more_arguments
@@ -158 +176 @@
 if not exist "%_MY_BINDIR_X86%"         goto error_x86_bindir_not_found
 
+if ".%_MY_PACK_EXTPACK%" == ".%_MY_PACK_ADDITIONS%" goto error_extpack_and_additions_together
+
 set _MY_REPACK_DIR_AMD64=%_MY_OPT_UNTAR_DIR%\win.amd64\%_MY_OPT_BUILD_TYPE%\repack
 set _MY_REPACK_DIR_X86=%_MY_OPT_UNTAR_DIR%\win.x86\%_MY_OPT_BUILD_TYPE%\repack
@@ -163 +183 @@
 if not exist "%_MY_REPACK_DIR_X86%"     goto error_x86_repack_dir_not_found
 
+rem Make sure the output dir exists.
+if not exist "%_MY_OPT_OUTDIR%"     (mkdir "%_MY_OPT_OUTDIR%" || goto end_failed)
+
+rem
+rem ExtPack section
+rem
+if ".%_MY_PACK_EXTPACK%" == ".0" goto skip_extpack_packing
+
 if not exist "%_MY_OPT_EXTPACK%"        goto error_extpack_not_found
 if not ".%_MY_OPT_EXTPACK_ENTERPRISE%" == "." if not exist "%_MY_OPT_EXTPACK_ENTERPRISE%" goto error_enterprise_extpack_not_found
-
-
-rem Make sure the output dir exists.
-if not exist "%_MY_OPT_OUTDIR%"     (mkdir "%_MY_OPT_OUTDIR%" || goto end_failed)
 
 rem
@@ -180 +204 @@
 
 rem
-rem Do the packing.
+rem Do the packing of ExtPack
 rem
 echo **************************************************************************
@@ -197 +221 @@
 echo .
 cd /d "%_MY_SAVED_CD%"
+:skip_extpack_packing
+
+rem
+rem GuestAdditions section
+rem
+if ".%_MY_PACK_ADDITIONS%" == ".0" goto skip_additions_packing
+
+rem
+rem Do the packing of GuestAdditions
+rem
+echo **************************************************************************
+echo Packing AMD64 additions
+echo **************************************************************************
+cd /d "%_MY_REPACK_DIR_AMD64%" || goto end_failed
+call "%_MY_REPACK_DIR_AMD64%\PackDriversForSubmission.cmd" -b "%_MY_BINDIR_AMD64%" -a amd64 -x -n --no-main --ga ^
+    -o "%_MY_OPT_OUTDIR%\VBoxDrivers-%_MY_VER_REV%-amd64.cab" || goto end_failed
+echo .
+echo **************************************************************************
+echo Packing X86 drivers
+echo **************************************************************************
+cd /d "%_MY_REPACK_DIR_X86%" || goto end_failed
+call "%_MY_REPACK_DIR_X86%\PackDriversForSubmission.cmd" -b "%_MY_BINDIR_X86%" -a x86 -x -n --no-main --ga ^
+    -o "%_MY_OPT_OUTDIR%\VBoxDrivers-%_MY_VER_REV%-x86.cab" || goto end_failed
+echo .
+cd /d "%_MY_SAVED_CD%"
+:skip_additions_packing
 
 rem
 rem Generate script for taking the next step.
 rem
-set _MY_NEXT_SCRIPT=%_MY_OPT_OUTDIR%\Combined-3-Repack.cmd
+set _MY_NEXT_SCRIPT_SHORT_NAME=Combined-3-Repack.cmd
+set _MY_NEXT_SCRIPT=%_MY_OPT_OUTDIR%\%_MY_NEXT_SCRIPT_SHORT_NAME%
+if ".%_MY_PACK_ADDITIONS%" == ".0" goto generate_legacy_script
+set _MY_NEXT_SCRIPT_SHORT_NAME=Combined-3-RepackAdditions.cmd
+set _MY_NEXT_SCRIPT=%_MY_OPT_OUTDIR%\%_MY_NEXT_SCRIPT_SHORT_NAME%
 echo cd /d "%cd%" > "%_MY_NEXT_SCRIPT%"
-echo call "%_MY_SCRIPT_DIR%\Combined-3-Repack.cmd" --extpack "%_MY_OPT_EXTPACK%" ^
+echo call "%_MY_SCRIPT_DIR%%_MY_NEXT_SCRIPT_SHORT_NAME%" ^
+    --vboxall-untar-dir "%_MY_OPT_UNTAR_DIR%" ^
+    --outdir "%_MY_OPT_OUTDIR%" ^
+    --build-type "%_MY_OPT_BUILD_TYPE%" %%* >> "%_MY_NEXT_SCRIPT%"
+goto show_next_steps
+:generate_legacy_script
+echo cd /d "%cd%" > "%_MY_NEXT_SCRIPT%"
+echo call "%_MY_SCRIPT_DIR%%_MY_NEXT_SCRIPT_SHORT_NAME%" --extpack "%_MY_OPT_EXTPACK%" ^
     --extpack-enterprise "%_MY_OPT_EXTPACK_ENTERPRISE%" ^
     --vboxall-untar-dir "%_MY_OPT_UNTAR_DIR%" ^
     --outdir "%_MY_OPT_OUTDIR%" ^
+    %_MY_OPT_SCRIPT_SKIPEXTPACK_PARAM% %_MY_OPT_SCRIPT_ADDITIONS_PARAM% ^
     --build-type "%_MY_OPT_BUILD_TYPE%" %%* >> "%_MY_NEXT_SCRIPT%"
 
+:show_next_steps
 rem
 rem Instructions on what to do next.
@@ -222 +285 @@
 echo *   1. Submit the files to Microsoft for attestation signing.
 echo *   2. Download the signed result.
-echo *   3. "%_MY_NEXT_SCRIPT%" --signed-x86 {zip} --signed-amd64 {zip}
-
+echo *   3. "%_MY_NEXT_SCRIPT%" --signed-x86 {zip} --signed-amd64 {zip} %_MY_OPT_SCRIPT_SKIPEXTPACK_PARAM% %_MY_OPT_SCRIPT_ADDITIONAL_PARAMS%
 goto end
-
-
 :end_failed
 @cd /d "%_MY_SAVED_CD%"