Changeset 51031 in vbox for trunk/src/VBox/Installer

Timestamp:

Apr 10, 2014 11:30:44 AM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: No need to sign + integrate common .cab file on merge module builds.

File:

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

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

@@ -752 +752 @@
 #
 # Make the multi-architecture installer by calling our stub builder
-# with both platform installers (x86 and amd64) + common cab. We only
+# with both platform installers (x86 and amd64) + common cab. The common
+# cab only is needed when we don't use merge modules. We only
 # need to do this once; so do it on x86 only.
 #
@@ -761 +762 @@
                 $$(VBoxStubBld_1_TARGET)
         $(call MSG_L1,Building Windows combined package)
-        $(call VBOX_SIGN_FILE_FN,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB))
+        $(if $(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_FILE_FN,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB)))
         $(REDIRECT) -C $(@D) -- \
                 $(VBoxStubBld_1_TARGET) -out $@ \
                         -target-x86 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \
                         -target-amd64 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64) \
-                        -target-all $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB) \
+                        $(if $(VBOX_WITH_MSM_INSTALL),,-target-all $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB)) \
                         -stub $(PATH_STAGE_BIN)/VBoxStub.exe
         $(call VBOX_SIGN_FILE_FN,$@)