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

[tml svn gnome org]

Author: tml
Date: Fri Apr 25 09:12:15 2008
New Revision: 12332
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12332&view=rev

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

	Merge from sled-10-sp1-ooo-build-2-4 branch:

	* patches/dev300/win32-multi-lang-installer.diff
	(solenv/bin/modules/installer/download.pm): Fix problem where the
	NSIS wrapper was created with its English messages replaced by
	those for the last language for which there is no NSIS
	localisation, for us usually Zulu.

	* 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.

	* patches/src680/i87401-packagelist.diff
	* patches/src680/apply: New patch, from issue #87401. Use it in
	NovellOnlyWin32.



Added:
   branches/ooo-build-2-4/patches/src680/i87401-packagelist.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply
   branches/ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Fri Apr 25 09:12:15 2008
@@ -2290,3 +2290,8 @@
 libwpg-testing.diff
 libwps-testing.diff
 writerperfect-testing.diff
+
+[ NovellOnlyWin32 ]
+SectionOwner => tml
+
+i87401-packagelist.diff

Added: branches/ooo-build-2-4/patches/src680/i87401-packagelist.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/i87401-packagelist.diff	Fri Apr 25 09:12:15 2008
@@ -0,0 +1,71 @@
+--- solenv/bin/modules/installer/packagelist.pm
++++ solenv/bin/modules/installer/packagelist.pm
+@@ -75,6 +75,8 @@
+ 	
+ 	@allpackages = ();
+ 	
++	my $moduleshash = get_module_hash($moduleslist);
++	
+ 	for ( my $i = 0; $i <= $#{$packagelist}; $i++ )
+ 	{
+ 		my $onepackage = ${$packagelist}[$i];
+@@ -91,7 +93,8 @@
+ 
+ 		push(@allmodules, $onegid);
+ 		
+-		get_children($moduleslist, $onegid, \ allmodules);
++		# get_children($moduleslist, $onegid, \ allmodules);
++		get_children_with_hash($moduleshash, $onegid, \ allmodules);
+ 		
+ 		$onepackage->{'allmodules'} = \ allmodules;
+ 
+@@ -101,6 +104,49 @@
+ 	return \ allpackages;
+ }
+ 
++###################################################
++# Creating a hash, that contains the module gids
++# as keys and the parentids as values
++###################################################
++
++sub get_module_hash
++{
++	my ($moduleslist) = @_;
++	
++	my %modulehash = ();
++	
++	for ( my $i = 0; $i <= $#{$moduleslist}; $i++ )
++	{
++		my $gid = ${$moduleslist}[$i]->{'gid'};
++		# Containing only modules with parent. Root modules can be ignored.
++		if ( ${$moduleslist}[$i]->{'ParentID'} ) { $modulehash{$gid} = ${$moduleslist}[$i]->{'ParentID'}; }
++	}
++	
++	return \%modulehash;
++}
++
++########################################################
++# Recursively defined procedure to order 
++# modules and directories
++########################################################
++
++sub get_children_with_hash
++{
++	my ($modulehash, $parentgid, $newitemorder) = @_;
++
++	foreach my $gid ( keys %{$modulehash} )
++	{
++		my $parent = $modulehash->{$gid};
++
++		if ( $parent eq $parentgid )
++		{
++			push(@{$newitemorder}, $gid);
++			my $parent = $gid;
++			get_children_with_hash($modulehash, $parent, $newitemorder);	# recursive!
++		}		
++	}
++}
++
+ ########################################################
+ # Recursively defined procedure to order 
+ # modules and directories

Modified: branches/ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff
==============================================================================
--- branches/ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff	(original)
+++ branches/ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff	Fri Apr 25 09:12:15 2008
@@ -477,6 +477,42 @@
 +
 +	return ERROR_SUCCESS;
 +}
+--- solenv/bin/modules/installer/download.pm
++++ solenv/bin/modules/installer/download.pm
+@@ -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 . " (" . sprintf('%x', time()) . ")"; }
+ 	
+ 	replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
+ }
+@@ -1140,11 +1140,12 @@
+ 
+ sub translate_nsh_nlf_file
+ {
+-	my ($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename) = @_;
++	my ($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename, $nsislanguage) = @_;
+ 
+ 	# Analyzing the mlf file, collecting all Identifier
+ 	my $allidentifier = get_identifier($mlffile);
+ 	
++	$onelanguage = 'en-US' if ($nsislanguage eq 'English' && $onelanguage ne 'en-US');
+ 	for ( my $i = 0; $i <= $#{$allidentifier}; $i++ )
+ 	{
+ 		my $identifier = ${$allidentifier}[$i];
+@@ -1195,7 +1196,7 @@
+ 		
+ 		# Translate the files
+ 		my $nlffile = installer::files::read_file($nlffilename);
+-		translate_nsh_nlf_file($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename);
++		translate_nsh_nlf_file($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename, $nsislanguage);
+ 		
+ 		installer::files::save_file($nshfilename, $nshfile);
+ 		installer::files::save_file($nlffilename, $nlffile);
 --- instsetoo_native/util/makefile.mk
 +++ instsetoo_native/util/makefile.mk
 @@ -222,7 +222,7 @@