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

Timestamp:

Sep 25, 2016 2:47:24 AM (8 years ago)

Author:

vboxsync

Message:

VirtualBox.wxs,Makefile.kmk: Use high compression on product.cab, not just common.cab. However, when we are build the none en_US versions or the x86 common.cab file, don't bother with compression as we're not using them.

Location:

trunk/src/VBox/Installer/win

Files:

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

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

@@ -44 +44 @@
 
 include $(PATH_SUB_CURRENT)/Resources/Makefile.kmk
+ifdef VBOX_WITH_MSI_HACK
+ include $(PATH_SUB_CURRENT)/MsiHack/Makefile.kmk
+endif
 
 
@@ -393 +396 @@
                 $(VBOX_SVN_REV_KMK) \
                 $(MAKEFILE_CURRENT) \
+                $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHack.dll,) \
+                $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHackExtension.dll,) \
                 | $$$$(dir $$$$@)
         $$(call MSG_L1,Linking installer $$@)
@@ -398 +403 @@
                 $$(@D)/$(PACKAGE_BASE)-r*_$(lang).wixpdb $$(@D)/$(lang)/$(PACKAGE_BASE)-r*_$(lang).wixpdb)
         $(QUIET)$(MKDIR) -p -- $$(@D)/$(lang)/
+        kmk_time \
         $(VBOX_PATH_WIX)/light.exe -v -nologo \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -403 +409 @@
                 -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \
                 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \
+               $(if-expr defined(VBOX_WITH_MSI_HACK),-ext $(MsiHack_0_OUTDIR)/MsiHackExtension.dll,) \
                 $(VBOX_MSI_ICE_IGNORE) \
                 -out $$(@D)/$(lang)/$$(@F) \
@@ -530 +537 @@
                 -E 'VBOX_VERSION_MINOR_INST=$(VBOX_VERSION_MINOR)' \
                 -E 'VBOX_SIGNING_MODE=$(strip $(if $(VBOX_SIGNING_MODE),$(VBOX_SIGNING_MODE),none))' \
+                -E 'VBOX_CAB_COMPRESSION_LEVEL=$(if-expr $(lang) == "en_US",high,none)' \
+                -E 'VBOX_CAB_COMPRESSION_LEVEL_COMMON=$(if-expr $(lang) == "en_US" && $(KBUILD_TARGET_ARCH) == "amd64",high,none)' \
                 -E 'VBOX_GUI_USE_QGL=$(if $(VBOX_GUI_USE_QGL),yes,no)' \
                 -E 'VBOX_MIDL_PROXY_CLSID=$(VBOX_MIDL_PROXY_CLSID)' \
@@ -621 +630 @@
                 -E 'VBOX_VERSION_MINOR_INST=$(VBOX_VERSION_MINOR)' \
                 -E 'VBOX_SIGNING_MODE=$(strip $(if $(VBOX_SIGNING_MODE),$(VBOX_SIGNING_MODE),none))' \
+                -E 'VBOX_CAB_COMPRESSION_LEVEL=high' \
+                -E 'VBOX_CAB_COMPRESSION_LEVEL_COMMON=high' \
                 -E 'VBOX_GUI_USE_QGL=$(if $(VBOX_GUI_USE_QGL),yes,no)' \
                 -E 'VBOX_MIDL_PROXY_CLSID=$(VBOX_MIDL_PROXY_CLSID)' \

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

@@ -138 +138 @@
 
     <!-- The media/binary IDs -->
-    <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
+    <!--
+        The effects of CompressionLevel options:
+           default/mszip, high: 32.54s
+             -rw-rw-rw-  1 bird 0  53 591 221 2016-09-25 03:56 common.cab
+             -rw-rw-rw-  1 bird 0  41 560 082 2016-09-25 03:56 VirtualBox-5.1.51-r110887_en_US.msi
+           high, high: 46.76s
+             -rw-rw-rw-  1 bird 0  53 591 221 2016-09-25 03:49 common.cab
+             -rw-rw-rw-  1 bird 0  34 056 210 2016-09-25 03:49 VirtualBox-5.1.51-r110887_en_US.msi
+           medium, medium: 29.95s
+             -rw-rw-rw-  1 bird 0  56 293 089 2016-09-25 03:53 common.cab
+             -rw-rw-rw-  1 bird 0  35 498 002 2016-09-25 03:54 VirtualBox-5.1.51-r110887_en_US.msi
+           low, low: 25.41s
+             -rw-rw-rw-  1 bird 0  57 616 155 2016-09-25 03:52 common.cab
+             -rw-rw-rw-  1 bird 0  37 181 458 2016-09-25 03:52 VirtualBox-5.1.51-r110887_en_US.msi
+           mszip/default, mszip/default: 16.13s
+             -rw-rw-rw-  1 bird 0  58 751 954 2016-09-25 03:49 common.cab
+             -rw-rw-rw-  1 bird 0  41 560 082 2016-09-25 03:50 VirtualBox-5.1.51-r110887_en_US.msi
+           none, none: 2.37s
+             -rw-rw-rw-  1 bird 0  92 470 301 2016-09-25 03:47 common.cab
+             -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).
+    -->
+    <Media Id="1" Cabinet="product.cab" EmbedCab="yes" CompressionLevel="$(env.VBOX_CAB_COMPRESSION_LEVEL)" />
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
     <?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
-        <Media Id="2" Cabinet="common.cab" EmbedCab="no" CompressionLevel="high" />
+        <Media Id="2" Cabinet="common.cab" EmbedCab="no" CompressionLevel="$(env.VBOX_CAB_COMPRESSION_LEVEL_COMMON)" />
     <?endif ?>
 <?endif ?>