Changeset 77351 in vbox

Timestamp:

Feb 18, 2019 6:46:41 PM (6 years ago)

Author:

vboxsync

Message:

Installer/win: Fix typos breaking the re-packing scripts. Include the target arch in the name of the MSM files (helps when copying them all to the output directory after repacking). Move most of the clean up out of the defines (where it needs eval) to normal OTHER_CLEAN. bugref:8691

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (12 diffs)
• Scripts/Combined-3-Repack.cmd (modified) (4 diffs)

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

@@ -162 +162 @@
         $(VBOX_WIN_INST_OUT_DIR) \
         $(VBOX_WIN_INST_REPACK_DIR)/ \
-        $(foreach lang,$(VBOX_INSTALLER_LANGUAGES),$(VBOX_WIN_INST_OUT_DIR)/$(lang)/) \
+        $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/ \
+                $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ )\
         $(VBOX_WIN_INST_OUT_DIR)/NLS/
 
@@ -184 +186 @@
                 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix \
                 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \
-                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep )\
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep \
                 $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix \
+                $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files \
+                $(VBOX_WIN_INST_REPACK_DIR)/2-link-$(PACKAGE_NAME_LANG).cmd \
+                $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/Language_$(lang).wxl \
+                $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/License_$(lang).wxl )\
         $(VBOX_WIN_INST_OUT_DIR)/DirComponentsAndFiles_DTrace.wxi \
         $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
@@ -214 +220 @@
   $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
    $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
-                $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module).msm.dep \
-                $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm \
+                $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm \
                 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \
+                $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj.dep \
                 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixpdb \
-                $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix))
+                $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix \
+                $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).files)
+        BLDDIRS += $foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
+                $(VBOX_WIN_INST_REPACK_DIR)/files-VBoxMerge$(module)_$(lang)/)
 endif
 
@@ -454 +463 @@
                 $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE) && !defined(VBOX_WITH_MSM_INSTALL),'@echo Created: common.cab',)
 
-$(eval OTHER_CLEAN += $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/Language_$(lang).wxl \
-        $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/License_$(lang).wxl \
-        $(VBOX_WIN_INST_REPACK_DIR)/2-link-$(PACKAGE_NAME_LANG).cmd )
 endif
 endef
@@ -470 +476 @@
 #
 define def_vbox_link_msm
-$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm: \
+$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm: \
                 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \
                 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -503 +509 @@
                 '  $(VBOX_PATH_WIX)/difxapp_$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",x86,x64).wixlib ^' \
                '  || exit /b1' \
-                'call sign-sha1.cmd $(@F) || exit /b1' \
+                'call sign-sha1.cmd $$(@F) || exit /b1' \
                ) \
                '@echo Created MSM module: $$(@F)'
@@ -558 +564 @@
                         $(if-expr defined(VBOX_WITH_MSM_INSTALL), \
                                 $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-                                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm), \
+                                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm), \
                                 $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \
                                 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
@@ -597 +603 @@
                 $(if-expr defined(VBOX_WITH_MSM_INSTALL), \
                         $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-                                -E 'VBOX_WIN_INST_MERGE_$(toupper $(module))=$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm'),) \
+                                -E 'VBOX_WIN_INST_MERGE_$(toupper $(module))=$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm'),) \
                 -E 'VBOX_WINDOWS_ICON_FILE=$(subst /,\,$(VBOX_WINDOWS_ICON_FILE))' \
                 -E 'VBOX_QT_INFIX=$(VBOX_QT_INFIX)' \
@@ -686 +692 @@
  endif
 
-$(eval BLDDIRS += $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/)
-$(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)) $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep)
+$(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)))
 endef
 
@@ -787 +792 @@
                 -e 's,$(subst /,\\,$(PATH_OUT_BASE))\\win.amd64\\$(KBUILD_TYPE)\\bin,..\\..\\..\\win.amd64\\$(KBUILD_TYPE)\\bin,g' \
                 -e 's,$(subst /,\\,$(PATH_OUT_BASE))\\win.x86\\$(KBUILD_TYPE)\\bin,..\\..\\..\\win.x86\\$(KBUILD_TYPE)\\bin,g' \
-                -e 's,$(subst /,\\,$(PATH_ROOT))\\doc\\,files-VirtualBox_$(lang)\\,g' \
-                -e 's,$(subst /,\\,$(VBOX_PATH_WIN_INST_SRC))\\Binary\\,files-VirtualBox_$(lang)\\,g' \
-                -e 's,$(subst /,\\,$(dir $(VBOX_WINDOWS_ICON_FILE))),files-VirtualBox_$(lang)\\,g' \
+                -e 's,$(subst /,\\,$(PATH_ROOT))\\doc\\,files-VBoxMerge$(module)_$(lang)\\,g' \
+                -e 's,$(subst /,\\,$(VBOX_PATH_WIN_INST_SRC))\\Binary\\,files-VBoxMerge$(module)_$(lang)\\,g' \
+                -e 's,$(subst /,\\,$(dir $(VBOX_WINDOWS_ICON_FILE))),files-VBoxMerge$(module)_$(lang)\\,g' \
+                -e 's,$(subst /,\\,$(VBOX_PATH_WIN_INST_SRC))\\,,g' \
                 --output "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix" \
                 "$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix"
@@ -812 +818 @@
         'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
                 $(subst $(KBUILD_DEVTOOLS),%KBUILD_DEVTOOLS%,\
-                '$(VBOX_PATH_WIX)/candle.exe VBoxMerge$(module)$(lang).wix ^' \
+                '$(VBOX_PATH_WIX)/candle.exe VBoxMerge$(module)_$(lang).wix ^' \
                 '  -ext $(VBOX_PATH_WIX)/WixUIExtension.dll ^'\
                 '  -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll ^' \
@@ -830 +836 @@
  endif
 
-$(eval BLDDIRS += $(VBOX_WIN_INST_REPACK_DIR)/files-VBoxMerge$(module)_$(lang)/)
-$(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VBoxMerge$(module)_$(lang)) $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).files $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj.dep)
+$(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VBoxMerge$(module)_$(lang)))
 endef
 

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

@@ -80 +80 @@
 
 :opt_h
-echo Toplevel combined package: Prepare both x86 and amd64 for submission.
-echo .
-echo Usage: Combined-1-Prepare.cmd [-o output-dir] [-e/--extpack puel.vbox-extpack]
+echo Toplevel combined package: Repack the installer and extpacks.
+echo .
+echo Usage: Combined-3-Repack.cmd [-o output-dir] [-e/--extpack puel.vbox-extpack]
 echo            [-s/--extpack-enterprise puel-enterprise.vbox-extpack]
 echo            [-u/--vboxall-dir unpacked-vboxall-dir] [-t build-type]
+echo            [--signed-amd64 signed-amd64.zip]
+echo            [--signed-x86 signed-x86.zip]
 echo
 echo .
@@ -256 +258 @@
 
 set _MY_OUT_FILES=
+cd /d "%_MY_REPACK_DIR_AMD64%" || goto end_failed
+for %%i in (VBoxMerge*msm) do (
+    copy /y "%%i" "%_MY_OPT_OUTDIR%" || goto end_failed
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
+)
+cd /d "%_MY_REPACK_DIR_X86%" || goto end_failed
+for %%i in (VBoxMerge*msm) do (
+    copy /y "%%i" "%_MY_OPT_OUTDIR%" || goto end_failed
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
+)
 for %%i in (VirtualBox-*MultiArch*exe) do (
     copy /y "%%i" "%_MY_OPT_OUTDIR%" || goto end_failed
@@ -274 +286 @@
 for %%i in (%_MY_TMP_OUT%) do (
     set _MY_TMP_OUT=%_MY_OPT_OUTDIR%\%%~nxi
-    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nix
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
 )
 call "%_MY_REPACK_DIR_X86%\RepackExtPack.cmd" --bindir-amd64 "%_MY_BINDIR_AMD64%" --bindir-x86 "%_MY_BINDIR_X86%" ^
@@ -284 +296 @@
 for %%i in (%_MY_TMP_OUT%) do (
     set _MY_TMP_OUT=%_MY_OPT_OUTDIR%\%%~nxi
-    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nix
+    call set _MY_OUT_FILES=%%_MY_OUT_FILES%% %%~nxi
 )
 call "%_MY_REPACK_DIR_X86%\RepackExtPack.cmd" --bindir-amd64 "%_MY_BINDIR_AMD64%" --bindir-x86 "%_MY_BINDIR_X86%" ^