GNOME.org
 

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

Author: michael
Date: Thu Jul 10 22:11:58 2008
New Revision: 13151
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13151&view=rev

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

        * patches/dev300/piece-solarbindir.diff,
        * bin/package-ooo, bin/build-ooo: misc. its.



Added:
   trunk/bin/piece/build-generic   (contents, props changed)
   trunk/bin/piece/install-generic   (contents, props changed)
   trunk/patches/dev300/piece-rsc.diff
   trunk/patches/dev300/piece-solarbindir.diff
Removed:
   trunk/bin/piece/build-libs_extern
   trunk/bin/piece/build-ure
   trunk/bin/piece/install-libs_extern
   trunk/bin/piece/install-ure
Modified:
   trunk/ChangeLog
   trunk/bin/build-ooo
   trunk/bin/package-ooo
   trunk/bin/piece/build-bootstrap
   trunk/bin/piece/install-bootstrap
   trunk/bin/piece/sys-setup
   trunk/doc/split.txt
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-build.diff
   trunk/patches/dev300/piece-target.diff
   trunk/scratch/rcsutil/parse_rcs.py
   trunk/scratch/split/ooo3_libs_extern.spec
   trunk/scratch/split/ooo3_libs_gui.spec
   trunk/scratch/split/ooo3_ure.spec

Modified: trunk/bin/build-ooo
==============================================================================
--- trunk/bin/build-ooo	(original)
+++ trunk/bin/build-ooo	Thu Jul 10 22:11:58 2008
@@ -127,7 +127,6 @@
 if test "z$PIECE" != "z"; then
 	echo "Build $PIECE"
 	. $TOOLSDIR/bin/piece/build-$PIECE
-
 else
 
 # update localizations from external sources

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Thu Jul 10 22:11:58 2008
@@ -20,6 +20,7 @@
     DEST=$OOINSTDIR/solver
     mkdir -p $DEST
     cp -R $SRCDIR/* $DEST
+    ln -sf $OOBUILDDIR/solver/$INPATH .
     if test -f "$TOOLSDIR/bin/piece/install-$PIECE"; then
 	echo "$PIECE specific install"
 	. $TOOLSDIR/bin/piece/install-$PIECE

Modified: trunk/bin/piece/build-bootstrap
==============================================================================
--- trunk/bin/piece/build-bootstrap	(original)
+++ trunk/bin/piece/build-bootstrap	Thu Jul 10 22:11:58 2008
@@ -1,5 +1,7 @@
 # build bash script - invoked from build-ooo
 
 cd $OOBUILDDIR/soltools || exit 1;
+echo "About to sleep ..."
+sleep 25
 perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
 perl $SOLARENV/bin/build.pl --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;

Added: trunk/bin/piece/build-generic
==============================================================================
--- (empty file)
+++ trunk/bin/piece/build-generic	Thu Jul 10 22:11:58 2008
@@ -0,0 +1,2 @@
+dirs=`/bin/ls | grep -v 'applied_patches' | tr '\n' ':'`
+perl $SOLARENV/bin/build.pl --subdirs:$dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;

Modified: trunk/bin/piece/install-bootstrap
==============================================================================
--- trunk/bin/piece/install-bootstrap	(original)
+++ trunk/bin/piece/install-bootstrap	Thu Jul 10 22:11:58 2008
@@ -6,5 +6,3 @@
 mkdir -p $OOINSTDIR/ooo-build/patches
 cp -R $TOOLSDIR/bin/* $OOINSTDIR/ooo-build/bin
 cp -R $TOOLSDIR/patches/* $OOINSTDIR/ooo-build/patches
-
-

Added: trunk/bin/piece/install-generic
==============================================================================
--- (empty file)
+++ trunk/bin/piece/install-generic	Thu Jul 10 22:11:58 2008
@@ -0,0 +1,4 @@
+SRCDIR="$SOLARPIECEVERSION/$UPD/$INPATH"
+DEST="$DESTDIR$OO_SOLVERDIR"
+mkdir -p $DEST
+cp -R $SRCDIR/* $DEST

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Thu Jul 10 22:11:58 2008
@@ -14,12 +14,14 @@
 # override / extend ones we need to adapt
 SRC_ROOT=`pwd`
 
-# create a new local solver
-export SOLARVER="$SRC_ROOT/solver/$UPD"
+#  new local solver
+export SOLARPIECEVERSION="$SRC_ROOT/solver"
+export SOLARPIECE="$SOLARPIECEVERSION/$UPD"
+
+# system solver bits ...
+export SOLARVER="$DEV_DIR"
 export SOLARENV="$DEV_DIR/../solenv"
 export MAKEDEPEND="$DEV_DIR/bin/makedepend"
-export SYSTEM_SOLVER="$DEV_DIR"
-
 export SOLARVERSION="$SOLARVER"
 export SOLARENVINC="$SOLARENV/inc"
 export LOCALINI="$SOLARENV/config"
@@ -32,9 +34,12 @@
 export UNOINCLUDES="$DEV_DIR/inc/offuh"
 
 export LD_LIBRARY_PATH=".:$DEV_DIR/lib:$URE_DIR/lib:$INSTALL_DIR:$SOLARENV/$INPATH/lib:$JAVA_HOME/jre/lib/i386:$JAVA_HOME/jre/lib/i386/xawt:$JAVA_HOME/jre/lib/i386/client:$JAVA_HOME/jre/lib/i386/native_threads:../lib:$SOLARVER/$INPATH/lib:/opt/OpenOffice/HEAD/build/lib:/opt/mozilla/lib:"
-export PATH="$DEV_DIR/bin:$URE_DIR/bin:$JAVA_HOME/bin:.:$SOLARVER/$INPATH/bin:$SOLARENV/$OUTPATH/bin:$SOLARENV/bin:$PRESERVE_PATH"
-export SOLARINC=" -I. -I$SOLARVER/$INPATH/inc/stl -I$SOLARVER/$INPATH/inc/external -I$SOLARVER/$INPATH/inc -I$SOLARENV/$OUTPATH/inc -I$DEV_DIR/inc -I$SOLARENV/inc -I$SRC_ROOT/res -I/home/opt/OpenOffice/HEAD/build/dev300-m19/solver/300/unxlngi6.pro/inc/stl -I$SOLARENV/inc/Xp31 -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/native_threads/include -I/usr/include"
-SOLARLIB=" -L../lib -L$SOLARENV/$OUTPATH/lib -L$SOLARVER/$INPATH/lib -L$SOLARENV/$OUTPATH/lib -L$JAVA_HOME/lib -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/native_threads -L/usr/lib -L/usr/lib/xulrunner-1.9"
-SOLARLIB="$SOLARLIB -L$URE_DIR/lib -L$INSTALL_DIR -L$DEV_DIR/lib"
-export SOLARLIB
+export PATH="$SOLARPIECE/bin:$URE_DIR/bin:$JAVA_HOME/bin:.:$SOLARVER/$INPATH/bin:$SOLARENV/$OUTPATH/bin:$SOLARENV/bin:$PRESERVE_PATH"
+SOLARINC=" -I. -I$SOLARVER/$INPATH/inc/stl -I$SOLARVER/$INPATH/inc/external -I$SOLARVER/$INPATH/inc -I$SOLARENV/$OUTPATH/inc -I$DEV_DIR/inc -I$SOLARENV/inc -I$SRC_ROOT/res -I$SOLARENV/inc/Xp31"
+SOLARINC="$SOLARINC -I$SOLARPIECE/$INPATH/inc/stl -I$SOLARPIECE/$INPATH/inc/external -I$SOLARPIECE/$INPATH/inc -I$SOLARPIECE/$OUTPATH/inc"
+SOLARINC="$SOLARINC -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/native_threads/include -I/usr/include"
+SOLARLIB=" -L../lib -L$SOLARENV/$OUTPATH/lib -L$SOLARVER/$INPATH/lib -L$SOLARENV/$OUTPATH/lib"
+SOLARLIB="$SOLARLIB -L$URE_DIR/lib -L$INSTALL_DIR -L$SOLARPIECE/lib"
+SOLARLIB="$SOLARLIB -L$JAVA_HOME/lib -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/native_threads -L/usr/lib -L/usr/lib/xulrunner-1.9"
+export SOLARLIB SOLARINC
 

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Thu Jul 10 22:11:58 2008
@@ -220,12 +220,6 @@
 		+ can we create a set of scripts: one per piece,
 		  and just run them in sequence ?
 
-
-** FIXME:
-	+ move 'scp2' and 'instsetoo_native' from 'bootstrap'
-	  -> postprocess ...
-
-
 ** FIXME:
 	+ just install the whole solver into /usr/lib/... ?
 		+ use that as the -devel RPM ?
@@ -233,19 +227,103 @@
 			+ remove duplicates (somehow)
 			+ install earlier ?
 
-Hunk #1 succeeded at 31 (offset -4 lines).
-patching file cli_ure/prj/build.lst
-Hunk #1 FAILED at 2.
-1 out of 1 hunk FAILED -- saving rejects to file cli_ure/prj/build.lst.rej
-patching file cli_ure/prj/d.lst
-
-FIXME:
-	+ rename each piece into it's own directory:
-		+ dev300-m22-ure [etc.]
-		+ so RPMs can build happily together in parallel on the same host.
-
-+ bootstrap
-+ ure
-+ libs-extern
-+ libs-core
+TODO:
+	+ make 'build.pl' efficient
+		+ create a pseudo-module (somehow)
+		+ work with that.
+		+ make it deliver as it goes (?)
+	+ symlink solver/lib -> /usr/lib/ooo-3/program
+		+ [ how do we do the multi-layer-ness ? ]
+			[ different symlink for the ure build ? ]
+		+ ensure the real RPMs actually have -something-
+		  in them :-)
+
+
+Build order:
+	+ bootstrap
+	+ ure | libs-extern
+	+ artwork
+	+ libs-gui
+
+
+build.pl:
+	+ from 'BuildAll' ? - goodness starts (?)
+		=> GetParentDeps () ...
+		=> $build_all_cont ... [!]
+
+	+ PickPrjToBuild ...
+		-> FindIdepPrj
+	+ all comes from the build hash ...
+	+ build_multiprocessing
+
+
+VCL bits:
+
+Making: ../../unxlngi6.pro/bin/vclzh-CN.res
+Making: ../../unxlngi6.pro/bin/vclzh-TW.res
+Making: ../../unxlngi6.pro/bin/vclzu.res
+using rsc multi-res feature
+rsc -presponse @/tmp/mkMnJcdx > /dev/null
+
+f268: Error: The image(s) <check checkwin checkos2 checkmac checkunx
+checkmono radio radiowin radioos2 radiomac radiounx radiomono msgbox
+pin splhpin splvpin splharw splvarw scrmsk scrbmp closedoc closedochc
+mainapp_48_8 mainapp_48_8 odt_48_8 ott_48_8 ods_48_8 ots_48_8 odg_48_8
+otg_48_8 odp_48_8 otp_48_8 odp_48_8 odm_48_8 oth_48_8 mainapp_48_8
+odb_48_8 odf_48_8 mainapp_48_8 mainapp_48_8 printeradmin_48_8
+mainapp_32_8 mainapp_32_8 odt_32_8 ott_32_8 ods_32_8 ots_32_8 odg_32_8
+otg_32_8 odp_32_8 otp_32_8 odp_32_8 odm_32_8 oth_32_8 mainapp_32_8
+odb_32_8 odf_32_8 mainapp_32_8 mainapp_32_8 printeradmin_32_8
+mainapp_16_8 mainapp_16_8 odt_16_8 ott_16_8 ods_16_8 ots_16_8 odg_16_8
+otg_16_8 odp_16_8 otp_16_8 odp_16_8 odm_16_8 oth_16_8 mainapp_16_8
+odb_16_8 odf_16_8 mainapp_16_8 mainapp_16_8 printeradmin_16_8
+mainapp_32 mainapp_32 lx03251 lx03255 lx03250 lx03254 lx03246 lx03252
+lx03249 lx03253 lx03241 lx03248 lx03139 lx03128 lx03245 lx03247
+lx03242 lx03216 printeradmin_32 mainapp_16 mainapp_16 sx03251 sx03255
+sx03250 sx03254 sx03246 sx03252 sx03249 sx03253 sx03241 sx03248
+sx03139 sx03128 sx03245 sx03247 sx03242 sx03216 printeradmin_16
+mainapp_32_h mainapp_32_h lxh03251 lxh03255 lxh03250 lxh03254 lxh03246
+lxh03252 lxh03249 lxh03253 lxh03241 lxh03248 lxh03139 lxh03128
+lxh03245 lxh03247 lxh03242 lxh03216 printeradmin_32_h mainapp_16_h
+mainapp_16_h sxh03251 sxh03255 sxh03250 sxh03254 sxh03246 sxh03252
+sxh03249 sxh03253 sxh03241 sxh03248 sxh03139 sxh03128 sxh03245
+sxh03247 sxh03242 sxh03216 printeradmin_16_h> could not be found.
+
+Terminating compiler
+dmake:  Error code 1, while making '../../unxlngi6.pro/misc/rsc_vcl'
+
+ERROR: Error 65280 occurred while making /home/usr/src/packages/BUILD/dev300-m21-libs_gui/vcl/source/src
+
+
+/bin/ls | tr '\n' ':'
+
+
+[ PYUNO -> depends on 'tools' !? ...
+  testshl2 -> from 'sal' ;-) ]
+	+ hmm ...
+
+  
+SOLARBINDIR - check for it in bootstrap/URE etc. & re-vector it from the bottom up ?
+
+Questions:
+	+ should we try a different approach
+	+ "solver" is the system 'solver'
+		+ deliver [ etc. ] tweak it ...
+		+ 
+
+    my $build_sosl    = $ENV{'BUILD_SOSL'};
+    my $common_outdir = $ENV{'COMMON_OUTDIR'};
+    my $inpath        = $ENV{'INPATH'};
+    my $solarversion  = $ENV{'SOLARVERSION'};
+    my $updater       = $ENV{'UPDATER'};
+    my $updminor      = $ENV{'UPDMINOR'};
+    my $work_stamp    = $ENV{'WORK_STAMP'};
+
+install to 'SOLARVERSION' ?
+
+
+* deliver is the only thing that copies output anywhere;
+	=> we need to fool deliver.
+	=> we need to ensure that our compile flags [etc.]
+	   include the local intermediate / non-solver.
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul 10 22:11:58 2008
@@ -2447,8 +2447,11 @@
 SectionOwner => michael
 # Experimental piece-wise source code split for build
 piece-build.diff
+piece-deliver.diff
 piece-checkdll.diff
 piece-target.diff
+piece-solarbindir.diff
+piece-rsc.diff
 
 
 [ Win32Only ]

Modified: trunk/patches/dev300/piece-build.diff
==============================================================================
--- trunk/patches/dev300/piece-build.diff	(original)
+++ trunk/patches/dev300/piece-build.diff	Thu Jul 10 22:11:58 2008
@@ -1,8 +1,54 @@
 --- solenv/bin/build.pl
 +++ solenv/bin/build.pl
-@@ -2158,21 +2189,28 @@
+@@ -134,6 +134,7 @@
+     $only_dependent = 0;
+     $build_from = '';
+     $build_all_cont = '';
++    $build_all_dirs = '';
+     $build_since = '';
+     $dlv_switch = '';
+     $child = 0;
+@@ -399,7 +405,14 @@
+ sub BuildAll {
+     if ($BuildAllParents) {
+         my ($Prj, $PrjDir, $orig_prj);
+-        GetParentDeps( $CurrentPrj, \%global_deps_hash);
++	if ($build_all_dirs) {
++	    print "Using crazy new --subdirs build for '$build_all_dirs'\n";
++	    for my $d (split ':', $build_all_dirs) {
++		GetParentDeps( $d, \%global_deps_hash);
++	    }
++	} else {
++		GetParentDeps( $CurrentPrj, \%global_deps_hash);
++	}
+         modules_classify(keys %global_deps_hash);
+         store_weights(\%global_deps_hash);
+         prepare_build_from(\%global_deps_hash) if ($build_from);
+@@ -893,6 +928,9 @@
+     };
+     my $StandDir;
+     $StandDir = getcwd();
++    if ($build_all_dirs) {
++	return "$StandDir/";
++    }
+     my $previous_dir = '';
+     do {
+         foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
+@@ -1236,6 +1275,8 @@
+                                 and $build_all_cont = $1            and next;
+         $arg =~ /^-a:(\S+)$/ and $BuildAllParents = 1
+                                 and $build_all_cont = $1            and next;
++        $arg =~ /^--subdirs:(.+)$/ and $BuildAllParents = 1
++                                and $build_all_dirs = $1            and next;
+         if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
+                                     $BuildAllParents = 1;
+                                     get_incomp_projects();
+@@ -2158,23 +2204,30 @@
+ sub retrieve_build_list {
+     my $module = shift;
      my $old_fh = select(STDOUT);
-    
+-    
++
      # First try to get global depencies from solver's build.lst if such exists
 +    my @search_dirs;
      my $solver_inc_dir = "$ENV{SOLARVER}/common";
@@ -12,12 +58,6 @@
      $solver_inc_dir .= "/$module";
 -    $solver_inc_dir = CorrectPath($solver_inc_dir);
      $dead_parents{$module}++;
-+    push @search_dirs, CorrectPath($solver_inc_dir);
-+    if (defined $ENV{SYSTEM_SOLVER}) {
-+	push (@search_dirs, CorrectPath($ENV{SYSTEM_SOLVER}."/inc/$module"));
-+    }
-+
-+    print "Fetching dependencies for module $module from solvers @search_dirs...\n";
 -    print "Fetching dependencies for module $module from solver...";
 -    foreach (@possible_build_lists) {
 -        my $possible_build_lst = "$solver_inc_dir/$_";
@@ -26,6 +66,12 @@
 -            select($old_fh);
 -            return $possible_build_lst;
 -        };
++    push @search_dirs, CorrectPath($solver_inc_dir);
++    if (defined $ENV{SOLARPIECEVERSION}) {
++	push (@search_dirs, CorrectPath($ENV{SOLARPIECEVERSION}."/inc/$module"));
++    }
++
++    print "Fetching dependencies for module $module from solvers @search_dirs...\n";
 +    foreach my $dir (@search_dirs) {
 +	foreach (@possible_build_lists) {
 +	    my $possible_build_lst = "$dir/$_";

Added: trunk/patches/dev300/piece-rsc.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-rsc.diff	Thu Jul 10 22:11:58 2008
@@ -0,0 +1,15 @@
+--- rsc/source/rsc/rsc.cxx
++++ rsc/source/rsc/rsc.cxx
+@@ -1378,7 +1378,11 @@
+ 			aImagesStr += aMissingImages[ i ];
+ 		}
+ 	
+-		pTC->pEH->FatalError( ERR_NOIMAGE, RscId(), aImagesStr.GetBuffer() );
++		// FIXME: we still would like some assertions here ...
++		pTC->pEH->StdErr( "Warning - tolerating missing images: " );
++		pTC->pEH->StdErr( aImagesStr.GetBuffer() );
++		pTC->pEH->StdErr( "\n" );
++//		pTC->pEH->FatalError( ERR_NOIMAGE, RscId(), aImagesStr.GetBuffer() );
+ 	}
+ 	
+ 	if( pSysListFile )

Added: trunk/patches/dev300/piece-solarbindir.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-solarbindir.diff	Thu Jul 10 22:11:58 2008
@@ -0,0 +1,10 @@
+--- i18npool/source/localedata/data/makefile.mk
++++ i18npool/source/localedata/data/makefile.mk
+@@ -487,6 +487,6 @@
+ $(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST)
+ 
+ $(MISC)$/localedata_%.cxx : %.xml
+-    $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
++    $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SYSSOLARBINDIR)$/types.rdb
+     $(RM) $(BIN)$/$(@:b).rdb
+ 

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Thu Jul 10 22:11:58 2008
@@ -3,8 +3,8 @@
 RCS file: /cvs/tools/solenv/inc/target.mk,v
 retrieving revision 1.209
 diff -u -p -r1.209 target.mk
---- target.mk	6 Jun 2008 12:00:28 -0000	1.209
-+++ target.mk	4 Jul 2008 15:25:03 -0000
+--- solenv/inc/target.mk	6 Jun 2008 12:00:28 -0000	1.209
++++ solenv/inc/target.mk	4 Jul 2008 15:25:03 -0000
 @@ -48,7 +48,7 @@ INCPOST*=.
  ENVINCPRE+=-I$(PRE)$/inc
  .ENDIF			# "$(PRE)"!=""

Modified: trunk/scratch/rcsutil/parse_rcs.py
==============================================================================
--- trunk/scratch/rcsutil/parse_rcs.py	(original)
+++ trunk/scratch/rcsutil/parse_rcs.py	Thu Jul 10 22:11:58 2008
@@ -35,9 +35,16 @@
 
 # ignore large auto-generated files that people like to regularly
 # check into CVS for unknown reasons.
-autogenFiles = [
-    'sw/writerfilter/source/ooxml/OOXMLresources.cxx,v'
-    'sw/writerfilter/source/ooxml/OOXMLresources.hxx,v'
+autogenFileRegex = [
+    'sw/writerfilter/source/ooxml/gperf.*\.hxx',
+    'sw/writerfilter/source/ooxml/OOXMLtokens\.hxx',
+    'sw/writerfilter/source/doctok/qnametostr\.cxx',
+    'sw/writerfilter/source/doctok/resources\.[ch]xx',
+    'sw/writerfilter/source/ooxml/OOXMLvalues\.[ch]xx',
+    'sw/writerfilter/source/resourcemodel/.*tostr\.cxx',
+    'sw/writerfilter/source/ooxml/OOXMLFastTokens\.hxx',
+    'sw/writerfilter/source/ooxml/OOXMLresources.*\.?xx',
+    'sw/writerfilter/source/ooxml/OOXMLfastresources.*\.?xx'
 ]
 
 currentAffiliations = {
@@ -935,8 +942,8 @@
                 sys.stdout.write("Skipping a non-RCS file: %s\n"%filepath)
             return True
 
-        for autog in autogenFiles:
-            if filepath.endswith (autog):
+        for autogp in autogenFileRegex:
+            if re.search (autogp, filepath) != None:
                 if self.verbose:
                     sys.stdout.write("Skipping auto-generated file: %s\n"%filepath)
                 return True

Modified: trunk/scratch/split/ooo3_libs_extern.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_extern.spec	(original)
+++ trunk/scratch/split/ooo3_libs_extern.spec	Thu Jul 10 22:11:58 2008
@@ -52,7 +52,7 @@
 
 $OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/build-%piece
+$OO_TOOLSDIR/piece/build-generic
 
 %install
 
@@ -63,7 +63,7 @@
 export DESTDIR=$RPM_BUILD_ROOT
 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-%piece
+$OO_TOOLSDIR/piece/install-generic
 
 %clean
 %post

Modified: trunk/scratch/split/ooo3_libs_gui.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_gui.spec	(original)
+++ trunk/scratch/split/ooo3_libs_gui.spec	Thu Jul 10 22:11:58 2008
@@ -52,6 +52,8 @@
 
 $OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
 source $OO_TOOLSDIR/piece/sys-setup
+
+export VERBOSE=1
 $OO_TOOLSDIR/piece/build-%piece
 
 %install

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Thu Jul 10 22:11:58 2008
@@ -52,7 +52,7 @@
 
 $OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/build-%piece
+$OO_TOOLSDIR/piece/build-generic
 
 %install
 
@@ -63,7 +63,7 @@
 export DESTDIR=$RPM_BUILD_ROOT
 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-%piece
+$OO_TOOLSDIR/piece/install-generic
 
 %clean
 %post
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]