Changeset 52909 in vbox

Timestamp:

Oct 1, 2014 5:59:51 AM (10 years ago)

Author:

vboxsync

Message:

Config.kmk,Makefile.kmk: Disable merge module installers by default, whoever wants to have them can have the pleasure of enabling them manually or locally.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Installer/win/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -648 +648 @@
  VBOX_WITH_MMR = 1
 endif
-# Use merge modules if we're not doing an official release. This will increase
+# Enables use of merge modules in the windows installer. This will increase
 # the overall installer size significantly because merge modules are not able
 # to use a common .cab file to reduce their size.
-ifneq ($(int-mod $(VBOX_VERSION_BUILD),2),0)
- VBOX_WITH_MSM_INSTALL := 1
- VBOX_INSTALLER_LANGUAGES = en_US
-endif
-ifeq ($(USERNAME),andy)
- VBOX_WITH_MSM_INSTALL := 1
- VBOX_INSTALLER_LANGUAGES = en_US
-endif
+#VBOX_WITH_MSM_INSTALL = 1
 ## @}
 

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

@@ -51 +51 @@
 #
 ifndef VBOX_INSTALLER_LANGUAGES
-VBOX_INSTALLER_LANGUAGES  = en_US de_DE fr_FR it_IT zh_TW
-VBOX_INSTALLER_LANGUAGES += $(VBOX_INSTALLER_ADD_LANGUAGES)
+ ifdef VBOX_WITH_MSM_INSTALL ## @todo Dunno why this has to be this way, ask Andy.
+  VBOX_INSTALLER_LANGUAGES = en_US
+ else
+  VBOX_INSTALLER_LANGUAGES  = en_US de_DE fr_FR it_IT zh_TW
+  VBOX_INSTALLER_LANGUAGES += $(VBOX_INSTALLER_ADD_LANGUAGES)
+ endif
 endif