Changeset 107005 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Nov 14, 2024 3:51:06 PM (2 months ago)

Author:

vboxsync

Message:

Installer/win/Makefile.kmk: Workaround for broken compression control. Problem was that we are now using VirtualBox_en_US.wixlib for all languages instead of the language speicfic ones, so everyone got the same Media attributes as en_US, i.e. the high compression setting. Workaround is to not set it on the Media element but specify the default on the command line. (This means we're currently compressing common.cab on arm, but will get to that later. Perhaps.) jiraref:VBP-1442

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (10 diffs)
• VirtualBox.wxs (modified) (1 diff)

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

@@ -477 +477 @@
 
 # Note! Keep the list sorted for easier lookup.
-VBOX_WIN_INST_ENV_FIXED := \
+VBOX_WIN_INST_ENV := \
         -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
         -E 'KBUILD_TYPE=$(KBUILD_TYPE)' \
@@ -551 +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).
@@ -585 +580 @@
         kmk_time $$(REDIRECT_EXT) $(VBOX_WIN_INST_ENV) -E WIX_TEMP='$$(subst /,\,$$(@D))' \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
+                -defaultcompressionlevel high \
                 -intermediatefolder $$(@D)/wix-temp/ \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -644 +640 @@
         kmk_time $$(REDIRECT_EXT) $(VBOX_WIN_INST_ENV) -E WIX_TEMP='$$(subst /,\,$$(@D))' \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
+                -defaultcompressionlevel high \
                 -intermediatefolder $$(@D)/wix-temp/ \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -738 +735 @@
                 -- \
                 $(VBOX_TOOLS_WIN_WIX_BIN) build $(filter-out $(VBOX_VERSION_STAMP),$$<) \
+                        -defaultcompressionlevel $(if-expr "$(lang)" == "en_US",high,none) \
                         -intermediatefolder $$(@D)/wix-temp/ \
                         $(VBOX_TOOLS_WIN_WIX_EXT) \
@@ -746 +744 @@
   # doing the repacking via the shell scripts.
         $(CP) $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixlib $(VBOX_WIN_INST_REPACK_DIR)/
-
  endif
         $(RM) -Rf -- $$(@D)/wix-temp/
@@ -753 +750 @@
 endef
 
+## @todo We generate rules for all the languages here, but only the en_US one is actually used.
+## This used to mess up the compression optimizations, since the compression level used to be
+## part of the Media tag in the VirtualBox_en_US.wixlib file. Omitting it and using the command
+## line option -defaultcompressionlevel for controlling it works around this.
 $(foreach lang,$(VBOX_INSTALLER_LANGUAGES),\
         $(eval $(def_vbox_build_wixlib)))
@@ -785 +786 @@
                 -- \
                 $(VBOX_TOOLS_WIN_WIX_BIN) build $(filter-out $(VBOX_VERSION_STAMP),$$<) \
+                        -defaultcompressionlevel high \
                         -intermediatefolder $$(@D)/wix-temp/ \
                         $(VBOX_TOOLS_WIN_WIX_EXT) \
@@ -929 +931 @@
         $(call MSG_L1,Creating language diff for $(lang))
         kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' $(VBOX_WIN_INST_ENV) \
-                -E 'VBOX_CAB_COMPRESSION_LEVEL=none' \
-                -E 'VBOX_CAB_COMPRESSION_LEVEL_COMMON=none' \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
+                -defaultcompressionlevel none \
                 -intermediatefolder $$(@D)/wix-temp/ \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -938 +939 @@
                 -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

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -152 +152 @@
              -rw-rw-rw-  1 bird 0 135 874 578 2016-09-25 03:47 VirtualBox-5.1.51-r110887_en_US.msi
 
-        We set the level in the VBOX_CAB_COMPRESSION_LEVEL and VBOX_CAB_COMPRESSION_LEVEL_COMMON
-        environment variables so we don't waste time compressing and decompressing the intermediate
-        language MSIs and the common.cab that we're not going to use (x86).
+        We use the -defaultcompressionlevel command line option to control this.
     -->
-    <Media Id="1" Cabinet="product.cab" EmbedCab="yes" CompressionLevel="$(env.VBOX_CAB_COMPRESSION_LEVEL)" />
+    <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
     <?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
-        <Media Id="2" Cabinet="common.cab" EmbedCab="no" CompressionLevel="$(env.VBOX_CAB_COMPRESSION_LEVEL_COMMON)" />
+        <Media Id="2" Cabinet="common.cab" EmbedCab="no" />
     <?endif?>
 <?endif?>