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

Timestamp:

Sep 23, 2016 8:01:18 PM (8 years ago)

Author:

vboxsync

Message:

Installer/win/Makefile.kmk: Do point def_vbox_link_msi to a temporary language specific output directory to avoid common.cab copy clashes.

File:

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

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

@@ -161 +161 @@
   OTHER_CLEAN += \
         $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \
-        $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \
-        $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.am64) \
+        $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86)
+ else
+  OTHER_CLEAN += \
         $(PACKAGE_NAME_MULTIARCH_COMMONCAB)
- else
-  # Nothing to do here yet.
  endif
 else
@@ -382 +381 @@
 # .MSI link (all languages).
 #
-# Note: This will clean up any previous .msi to prevent dep build boxes from
-#       filling up with old files.
-#
-# Note: Disable parallel jobs here because of shared common.cab access issues.
+# Note: This will clean up any previous .msi and .wixpdb files to prevent dep
+#       build boxes from filling up with old files.
 #
 define def_vbox_link_msi
-#.NOTPARALLEL: $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi - bird: works without for me. common.cab isn't shared here (it's in TEMP).
-$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi: \
+$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi \
+$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE) && $(lang) == "en_US", + $(VBOX_WIN_INST_OUT_DIR)/common.cab,): \
                 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixobj \
                 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -398 +395 @@
                 | $$$$(dir $$$$@)
         $$(call MSG_L1,Linking installer $$@)
-        $(QUIET)$(RM) -f $$(wildcard $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_BASE)-r*_$(lang).msi)
+        $(QUIET)$(RM) -f $$(wildcard $$(@D)/$(PACKAGE_BASE)-r*_$(lang).msi \
+                $$(@D)/$(PACKAGE_BASE)-r*_$(lang).wixpdb $$(@D)/$(lang)/$(PACKAGE_BASE)-r*_$(lang).wixpdb)
+        $(QUIET)$(MKDIR) -p -- $$(@D)/$(lang)/
         $(VBOX_PATH_WIX)/light.exe -v -nologo \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -405 +404 @@
                 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \
                 $(VBOX_MSI_ICE_IGNORE) \
-                -out $$@ \
+                -out $$(@D)/$(lang)/$$(@F) \
                 $$< \
                 $(if-expr "$(KBUILD_TARGET_ARCH)" == "x86", \
                         $(VBOX_PATH_WIX)/difxapp_x86.wixlib, \
                         $(VBOX_PATH_WIX)/difxapp_x64.wixlib)
-        $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst
+        $(MV) -f -- $$(@D)/$(lang)/$$(@F) $$@
+ifdef VBOX_WITH_COMBINED_PACKAGE
+ ifeq ($(lang),en_US)
+        $(MV) -f -- $$(@D)/$(lang)/common.cab $$(@D)/common.cab
+ endif
+endif
+        $(RM) -f -- $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst \
+                $$(@D)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).wixpdb \
+                $$(@D)/$(lang)/common.cab \
         $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
 endef