ooo-build r13347 - trunk/patches/dev300

[michael svn gnome org]

Author: michael
Date: Tue Jul 22 12:02:48 2008
New Revision: 13347
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13347&view=rev

Log:
more work.


Modified:
   trunk/patches/dev300/piece-solenv.diff

Modified: trunk/patches/dev300/piece-solenv.diff
==============================================================================
--- trunk/patches/dev300/piece-solenv.diff	(original)
+++ trunk/patches/dev300/piece-solenv.diff	Tue Jul 22 12:02:48 2008
@@ -44,16 +44,17 @@
 
 --- solenv/bin/modules/installer/scriptitems.pm	2008-07-18 17:54:05.000000000 +0100
 +++ solenv/bin/modules/installer/scriptitems.pm	2008-07-18 17:54:05.000000000 +0100
-@@ -1133,8 +1134,10 @@
+@@ -1133,6 +1134,7 @@
+ 			if ( ! ( $styles =~ /\bSTARREGISTRY\b/ ))	# StarRegistry files will be created later
+ 			{
+ 				my $filename = $onefile->{'Name'};
++			if (! $installer::globals::split) {
  				$infoline = "ERROR: Removing file $filename from file list.\n";
  				push( @installer::globals::logfileinfo, $infoline);
  
--				push(@missingfiles, "ERROR: File not found: $filename\n");	
--				$error_occured = 1;
-+				if (! $installer::globals::split) {
-+				    push(@missingfiles, "ERROR: File not found: $filename\n");	
-+				    $error_occured = 1;
-+				}
+				push(@missingfiles, "ERROR: File not found: $filename\n");	
+				$error_occured = 1;
++			}
  
  				next;	# removing this file from list, if sourcepath is empty
  			}
@@ -114,9 +115,28 @@
  
  	# and overriding all new values
  	
+
 --- solenv/bin/modules/installer/worker.pm	2008-07-21 15:57:11.000000000 +0100
 +++ solenv/bin/modules/installer/worker.pm	2008-07-21 15:57:11.000000000 +0100
-@@ -784,7 +791,18 @@
+@@ -730,6 +730,17 @@
+ 	return \ allitems;
+ }
+ 
++# ugly hack, for reasons ~unknown the directory counting
++# magic fails in split mode ...
++sub check_create_dir_for_file ($)
++{
++    return if (!$installer::globals::split);
++    my $file = shift;
++    $file =~ s|/[^/]*$||;
++    `mkdir -p $file` if (! -d $file);
++}
++    
++
+ ###########################################################
+ # Mechanism for simple installation without packing
+ ###########################################################
+@@ -784,7 +791,19 @@
  
  		push @lines, "$destination\n";
  		# printf "cp $sourcepath $destdir$destination\n";
@@ -124,6 +144,7 @@
 +
 +		next if ($installer::globals::split && $sourcepath eq '');
 +
++		check_create_dir_for_file ("$destdir$destination"); # urgh ...
 +		if (!copy ("$sourcepath", "$destdir$destination")) {
 +		    if (-f "$destdir$destination" && ! -w "$destdir$destination") {
 +			print STDERR "skipping existing file: $destdir$destination: $!\n";
@@ -136,6 +157,27 @@
  		my $sourcestat = stat($sourcepath);
  		utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
  		chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
+@@ -837,7 +849,8 @@
+                push @lines, "$destination\n";
+        }
+ 
+-       if ( $destdir ne "" )
++       if ( !$installer::globals::split && # not needed for split mode
++            $destdir ne "" )
+        {
+                my $filelist;
+                my $fname = $installer::globals::destdir . "/$packagename";
+
+@@ -2927,6 +2927,9 @@
+ {
+ 	my ( $productlanguagesarrayref, $allvariables ) = @_;
+ 
++	# short circuit in split mode
++	return if ($installer::globals::split);
++
+ 	my %productlanguages = ();
+ 	for ( my $i = 0; $i <= $#{$productlanguagesarrayref}; $i++ ) { $productlanguages{${$productlanguagesarrayref}[$i]} = 1;  }
+ 	
 
 
 
@@ -167,3 +209,17 @@
  
  			my $infoline = "$modulegid: Using packinfo: \"$$fileref\"!\n";
  			push( @installer::globals::logfileinfo, $infoline);
+
+
+
+--- solenv/bin/modules/installer/scpzipfiles.pm	2008-07-22 12:42:33.000000000 +0100
++++ solenv/bin/modules/installer/scpzipfiles.pm	2008-07-22 12:42:33.000000000 +0100
+@@ -148,6 +148,8 @@
+ 				
+ 				my $onefilename = $onefile->{'Name'};
+ 				my $sourcepath = $onefile->{'sourcepath'};
++
++				next if ($installer::globals::split && $sourcepath eq '');
+ 				
+ 				if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ )	# filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
+ 				{