repack scripts: adding option to ignore ExtPacks for Combined3-Repack.cmd

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@99676 cfe28804-0f27-0410-a406-dd0f0b0b656f

1 files changed, 11 insertions, 0 deletions

diff --git a/src/VBox/Installer/win/Scripts/Combined-3-Repack.cmd b/src/VBox/Installer/win/Scripts/Combined-3-Repack.cmd
index e8e040a8dc4..908697b026c 100644
--- a/src/VBox/Installer/win/Scripts/Combined-3-Repack.cmd
+++ b/src/VBox/Installer/win/Scripts/Combined-3-Repack.cmd
@@ -50,6 +50,7 @@ set _MY_OPT_BUILD_TYPE=@KBUILD_TYPE@
 set _MY_OPT_OUTDIR=%_MY_OPT_UNTAR_DIR%\output

 set _MY_OPT_SIGNED_AMD64=

 set _MY_OPT_SIGNED_X86=

+set _MY_OPT_NOEXTPACK=

 

 :argument_loop

 if ".%1" == "."             goto no_more_arguments

@@ -64,6 +65,8 @@ if ".%1" == ".--help"       goto opt_h
 

 if ".%1" == ".-e"                   goto opt_e

 if ".%1" == ".--extpack"            goto opt_e

+if ".%1" == ".-n"                   goto opt_n

+if ".%1" == ".--no-extpack"         goto opt_n

 if ".%1" == ".-o"                   goto opt_o

 if ".%1" == ".--outdir"             goto opt_o

 if ".%1" == ".-s"                   goto opt_s

@@ -106,6 +109,11 @@ echo Default -t/--build-type value:         %_MY_OPT_BUILD_TYPE%
 echo .

 goto end_failed

 

+:opt_n

+set _MY_OPT_NOEXTPACK=1

+shift

+goto argument_loop

+

 :opt_o

 if ".%~2" == "."            goto syntax_error_missing_value

 set _MY_OPT_OUTDIR=%~f2

@@ -196,8 +204,10 @@ set _MY_REPACK_DIR_X86=%_MY_OPT_UNTAR_DIR%\win.x86\%_MY_OPT_BUILD_TYPE%\repack
 if not exist "%_MY_REPACK_DIR_AMD64%"   goto error_amd64_repack_dir_not_found

 if not exist "%_MY_REPACK_DIR_X86%"     goto error_x86_repack_dir_not_found

 

+if ".%_MY_OPT_NOEXTPACK%" == ".1"       goto no_enterprise_check

 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

+:no_enterprise_check

 

 if not exist "%_MY_OPT_SIGNED_AMD64%"   goto error_signed_amd64_not_found

 if not exist "%_MY_OPT_SIGNED_X86%"     goto error_signed_x86_not_found

@@ -282,6 +292,7 @@ for %%i in (VirtualBox-*MultiArch*exe) do (
     call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi

 )

 

+if ".%_MY_OPT_NOEXTPACK%" == ".1" goto no_enterprise_repacking

 

 rem

 rem Repack the extension packs.