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

Timestamp:

Apr 22, 2014 2:55:38 PM (11 years ago)

Author:

vboxsync

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) (2 diffs)

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

@@ -54 +54 @@
 
 #
-# List of merge modules to use.
-#
-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
-
-#
 # Use merge modules if we're not doing an official release.
 # This will increase the overall installer size significantly because
@@ -68 +61 @@
 ifneq ($(int-mod $(VBOX_VERSION_BUILD),2),0)
  VBOX_WITH_MSM_INSTALL := 1
-endif
+ VBOX_INSTALLER_LANGUAGES = en_US
+endif
+
+#
+# List of merge modules to use.
+#
+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 =  $(VBOX_INSTALLER_LANGUAGES)
 
 #