ooo-build r13589 - in trunk: . bin/piece doc patches/dev300 scratch/split

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13589 - in trunk: . bin/piece doc patches/dev300 scratch/split
Date: Fri, 15 Aug 2008 13:38:09 +0000 (UTC)
Author: michael
Date: Fri Aug 15 13:38:09 2008
New Revision: 13589
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13589&view=rev

Log:
2008-08-15  Michael Meeks  <michael meeks novell com>

        * scratch/split/*.spec: update.
        
        * patches/dev300/apply: enable piece-services.



Modified:
   trunk/ChangeLog
   trunk/bin/piece/install-generic
   trunk/doc/split.txt
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-services.diff
   trunk/scratch/split/ooo3.spec
   trunk/scratch/split/ooo3_components.spec
   trunk/scratch/split/ooo3_libs_core.spec
   trunk/scratch/split/ooo3_libs_extern.spec
   trunk/scratch/split/ooo3_ure.spec

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Fri Aug 15 13:38:09 2008
@@ -24,13 +24,13 @@
 export LANGS="en-US,en-GB"
 
 if test "z$DESTDIR" == "z"; then
-    print "install-generic requires a destdir to be set"
+    echo "install-generic requires a destdir to be set"
     exit 1
 fi
 
-perl -w $SOLARENV/bin/make_installer.pl \
+perl -d -w $SOLARENV/bin/make_installer.pl \
      -f /usr/lib/ooo-3/solver/instsetoo_native/util/openoffice.lst \
-     -l $LANGS -p OpenOffice -buildid $BUILD -destdir $DESTDIR \
+     -l $LANGS -p OpenOffice -debug -verbose -log -buildid $BUILD -destdir $DESTDIR \
      -dontstrip -simple $OO_INSTDIR
 
 # ----- end monster make_installer section -----

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Fri Aug 15 13:38:09 2008
@@ -72,6 +72,10 @@
 	  eg. solver/lib/libfoo.so -> ../../program/libfoo.so.1.2.3 etc.
 		+ this should shrink the -devel packages substantially.
 
+	+ FIXME: the services building is -horrific- and needs fixing.
+
+	+ FIXME: should we merge 'artwork' and bootstrap ?
+
 	+ we install all the artwork into the system:
 		+ yet really it would be far better to install just
 		the .zip archives, and work from them
@@ -327,3 +331,22 @@
 	+ done in the cleanup section ?
 		+ packimages [etc.]
 
+
+* FIXME:
+	+ startup - and moaning about missing Resources ...
+		+ means missing bootstraprc files (etc. in both
+		  program/ and basis3.0/program/)
+
+./instsetoo_native/util/OpenOffice/profiles/en-US/gid_Profile_Version_Ini_Basis/versionrc
+./instsetoo_native/util/OpenOffice/profiles/en-US/gid_Profile_Version_Ini_Ure/versionrc
+./instsetoo_native/util/OpenOffice/profiles/en-US/gid_Brand_Profile_Version_Ini/versionrc
+
+** FIXME:
+	+ these files are generated -entirely- from the scp ...
+	+ "ProfileItem" and "ConfigurationItems"
+		+ in scriptitems.pm and profiles::create_profiles (?) ... ?
+	+ wow :-)
+
+	+ export OOO_ALLOW_PROFILE=1 ...
+		+ add an --inhibit-profiles flag (?)
+		+ use it everywhere - except for the last stage ... (?)

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Aug 15 13:38:09 2008
@@ -2458,6 +2458,7 @@
 piece-remotebridges.diff
 piece-scp2.diff
 piece-solenv.diff
+piece-services.diff
 piece-ant.diff
 piece-extensions.diff
 piece-setup_native.diff

Modified: trunk/patches/dev300/piece-services.diff
==============================================================================
--- trunk/patches/dev300/piece-services.diff	(original)
+++ trunk/patches/dev300/piece-services.diff	Fri Aug 15 13:38:09 2008
@@ -5,7 +5,7 @@
  }
  
  my $includepatharrayref = installer::converter::convert_stringlist_into_array($includepathref, ",");
-+if (defined $ENV{TWEAK}) {
++if (defined $ENV{OO_BUILD_SERVICES}) {
 +    push @{$includepatharrayref}, "$ENV{SPLITUREDIR}/share/java";
 +    push @{$includepatharrayref}, "$ENV{SPLITINSTALLDIR}/classes";
 +    push @{$includepatharrayref}, "$ENV{SPLITUREDIR}/bin";
@@ -19,7 +19,7 @@
  		}
  	}
  
-+	if (defined $ENV{TWEAK}) {
++	if (defined $ENV{OO_BUILD_SERVICES}) {
 +	    installer::logger::print_message( "... creating preregistered services.rdb ...\n" );
 +
 +	    installer::servicesfile::create_services_rdb($allvariableshashref, $filesinproductlanguageresolvedarrayref, $includepatharrayref, $languagestringref);
@@ -46,7 +46,7 @@
  
  			if ( $installer::globals::dounzip ) { installer::systemactions::create_directory($unzipdir); }	# creating subdirectories with the names of the zipfiles
  
-+			next if (defined $ENV{TWEAK});
++			next if (defined $ENV{OO_BUILD_SERVICES});
 +
  			$systemcall = "$installer::globals::unzippath -l $sourcepath |";
  			open (UNZIP, "$systemcall");
@@ -69,7 +69,7 @@
  			my $sourcepath = $onefile->{'sourcepath'};
  
 -				next if ($installer::globals::split && $sourcepath eq '');
-+if (!defined $ENV{TWEAK}) {
++if (!defined $ENV{OO_BUILD_SERVICES}) {
 +			next if ($installer::globals::split && $sourcepath eq '');
 +}
  			
@@ -82,7 +82,7 @@
 -			my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
 -
 +			my $copysuccess;
-+			if (!defined $ENV{TWEAK}) {
++			if (!defined $ENV{OO_BUILD_SERVICES}) {
 +			    $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
  			if ( $copysuccess )
  			{
@@ -107,7 +107,7 @@
  			}
  
 -				next;	# removing this file from list, if sourcepath is empty
-+				if (!defined $ENV{TWEAK}) {
++				if (!defined $ENV{OO_BUILD_SERVICES}) {
 +				    print STDERR "drop file $filename ?\n";
 +				    next;	# removing this file from list, if sourcepath is empty
 +				}
@@ -122,7 +122,7 @@
      for ( my $i = 0; $i <= $#{$unocomponents}; )
      {
          my $sourcepath = ${$unocomponents}[$i++]->{'sourcepath'};
-+	defined $ENV{TWEAK} && $sourcepath eq "" && next;
++	defined $ENV{OO_BUILD_SERVICES} && $sourcepath eq "" && next;
  
          $filestring = $filestring . make_file_url($sourcepath);
  

Modified: trunk/scratch/split/ooo3.spec
==============================================================================
--- trunk/scratch/split/ooo3.spec	(original)
+++ trunk/scratch/split/ooo3.spec	Fri Aug 15 13:38:09 2008
@@ -29,7 +29,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-ure
+main ooo3 package.
 
 %prep
 %setup -q -n %ooo_build_tag-%piece
@@ -50,8 +50,19 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export DESTDIR=$RPM_BUILD_ROOT
+export OO_ALLOW_PROFILES=1
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
 
+# Now do magic stuff to register the services - fully hacky (sadly).
+export OO_BUILD_SERVICES=1
 $OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+# urgh - unbelievably nasty:
+cp -a OpenOffice/gid_Starregistry_Services_Rdb_servicesrdb/*/services.rdb \
+    $DESTDIR$OO_INSTDIR/basis3.0/program/services.rdb
+cp -a OpenOffice/gid_Starregistry_Services_Rdb_Ure_servicesrdb/*/services.rdb \
+    $DESTDIR$OO_INSTDIR/ure/share/misc/services.rdb
+# no need for solver bits at this late stage
+rm -Rf "$DESTDIR/$OO_INSTDIR/solver"
 
 %clean
 %post
@@ -59,6 +70,13 @@
 %files
 %defattr(-,root,root)
 %dir %ooo_prefix/%ooo_home/basis3.0
+%dir %ooo_prefix/%ooo_home/program
+%dir %ooo_prefix/%ooo_home/share
+%dir %ooo_prefix/%ooo_home/ure
 %ooo_prefix/%ooo_home/basis3.0/*
+%ooo_prefix/%ooo_home/program/*
+%ooo_prefix/%ooo_home/share/*
+%ooo_prefix/%ooo_home/ure/*
+%ooo_prefix/%ooo_home/basis-link
 
 %changelog

Modified: trunk/scratch/split/ooo3_components.spec
==============================================================================
--- trunk/scratch/split/ooo3_components.spec	(original)
+++ trunk/scratch/split/ooo3_components.spec	Fri Aug 15 13:38:09 2008
@@ -65,7 +65,8 @@
 # prune redundant files the scp2 likes to make for us
 rm -Rf \
     "$DESTDIR/$OO_INSTDIR/basis-link" \
-    "$DESTDIR/$OO_INSTDIR/ure"
+    "$DESTDIR/$OO_INSTDIR/ure" \
+    "$DESTDIR/$OO_INSTDIR/solver/bin/packinfo*.txt"
 
 %clean
 %post

Modified: trunk/scratch/split/ooo3_libs_core.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_core.spec	(original)
+++ trunk/scratch/split/ooo3_libs_core.spec	Fri Aug 15 13:38:09 2008
@@ -65,7 +65,8 @@
 # prune redundant files the scp2 likes to make for us
 rm -Rf \
     "$DESTDIR/$OO_INSTDIR/basis-link" \
-    "$DESTDIR/$OO_INSTDIR/ure"
+    "$DESTDIR/$OO_INSTDIR/ure" \
+    "$DESTDIR/$OO_INSTDIR/basis3.0/program/services.rdb"
 
 %clean
 %post

Modified: trunk/scratch/split/ooo3_libs_extern.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_extern.spec	(original)
+++ trunk/scratch/split/ooo3_libs_extern.spec	Fri Aug 15 13:38:09 2008
@@ -13,7 +13,6 @@
 %define         distro     SUSE
 %define         piece      libs_extern
 Name:           ooo3_%piece
-Requires:       ooo3_bootstrap
 # urg, ure dep is now required for cppunit ...
 BuildRequires:  ooo3_bootstrap ooo3_ure
 %define	      ooo_prefix	%_libdir

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Fri Aug 15 13:38:09 2008
@@ -13,7 +13,6 @@
 %define         distro     SUSE
 %define         piece ure
 Name:           ooo3_%piece
-Requires:       ooo3_bootstrap
 BuildRequires:  ooo3_bootstrap
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
@@ -60,7 +59,6 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export DESTDIR=$RPM_BUILD_ROOT
-
 $OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
 
 %clean
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]