Changeset 51027 in vbox

Timestamp:

Apr 10, 2014 9:07:18 AM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: Fixed dependency file generation.

File:

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

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

@@ -48 +48 @@
 #
 # Globals and targets.
-#
-VBOX_INSTALLER_LANGUAGES  = de_DE en_US fr_FR it_IT zh_TW
+# Note: en_US *must* come first for the dependency file generation.
+#
+VBOX_INSTALLER_LANGUAGES  = en_US de_DE fr_FR it_IT zh_TW
 VBOX_INSTALLER_LANGUAGES += $(VBOX_INSTALLER_ADD_LANGUAGES)
 
@@ -124 +125 @@
         $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \
         $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \
+        $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
         $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi
 
@@ -139 +141 @@
  OTHER_CLEAN += \
         $(PACKAGE_NAME_FINAL)
+endif
+
+ifdef VBOX_WITH_MSM_INSTALL
+ $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
+        $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
+                OTHER_CLEAN += \
+                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module).msm.dep \
+                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm \
+                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \
+                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixpdb))
 endif
 
@@ -388 +400 @@
         $(PATH_OUT)/bin/msvcp100.dll \
         , $(VBOX_MSI_DEPENDENCIES))
-else
+else # VCC100
  VBOX_MSI_DEPENDENCIES := $(filter-out \
         $(PATH_OUT)/bin/msvcr110.dll \
@@ -467 +479 @@
                                 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \
                                 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
-                                $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
+                                $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \
+                                $(VBOX_MSI_DEPENDENCIES)) \
                         $(VBOX_VERSION_STAMP) \
                         | $$$$(dir $$$$@)
@@ -533 +546 @@
         $(SED) -f $(VBOX_PATH_WIN_INST_SRC)/dep.sed \
                 --append $(VBOX_WIN_INST_OUT_DIR)/VirtualBox.wixobj.dep \
+                $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
+                        $(VBOX_PATH_WIN_INST_SRC)/VBoxMerge$(module).wxi) \
                 $(VBOX_PATH_WIN_INST_SRC)/VirtualBox.wxs \
                 $(VBOX_PATH_WIN_INST_SRC)/UserInterface.wxi \
-                $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi
+                $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
+                $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,)
         $(APPEND) $(VBOX_WIN_INST_OUT_DIR)/VirtualBox.wixobj.dep ''
 endif
@@ -619 +635 @@
                 $(VBOX_PATH_WIN_INST_SRC)/VBoxMerge$(module).wxs \
                 $(VBOX_PATH_WIN_INST_SRC)/UserInterface.wxi \
-                $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi
+                $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
+                $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,)
         $(APPEND) $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module).msm.dep ''
 endif