[openoffice.org/f12/master] get a bit medieval on component registration

Caolan McNamara caolanm at fedoraproject.org
Fri Aug 13 11:06:45 UTC 2010 

commit 06e452dc4c34c45b9bfe90e35154699d01ca5506
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 13 11:48:15 2010 +0100

    get a bit medieval on component registration

 ...rg-2.2.0.gccXXXXX.solenv.javaregistration.patch |   55 ++++++++++++++---
 ...ce.org-3.1.0.oooXXXXX.solenv.allowmissing.patch |   63 +++++++++++++++++---
 openoffice.org.spec                                |    2 +-
 3 files changed, 102 insertions(+), 18 deletions(-)
---
diff --git a/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch b/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
index a824417..9d25128 100644
--- a/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+++ b/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
@@ -1,16 +1,53 @@
-Index: bin/modules/installer/globals.pm
-===================================================================
-RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
-retrieving revision 1.62.2.3
-diff -u -r1.62.2.3 globals.pm
---- openoffice.org.orig/solenv/bin/modules/installer/globals.pm	24 Jan 2007 16:34:05 -0000	1.62.2.3
-+++ openoffice.org/solenv/bin/modules/installer/globals.pm	27 Feb 2007 17:25:53 -0000
-@@ -305,7 +305,7 @@
+--- solenv/bin/modules/installer/globals.pm	2010-05-25 21:01:11.000000000 +0100
++++ solenv/bin/modules/installer/globals.pm	2010-05-27 08:01:11.000000000 +0100
+@@ -372,8 +372,8 @@
+ 	%usedtreeconditions = ();
  	%moduledestination = ();
  	
- 	$unomaxservices = 25;
+-	$unomaxservices = 25;
 -	$javamaxservices = 15;
++	$unomaxservices = 1;
 +	$javamaxservices = 1;
  	
  	$one_cab_file = 0;
  	$fix_number_of_cab_files = 1;
+--- solenv/bin/modules/installer/servicesfile.pm	2010-05-25 21:01:11.000000000 +0100
++++ solenv/bin/modules/installer/servicesfile.pm	2010-06-10 09:07:46.000000000 +0100
+@@ -222,17 +231,31 @@
+ 			if ( $i % $installer::globals::javamaxservices == 0 || $i > $#{$javacomponents} )	# limiting to $installer::globals::maxservices files
+ 			{
+ 				my @regcompoutput = ();
++				my @throwregcompoutput = ();
+ 
+ 				my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -br ".fix_cygwin_path($regcomprdb)." -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -wop=" . $installer::globals::quote . $javaservicesurlprefix . $installer::globals::quote ." -env:URE_INTERNAL_JAVA_DIR=" . $installer::globals::quote . make_file_url($$ure_internal_java_dir_ref) . $installer::globals::quote . " 2\>\&1 |";
+ 
+-				open (REG, "$systemcall");
+-				while (<REG>) {push(@regcompoutput, $_); }
+-				close (REG);
++				my $returnvalue = 1;
++				my $infoline = "Systemcall: $systemcall\n";
+ 
+-				my $returnvalue = $?;	# $? contains the return value of the systemcall
++				for ( my $j = 0; $j <= 10; $j++) {
++					open (REG, "$systemcall");
++					while (<REG>) {push(@throwregcompoutput, $_); }
++					close (REG);
++	
++					$returnvalue = $?;	# $? contains the return value of the systemcall
+ 
+-				my $infoline = "Systemcall: $systemcall\n";
+-				push( @installer::globals::logfileinfo, $infoline);
++					push( @installer::globals::logfileinfo, $infoline);
++
++					if ($returnvalue == 0) {
++					    last;
++					}
++
++				        $infoline = "RATS: attempt $j: $systemcall\n";
++				        push( @installer::globals::logfileinfo, $infoline);
++				}
++
++    				$regcompoutput = $throwregcompoutput;
+ 
+ 				for ( my $k = 0; $k <= $#regcompoutput; $k++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$k]"); }
+ 
diff --git a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
index 8528f47..1676e40 100644
--- a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+++ b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
@@ -5,13 +5,60 @@ retrieving revision 1.17
 diff -u -p -r1.17 scriptitems.pm
 --- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm	24 Feb 2005 16:21:15 -0000	1.17
 +++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm	18 Mar 2005 22:39:42 -0000
-@@ -930,8 +930,7 @@ sub remove_Files_Without_Sourcedirectory
- 				$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;
-+				push(@missingfiles, "Warning: File not found: $filename\n");	
+@@ -1077,7 +1077,7 @@
+ 			}
+ 			else
+ 			{
+-				$infoline = "ERROR: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
++				$infoline = "WARNING: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
+ 			}
  
- 				next;	# removing this file from list, if sourcepath is empty
+ 			push( @installer::globals::logfileinfo, $infoline);
+@@ -1155,7 +1155,7 @@
  			}
+ 			else
+ 			{
+-				$infoline = "ERROR: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
++				$infoline = "WARNING: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
+ 			}
+ 
+ 			push( @installer::globals::logfileinfo, $infoline);
+@@ -1371,11 +1371,10 @@
+ 
+ 				if ( ! $installer::globals::languagepack )
+ 				{
+-					$infoline = "ERROR: Removing file $filename from file list.\n";
++					$infoline = "WARNING: Removing file $filename from file list.\n";
+ 					push( @installer::globals::logfileinfo, $infoline);
+ 
+-					push(@missingfiles, "ERROR: File not found: $filename\n");	
+-					$error_occured = 1;
++					push(@missingfiles, "WARNING: File not found: $filename\n");	
+ 
+ 					next;	# removing this file from list, if sourcepath is empty
+ 				}
+@@ -1383,11 +1382,10 @@
+ 				{
+ 					if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
+ 					{
+-						$infoline = "ERROR: Removing file $filename from file list.\n";
++						$infoline = "WARNING: Removing file $filename from file list.\n";
+ 						push( @installer::globals::logfileinfo, $infoline);
+ 
+-						push(@missingfiles, "ERROR: File not found: $filename\n");	
+-						$error_occured = 1;
++						push(@missingfiles, "WARNING: File not found: $filename\n");	
+ 
+ 						next;	# removing this file from list, if sourcepath is empty		
+ 					}
+--- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm	2010-07-12 10:27:26.000000000 +0100
++++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm	2010-07-12 10:27:54.000000000 +0100
+@@ -53,7 +53,7 @@
+ 		( $installer::globals::packageformat eq "archive" ))
+ 	{
+ 		$installer::globals::is_simple_packager_project = 1;
+-		$installer::globals::patch_user_dir = 1;
++		$installer::globals::patch_user_dir = 0;
+ 	}
+ 	elsif( $installer::globals::packageformat eq "dmg" )
+ 	{
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 2e8c2ce..9cd996c 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1721,7 +1721,7 @@ cat %{PATCH11} >> svtools/source/dialogs/localize.sdf
 %patch36 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch37 -p0 -b .ooo98137.filter.redeclared-variables.patch
 %patch38 -p1 -b .workspace.cmcfixes54.patch
-%patch39 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch39 -p0 -b .gccXXXXX.solenv.javaregistration.patch
 %patch40 -p1 -b .workspace.fwk103.patch
 %patch41 -p0 -b .workspace.hb18.patch
 %patch42 -p1 -b .oooXXXXX.gcc44.buildfixes.patch

More information about the scm-commits mailing list