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

Timestamp:

Apr 22, 2014 2:40:25 PM (11 years ago)

Author:

vboxsync

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

93417

Message:

Windows host installer: Reduce merge module build/testing times by only shipping the en_US modules right now.

File:

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

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

@@ -57 +57 @@
 #
 VBOX_INSTALLER_MERGE_MODULES = App USB NetAdp NetFlt Python
+# We only ship the merge modules in locale en_US for the moment.
+VBOX_INSTALLER_MERGE_LANGUAGES = en_US
 
 #
@@ -156 +158 @@
  OTHER_CLEAN += \
   $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-   $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
+   $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
                 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module).msm.dep \
                 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm \
@@ -390 +392 @@
 $(if $(VBOX_WITH_MSM_INSTALL), \
         $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-                $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
+                $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
                         $(eval $(def_vbox_link_msm)))),)
 
@@ -653 +655 @@
 
 $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-        $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
+        $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
                 $(eval $(def_vbox_compile_msm))))