Changeset 70729 in vbox

Timestamp:

Jan 24, 2018 4:27:15 PM (7 years ago)

Author:

vboxsync

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

120480

Message:

Installer/win/Makefile.kmk: fix building of MSM packages (got accidentally broken as part of the parallel build fix, MSM packages have no common.cab), and also clean up the variable checking of VBOX_WITH_COMBINED_PACKAGE and VBOX_WITH_MSM_INSTALL to check consistently if it is defined.

File:

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

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

@@ -180 +180 @@
         $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \
         $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86)
- else
+ endif
+ ifndef VBOX_WITH_MSM_INSTALL
   OTHER_CLEAN += \
-        $(PACKAGE_NAME_MULTIARCH_COMMONCAB)
+        $(VBOX_WIN_INST_OUT_DIR)/common.cab
  endif
 else
@@ -382 +383 @@
 define def_vbox_link_msi
 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).msi \
-$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE), + $(VBOX_WIN_INST_OUT_DIR)/common.cab,): \
+$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE) && !defined(VBOX_WITH_MSM_INSTALL), + $(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 \
@@ -404 +405 @@
                 $$< \
                 $(VBOX_PATH_WIX)/difxapp_$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",x86,x64).wixlib
-ifdef VBOX_WITH_COMBINED_PACKAGE
+if defined(VBOX_WITH_COMBINED_PACKAGE) && !defined(VBOX_WITH_MSM_INSTALL)
         $(MV) -f -- $$(@D)/common.cab $$(@D)/../common.cab
 endif
@@ -441 +442 @@
 endef
 
-$(if $(VBOX_WITH_MSM_INSTALL), \
+$(if-expr defined(VBOX_WITH_MSM_INSTALL), \
         $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
                 $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
@@ -484 +485 @@
                         $(PATH_SUB_CURRENT)/VirtualBox.wxs \
                         $(PATH_SUB_CURRENT)/UserInterface.wxi \
-                        $(if $(VBOX_WITH_MSM_INSTALL), \
+                        $(if-expr defined(VBOX_WITH_MSM_INSTALL), \
                                 $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
                                         $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm), \
@@ -522 +523 @@
                 -E 'VBOX_GUI_USE_QGL=$(if $(VBOX_GUI_USE_QGL),yes,no)' \
                 -E 'VBOX_MIDL_PROXY_CLSID=$(VBOX_MIDL_PROXY_CLSID)' \
-                $(if $(VBOX_WITH_MSM_INSTALL), \
+                $(if-expr defined(VBOX_WITH_MSM_INSTALL), \
                         $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
                                 -E 'VBOX_WIN_INST_MERGE_$(toupper $(module))=$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm'),) \
@@ -529 +530 @@
                 -E 'VBOX_WITH_32_ON_64_MAIN_API=$(if $(VBOX_WITH_32_ON_64_MAIN_API),yes,no)' \
                 -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \
-                -E 'VBOX_WITH_COMBINED_PACKAGE=$(if $(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \
+                -E 'VBOX_WITH_COMBINED_PACKAGE=$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \
                 -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),yes,no)' \
                 -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
@@ -542 +543 @@
                 -E 'VBOX_WITH_LICENSE_DISPLAY=$(if $(VBOX_WITH_LICENSE_DISPLAY),yes,no)' \
                 -E 'VBOX_WITH_MIDL_PROXY_STUB=$(if $(VBOX_WITH_MIDL_PROXY_STUB),yes,no)' \
-                -E 'VBOX_WITH_MSM_INSTALL=$(if $(VBOX_WITH_MSM_INSTALL),yes,no)' \
+                -E 'VBOX_WITH_MSM_INSTALL=$(if-expr defined(VBOX_WITH_MSM_INSTALL),yes,no)' \
                 -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
                 -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
@@ -621 +622 @@
                 -E 'VBOX_WITH_32_ON_64_MAIN_API=$(if $(VBOX_WITH_32_ON_64_MAIN_API),yes,no)' \
                 -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \
-                -E 'VBOX_WITH_COMBINED_PACKAGE=$(if $(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \
+                -E 'VBOX_WITH_COMBINED_PACKAGE=$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \
                 -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),yes,no)' \
                 -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
@@ -634 +635 @@
                 -E 'VBOX_WITH_LICENSE_DISPLAY=$(if $(VBOX_WITH_LICENSE_DISPLAY),yes,no)' \
                 -E 'VBOX_WITH_MIDL_PROXY_STUB=$(if $(VBOX_WITH_MIDL_PROXY_STUB),yes,no)' \
-                -E 'VBOX_WITH_MSM_INSTALL=$(if $(VBOX_WITH_MSM_INSTALL),yes,no)' \
+                -E 'VBOX_WITH_MSM_INSTALL=$(if-expr defined(VBOX_WITH_MSM_INSTALL),yes,no)' \
                 -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
                 -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
@@ -816 +817 @@
                 $$(VBoxStubBld_1_TARGET)
         $(call MSG_L1,Building Windows combined package)
-        $(if $(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_FILE_FN,$(PACKAGE_NAME_MULTIARCH_COMMONCAB)))
+        $(if-expr defined(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_FILE_FN,$(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) \
-                        $(if $(VBOX_WITH_MSM_INSTALL),,-target-all $(PACKAGE_NAME_MULTIARCH_COMMONCAB)) \
+                        $(if-expr defined(VBOX_WITH_MSM_INSTALL),,-target-all $(PACKAGE_NAME_MULTIARCH_COMMONCAB)) \
                         -stub $(PATH_STAGE_BIN)/VBoxStub.exe
         $(VBOX_VCC_EDITBIN) /IntegrityCheck:NO $@