ooo-build r13300 - trunk/patches/dev300

[michael svn gnome org]

Author: michael
Date: Fri Jul 18 17:24:40 2008
New Revision: 13300
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13300&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	Fri Jul 18 17:24:40 2008
@@ -18,3 +18,54 @@
  
  	if ( $installer::globals::setupscriptname eq "" )
  	{
+--- /tmp/globals.pm	2008-07-18 17:53:26.000000000 +0100
++++ /usr/lib/ooo-3/solenv/bin/modules/installer/globals.pm	2008-07-18 17:53:17.000000000 +0100
+@@ -56,7 +56,8 @@
+ 
+ 	$destdir = "";
+ 	$rootpath = "";
+-	
++
++	$split = 0;
+ 	$productextension = "";
+ 	@languageproducts = ();
+ 	$build = "";
+@@ -428,6 +429,8 @@
+ 	if ( $plat =~ /linux/i ) { $islinux = 1; } 
+ 	if ( $plat =~ /solaris/i ) { $issolaris = 1; } 
+ 
++	$split = 1 if (defined $ENV{SOLARPIECE});
++
+ 	# ToDo: Needs to be expanded for additional platforms
+ 
+ }
+
+
+--- 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 @@
+ 				$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;
++				}
+ 
+ 				next;	# removing this file from list, if sourcepath is empty
+ 			}
+
+a--- solenv/bin/make_installer.pl	2008-07-18 17:58:25.000000000 +0100
++++ solenv/bin/make_installer.pl	2008-07-18 17:58:25.000000000 +0100
+@@ -802,7 +802,8 @@
+ 			# "regcomp" or "regcomp.exe". Therefore this function can only be executed on the
+ 			# corresponding platform.
+ 
+-			if ( $installer::globals::servicesrdb_can_be_created )
++			if ( $installer::globals::servicesrdb_can_be_created &&
++			     !$installer::globals::split)
+ 			{
+ 				installer::logger::print_message( "... creating preregistered services.rdb ...\n" );
+