Changeset 107003 in vbox for trunk

Timestamp:

Nov 14, 2024 2:41:59 PM (2 weeks ago)

Author:

vboxsync

Message:

Installer/win/Makefile.kmk: Fixed regressions from r165936, mostly. jiraref:VBP-1442

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (9 diffs)

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

@@ -477 +477 @@
 
 # Note! Keep the list sorted for easier lookup.
-VBOX_WIN_INST_ENV := \
+VBOX_WIN_INST_ENV_FIXED := \
         -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
         -E 'KBUILD_TYPE=$(KBUILD_TYPE)' \
@@ -489 +489 @@
         -E 'VBOX_BUILD_NR_FOR_INST=$(VBOX_VERSION_BUILD)' \
         -E 'VBOX_C_YEAR=$(VBOX_C_YEAR)' \
-        -E 'VBOX_CAB_COMPRESSION_LEVEL_COMMON=$(if-expr $(lang) == "en_US" && $(KBUILD_TARGET_ARCH) == "amd64",$(VBOX_CAB_COMPRESSION_LEVEL),none)' \
-        -E 'VBOX_CAB_COMPRESSION_LEVEL=$(if-expr $(lang) == "en_US",$(VBOX_CAB_COMPRESSION_LEVEL),none)' \
         $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
                 -E 'VBOX_BRAND_$(lang)_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_$(subst en_US_,,$(lang)_)LICENSE_RTF))') \
@@ -553 +551 @@
         -E 'VBOX_WITH_WEBSERVICES=$(if $(VBOX_WITH_WEBSERVICES),yes,no)'
 
+# The bits that depends on $(lang) + the expand once stuff above.
+VBOX_WIN_INST_ENV = $(VBOX_WIN_INST_ENV_FIXED) \
+        -E 'VBOX_CAB_COMPRESSION_LEVEL_COMMON=$(if-expr $(lang) == "en_US" && $(KBUILD_TARGET_ARCH) == "amd64",$(VBOX_CAB_COMPRESSION_LEVEL),none)' \
+        -E 'VBOX_CAB_COMPRESSION_LEVEL=$(if-expr $(lang) == "en_US",$(VBOX_CAB_COMPRESSION_LEVEL),none)'
+
 #
 # Building the main installer (en_US).
@@ -580 +583 @@
                 $$(basename $$@).wixpdb \
                 $$(VBOX_WIN_INST_REPACK_DIR)/2-link-$$(PACKAGE_NAME_LANG).cmd ))
-        kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' $(VBOX_WIN_INST_ENV) \
+        kmk_time $$(REDIRECT_EXT) $(VBOX_WIN_INST_ENV) -E WIX_TEMP='$$(subst /,\,$$(@D))' \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
                 -intermediatefolder $$(@D)/wix-temp/ \
@@ -639 +642 @@
         $$(call MSG_L1,Building merge module $$@)
         $(QUIET)$(RM) -f $$(wildcard $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_BASE)-r*_$(lang).msi)
-        kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' $(VBOX_WIN_INST_ENV) \
+        kmk_time $$(REDIRECT_EXT) $(VBOX_WIN_INST_ENV) -E WIX_TEMP='$$(subst /,\,$$(@D))' \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
                 -intermediatefolder $$(@D)/wix-temp/ \
@@ -725 +728 @@
                         $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
                         $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
-                        $(VBOX_MSI_DEPENDENCIES)) \
+                        $(VBOX_MSI_DEPENDENCIES),) \
                 $(VBOX_VERSION_STAMP) \
                 | $$$$(dir $$$$@) $(if-expr "$(lang)" != "en_US",, \
@@ -749 +752 @@
 endef
 
-$(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
+$(foreach lang,$(VBOX_INSTALLER_LANGUAGES),\
         $(eval $(def_vbox_build_wixlib)))
 
@@ -777 +780 @@
                 | $$$$(dir $$$$@) $(VBOX_WIN_INST_REPACK_DIR)/
         $(QUIET)$(RM) -f -- "$$@" "$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix"
-        $(REDIRECT) \
+        $(REDIRECT) \
                 $(VBOX_WIN_INST_ENV) \
                 -- \
@@ -934 +937 @@
                 -ext $(VBOX_TOOLS_WIN_WIXEXT_DIR)/WixToolset.Util.wixext.dll \
                 -pdbtype none \
+                -defaultcompressionlevel none \
                 -out $$(@D)/$(PACKAGE_NAME_LANG)_$(lang).msi
         $(REDIRECT) -C $$(@D) -- $$(VBOX_PATH_MSITRAN) -g $$< $(PACKAGE_NAME_LANG)_$(lang).msi $(lang).mst