ooo-build r12036 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: Fri Mar 28 11:11:17 2008
New Revision: 12036
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12036&view=rev

Log:
2008-03-28  Tor Lillqvist  <tml novell com>

	* patches/src680/win32-multi-lang-installer.diff
	(setup_native/source/win32/customactions/sellang/sellang.cxx):
	Have to rework the logic used to deselect irrelevant language
	packs in a multi-language installer once more. There is an issue
	in 2.4.0 where using lots of languages causes the installer
	builder to run forever. We thus have to severely restrict the
	number of languages included in the installer. (We use just
	en-US,de,es,fr,it,pt-BR.)

	If the system default UI language is not among the ones present in
	the installer, then by default deselect all except English. (Yes,
	it is somewhat rude to assume English being the desired default
	then; however by choosing a Custom installation the user is of
	course free to select herself which ones she wants.)

	This avoids the situation where for instance on a Finnish Windows
	machine all six languages would be installed. That is probably
	less desirable than installing just English.

2008-03-28  Tor Lillqvist  <tml novell com>

	* patches/src680/novell-win32-msi-patchability.diff: Use just a
	single cab file like before. It might be important for patching. I
	don't think there is any inherent gain in using several cab files.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/novell-win32-msi-patchability.diff
   trunk/patches/src680/win32-multi-lang-installer.diff

Modified: trunk/patches/src680/novell-win32-msi-patchability.diff
==============================================================================
--- trunk/patches/src680/novell-win32-msi-patchability.diff	(original)
+++ trunk/patches/src680/novell-win32-msi-patchability.diff	Fri Mar 28 11:11:17 2008
@@ -7078,14 +7078,19 @@
 dummy line to avoid confusing diff-mode
 --- solenv/bin/modules/installer/globals.pm
 +++ solenv/bin/modules/installer/globals.pm
-@@ -243,11 +243,11 @@
- 	$fix_number_of_cab_files = 0;
+@@ -243,14 +243,14 @@
+ 	$javamaxservices = 15;
+ 	
+ 	$one_cab_file = 0;
+-	$fix_number_of_cab_files = 0;
++	$fix_number_of_cab_files = 1;
  	$cab_file_per_component = 0;
  	$cabfilecompressionlevel = 2;
 -	$number_of_cabfiles = 4;	# only for $fix_number_of_cab_files = 1 
 +	$number_of_cabfiles = 1;	# only for $fix_number_of_cab_files = 1 
  	$include_cab_in_msi = 0;
- 	$use_packages_for_cabs = 1;
+-	$use_packages_for_cabs = 1;
++	$use_packages_for_cabs = 0;
  	$msidatabasename = "";
 -	$prepare_winpatch = 0;
 +	$prepare_winpatch = 1;

Modified: trunk/patches/src680/win32-multi-lang-installer.diff
==============================================================================
--- trunk/patches/src680/win32-multi-lang-installer.diff	(original)
+++ trunk/patches/src680/win32-multi-lang-installer.diff	Fri Mar 28 11:11:17 2008
@@ -129,7 +129,7 @@
 +
 --- /dev/null
 +++ setup_native/source/win32/customactions/sellang/sellang.cxx	2006-06-02 09:13:53.893875000 +0000
-@@ -0,0 +1,330 @@
+@@ -0,0 +1,347 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -419,6 +419,15 @@
 +		 * (On most Windows installations, just one UI language is present,
 +		 * which obviously is the same as the default UI language. But
 +		 * we want to be generic.)
++		 * If none of the languages in a multi-language installer is the
++		 * system default UI language (this happens now in 2.4.0 where we
++		 * cannot put as many UI languages into the installer as we would
++		 * like, but only half a dozen: en-US,de,es,fr,it,pt-BR), pretend 
++		 * that English is the system default UI language,
++		 * so that we will by default deselect everything except
++		 * English. We don't want to by default install all half dozen
++		 * languages for an unsuspecting user of a Finnish Windows, for
++		 * instance. Sigh.
 +		 */
 +		if (system_default_lang[0]) {
 +			for (i = 0; i < nlangs; i++) {
@@ -432,6 +441,14 @@
 +			}
 +		}
 +
++		if (!have_system_default_lang) {
++#ifdef VERBOSE_DEBUG_OUTPUT
++			sprintf(tem, "We don't have the system default language %s in the installer, so pretend that English is the system default, sigh.", system_default_lang);
++			MessageBoxA(NULL, tem, "SelectLanguage", MB_OK);
++#endif
++			system_default_lang = "en";
++			have_system_default_lang = 1;
++		}
 +		if (have_system_default_lang) {
 +			for (i = 0; i < nlangs; i++) {
 +				if (memcmp(system_default_lang, langs[i], 2) != 0 &&