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

Timestamp:

Sep 26, 2016 1:16:43 PM (9 years ago)

Author:

vboxsync

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

110917

Message:

Installer/win/Makefile.kmk: No need to keep the intermediate installer files, except for en_US.

File:

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

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

@@ -53 +53 @@
 # Globals.
 #
+# Tip: Use VBOX_CAB_COMPRESSION_LEVEL=none on the kmk command line when working
+#      on the installer.
+#
 VBOX_WIN_INST_MAKEFILE_DEP := $(MAKEFILE_CURRENT)
+VBOX_CAB_COMPRESSION_LEVEL := high
 
 VBOX_PATH_WIN_INST_SRC := $(PATH_SUB_CURRENT)
@@ -401 +405 @@
 
 #
-# .MSI linking (all languages).
-#
-# Create per language MSIs.  Only the en_US one will be used in full, the others
-# will be diffed against and merged into it.
+# .MSI linking of the main installer (en_US).
 #
 # Note: This will clean up any previous .msi and .wixpdb files to prevent dep
@@ -411 +412 @@
 define def_vbox_link_msi
 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).msi \
-$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE) && $(lang) == "en_US", + $(VBOX_WIN_INST_OUT_DIR)/common.cab,): \
+$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE), + $(VBOX_WIN_INST_OUT_DIR)/common.cab,): \
                 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \
                 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -432 +433 @@
                 -out $$@ \
                 $$< \
-                $(if-expr "$(KBUILD_TARGET_ARCH)" == "x86", \
-                        $(VBOX_PATH_WIX)/difxapp_x86.wixlib, \
-                        $(VBOX_PATH_WIX)/difxapp_x64.wixlib)
+                $(VBOX_PATH_WIX)/difxapp_$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",x86,x64).wixlib
 ifdef VBOX_WITH_COMBINED_PACKAGE
- ifeq ($(lang),en_US)
         $(MV) -f -- $$(@D)/common.cab $$(@D)/../common.cab
- endif
-endif
-        $(RM) -f -- $$(@D)/$(PACKAGE_NAME_LANG)_$(lang).wixpdb $$(@D)/common.cab
+endif
 endef
 
-$(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
-        $(eval $(def_vbox_link_msi)))
+$(foreach lang, en_US, $(eval $(def_vbox_link_msi)))
+
 
 #
@@ -470 +466 @@
                 -out $$@ \
                 $$< \
-                $(if-expr "$(KBUILD_TARGET_ARCH)" == "x86", \
-                        $(VBOX_PATH_WIX)/difxapp_x86.wixlib, \
-                        $(VBOX_PATH_WIX)/difxapp_x64.wixlib)
+                $(VBOX_PATH_WIX)/difxapp_$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",x86,x64).wixlib
         $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst
         $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
@@ -552 +546 @@
                 -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_CAB_COMPRESSION_LEVEL=$(if-expr $(lang) == "en_US",$(VBOX_CAB_COMPRESSION_LEVEL),none)' \
+                -E 'VBOX_CAB_COMPRESSION_LEVEL_COMMON=$(if-expr $(lang) == "en_US" && $(KBUILD_TARGET_ARCH) == "amd64",$(VBOX_CAB_COMPRESSION_LEVEL),none)' \
                 -E 'VBOX_GUI_USE_QGL=$(if $(VBOX_GUI_USE_QGL),yes,no)' \
                 -E 'VBOX_MIDL_PROXY_CLSID=$(VBOX_MIDL_PROXY_CLSID)' \
@@ -645 +639 @@
                 -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_CAB_COMPRESSION_LEVEL=$(VBOX_CAB_COMPRESSION_LEVEL)' \
+                -E 'VBOX_CAB_COMPRESSION_LEVEL_COMMON=$(VBOX_CAB_COMPRESSION_LEVEL)' \
                 -E 'VBOX_GUI_USE_QGL=$(if $(VBOX_GUI_USE_QGL),yes,no)' \
                 -E 'VBOX_MIDL_PROXY_CLSID=$(VBOX_MIDL_PROXY_CLSID)' \
@@ -745 +739 @@
 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst: \
                 $(VBOX_WIN_INST_OUT_DIR)/en_US/$(PACKAGE_NAME_LANG)_en_US.msi \
-                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).msi
-        $(call MSG_L1,Creating language diff ($(lang)))
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
+                $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \
+                $(VBOX_SVN_REV_KMK) \
+                $(VBOX_WIN_INST_MAKEFILE_DEP) \
+                $(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,Creating language diff for $(lang))
+        kmk_time $(VBOX_PATH_WIX)/light.exe -v -nologo \
+                -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
+                -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
+                -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)/$(PACKAGE_NAME_LANG)_$(lang).msi \
+                $$(@D)/VirtualBox_$(lang).wixobj \
+                $(VBOX_PATH_WIX)/difxapp_$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",x86,x64).wixlib
         $(REDIRECT) -C $$(@D) -- $(VBOX_PATH_MSITRAN) -g $$< $(PACKAGE_NAME_LANG)_$(lang).msi $(lang).mst
+        $(RM) -f -- $$(@D)/$(PACKAGE_NAME_LANG)_$(lang).msi \
+                $$(@D)/$(PACKAGE_NAME_LANG)_$(lang).wixpdb \
+                $$(@D)/common.cab
 
 endef