ooo-build r13363 - in trunk: . doc patches/dev300

[michael svn gnome org]

Author: michael
Date: Wed Jul 23 11:53:17 2008
New Revision: 13363
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13363&view=rev

Log:
2008-07-23  Michael Meeks  <michael meeks novell com>

        * patches/dev300/piece-solenv.diff: fix path include
        issues, disable profiles unless OO_ALLOW_PROFILES is set. 



Modified:
   trunk/ChangeLog
   trunk/doc/split.txt
   trunk/patches/dev300/piece-solenv.diff

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Wed Jul 23 11:53:17 2008
@@ -298,3 +298,8 @@
 %ooo_prefix/%ooo_home/share/*
 %ooo_prefix/%ooo_home/ure/*
 %ooo_prefix/%ooo_home/THIRDPARTYLICENSEREADME.html/*
+
+
+make_installer.pl [!] ... can't mangle include path ...
+	+ need a different include path for certain control files [!?]
+

Modified: trunk/patches/dev300/piece-solenv.diff
==============================================================================
--- trunk/patches/dev300/piece-solenv.diff	(original)
+++ trunk/patches/dev300/piece-solenv.diff	Wed Jul 23 11:53:17 2008
@@ -59,18 +59,6 @@
  				next;	# removing this file from list, if sourcepath is empty
  			}
 
---- 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" );
- 
 
 --- solenv/bin/modules/installer/profiles.pm	2008-07-21 14:04:00.000000000 +0100
 +++ solenv/bin/modules/installer/profiles.pm	2008-07-21 14:04:00.000000000 +0100
@@ -122,7 +110,7 @@
  			my $gid =  $onepackage->{'module'};
  			my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfile, "" , 0);
  
-+                        if ($installer::globals::split) {
++                        if ($$fileref eq "" && $installer::globals::split) {
 +                            $$fileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $scriptfile;
 +                        }
  			if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfile for module $gid!", "check_packagelist"); }
@@ -133,7 +121,7 @@
  			my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packinfofile, "" , 0);
  
 -			if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages"); }
-+			if ($installer::globals::split) {
++			if ( $$fileref eq "" && $installer::globals::split) {
 +			    $$fileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $packinfofile;
 +			}
 +
@@ -160,6 +148,21 @@
 
 
 
+
+--- solenv/bin/make_installer.pl	2008-07-22 21:13:46.000000000 +0100
++++ solenv/bin/make_installer.pl	2008-07-22 21:13:46.000000000 +0100
+@@ -302,6 +302,9 @@
+ 
+ my $includepatharrayref = installer::converter::convert_stringlist_into_array($includepathref, ",");
+ if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray1.log" ,$includepatharrayref); }
++if (defined $ENV{OO_SOLVERDIR}) {
++    push @{$includepatharrayref}, "$ENV{OO_SOLVERDIR}/bin";
++}
+ 
+ installer::ziplist::replace_all_variables_in_pathes($includepatharrayref, $pathvariableshashref);
+ if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray2.log" ,$includepatharrayref); }
+
+
 --- solenv/bin/modules/installer/worker.pm	2008-07-22 13:49:26.000000000 +0100
 +++ solenv/bin/modules/installer/worker.pm	2008-07-22 13:49:26.000000000 +0100
 @@ -730,6 +730,17 @@
@@ -188,7 +191,7 @@
  
  	installer::logger::print_message( "DestDir: $destdir \n" );
  	installer::logger::print_message( "Rootpath: $installer::globals::rootpath \n" );
-@@ -794,7 +799,19 @@
+@@ -797,11 +809,24 @@
  
  		push @lines, "$destination\n";
  		# printf "cp $sourcepath $destdir$destination\n";
@@ -209,15 +212,12 @@
  		my $sourcestat = stat($sourcepath);
  		utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
  		chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
-@@ -807,6 +820,7 @@
- 		utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
- 		chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
   		push @lines, "$destination\n";
 +		push @sources, "$sourcepath\n";
  	}
  	
  	for ( my $i = 0; $i <= $#{$linksarray}; $i++ )
-@@ -826,9 +826,14 @@
+@@ -826,9 +851,14 @@
  		push @lines, "$destination\n";
  	}
  
@@ -235,7 +235,17 @@
  		my $fname = $installer::globals::destdir . "/$packagename";
  		open ($filelist, ">$fname") || die "Can't open $fname: $!";
  		print $filelist @lines;
-@@ -2927,6 +2951,9 @@
+@@ -2292,6 +2322,9 @@
+ 		$includefilename =~ s/^\s*//;
+ 		$includefilename =~ s/\s*$//;
+ 		$includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1);
++		if ($$includefilenameref eq "") {
++		    $$includefilenameref = $ENV{OO_INSTDIR} . "/solver/bin/" . $includefilename;
++		}
+ 		if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); }
+ 
+ 		$infoline = "Including inc file: $$includefilenameref \n";
+@@ -2916,6 +2949,9 @@
  {
  	my ( $productlanguagesarrayref, $allvariables ) = @_;
  
@@ -245,3 +255,25 @@
  	my %productlanguages = ();
  	for ( my $i = 0; $i <= $#{$productlanguagesarrayref}; $i++ ) { $productlanguages{${$productlanguagesarrayref}[$i]} = 1;  }
  	
+--- 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
+@@ -834,7 +834,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" );
+ 
+@@ -950,7 +951,7 @@
+ 	my $profilesinproductlanguageresolvedarrayref;
+ 	my $profileitemsinproductlanguageresolvedarrayref;
+ 
+-	if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )))
++	if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && $ENV{OO_ALLOW_PROFILES})
+ 	{
+ 		installer::logger::print_message( "... creating profiles ...\n" );
+ 
+