ooo-build r12266 - in branches/sled-10-sp1-ooo-build-2-4: . patches/src680

[tml svn gnome org]

Author: tml
Date: Tue Apr 22 00:39:49 2008
New Revision: 12266
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12266&view=rev

Log:
2008-04-22  Tor Lillqvist  <tml novell com>

	* patches/src680/win32-multi-lang-installer.diff
	(solenv/bin/modules/installer/download.pm): Don't use the language
	string in put_windows_productpath_into_template() as that will
	make the folder name that is used to unpack the actual installer
	files too long. Just use a timestamp instead.



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

Modified: branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff
==============================================================================
--- branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff	(original)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff	Tue Apr 22 00:39:49 2008
@@ -477,6 +477,27 @@
 +
 +	return ERROR_SUCCESS;
 +}
+--- solenv/bin/modules/installer/download.pm
++++ solenv/bin/modules/installer/download.pm
+@@ -35,6 +35,7 @@
+ 
+ package installer::download;
+ 
++use POSIX qw(strftime);
+ use File::Spec;
+ use installer::exiter;
+ use installer::files;
+@@ -807,9 +807,7 @@
+ 	
+ 	my $productpath = $variableshashref->{'PROPERTYTABLEPRODUCTNAME'};
+ 	
+-	my $locallangs = $$languagestringref;
+-	$locallangs =~ s/_/ /g;
+-	if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . $locallangs . ")"; }
++	if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . strftime("%Y%m%d.%H%M", localtime()) . ")"; }
+ 	
+ 	replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
+ }
 --- instsetoo_native/util/makefile.mk
 +++ instsetoo_native/util/makefile.mk
 @@ -222,7 +222,7 @@