ooo-build r12713 - in branches/ooo-build-2-4-1: . patches/src680

[tml svn gnome org]

Author: tml
Date: Thu May 29 18:29:12 2008
New Revision: 12713
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12713&view=rev

Log:
2008-05-29  Tor Lillqvist  <tml novell com>

	* patches/src680/win32-multi-lang-installer.diff
	(solenv/bin/modules/installer/windows/file.pm): Abbreviate the
	component name even more to get it "more unique" in the first 40
	characters. Workaround for bug (feature?) in Windows
	Installer. (i#90116)



Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/win32-multi-lang-installer.diff

Modified: branches/ooo-build-2-4-1/patches/src680/win32-multi-lang-installer.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/win32-multi-lang-installer.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/win32-multi-lang-installer.diff	Thu May 29 18:29:12 2008
@@ -513,6 +513,19 @@
  		
  		installer::files::save_file($nshfilename, $nshfile);
  		installer::files::save_file($nlffilename, $nlffile);
+--- solenv/bin/modules/installer/windows/file.pm
++++ solenv/bin/modules/installer/windows/file.pm
+@@ -242,6 +242,10 @@
+ 	$componentname =~ s/_basicidecommands_/_baic_/g;
+ 	$componentname =~ s/_genericcommands_/_genc_/g;
+ 	$componentname =~ s/_bibliographycommands_/_bibc_/g;
++	$componentname =~ s/_share_/_s_/g;
++	$componentname =~ s/_modules_/_ms_/g;
++	$componentname =~ s/_uiconfig_zip_/_ucz_/g;
++	$componentname =~ s/_soffice_cfg_/_sc_/g;
+ 
+ 	# All this is not necessary for files, which have the flag ASSIGNCOMPOMENT
+ 	
 --- instsetoo_native/util/makefile.mk
 +++ instsetoo_native/util/makefile.mk
 @@ -222,7 +222,7 @@