Changeset 82935 in vbox

Timestamp:

Jan 30, 2020 7:16:39 PM (5 years ago)

Author:

vboxsync

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

135933

Message:

Repack scripts: modification for r135668 which caused some issues during scripts execution. GA repack dir now is repackadd instead of repack ?bugref:9587

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Installer/Makefile.kmk (modified) (2 diffs)
• Installer/win/Scripts/Combined-1-Prepare.cmd (modified) (1 diff)
• Installer/win/Scripts/Combined-3-RepackAdditions.cmd (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -242 +242 @@
 INSTALLS += RePackScriptsAdd
 RePackScriptsAdd_TEMPLATE = DUMMY
-RePackScriptsAdd_INST = repack/add/
+RePackScriptsAdd_INST = repackadd/
 RePackScriptsAdd_INSTTYPE = stage
 RePackScriptsAdd_SOURCES = \
@@ -274 +274 @@
 INSTALLS += RePackScriptsAddResources
 RePackScriptsAddResources_TEMPLATE = DUMMY
-RePackScriptsAddResources_INST = repack/add/resources/
+RePackScriptsAddResources_INST = repackadd/resources/
 RePackScriptsAddResources_INSTTYPE = stage
 RePackScriptsAddResources_DIRS = Languages

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

@@ -180 +180 @@
 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
+if ".%_MY_PACK_ADDITIONS%" == ".0" goto skip_additions_packing_options
+set _MY_REPACK_DIR_AMD64=%_MY_OPT_UNTAR_DIR%\win.amd64\%_MY_OPT_BUILD_TYPE%\repackadd
+set _MY_REPACK_DIR_X86=%_MY_OPT_UNTAR_DIR%\win.x86\%_MY_OPT_BUILD_TYPE%\repackadd
+:skip_additions_packing_options
 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

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

@@ -171 +171 @@
 if not exist "%_MY_BINDIR_X86%"         goto error_x86_bindir_not_found
 
-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
+set _MY_REPACK_DIR_AMD64=%_MY_OPT_UNTAR_DIR%\win.amd64\%_MY_OPT_BUILD_TYPE%\repackadd
+set _MY_REPACK_DIR_X86=%_MY_OPT_UNTAR_DIR%\win.x86\%_MY_OPT_BUILD_TYPE%\repackadd
 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