ooo-build r13069 - in trunk: . bin/piece patches/dev300

[michael svn gnome org]

Author: michael
Date: Fri Jul  4 15:30:39 2008
New Revision: 13069
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13069&view=rev

Log:
i2008-07-04  Michael Meeks  <michael meeks novell com>

        * patches/dev300/piece-target.diff,
        * bin/piece/sys-setup: clobber UNOINCLUDES



Added:
   trunk/patches/dev300/piece-target.diff
Modified:
   trunk/ChangeLog
   trunk/bin/piece/sys-setup
   trunk/patches/dev300/apply

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Fri Jul  4 15:30:39 2008
@@ -29,10 +29,11 @@
 export STAR_SSCOMMON="$SOLARENV/config/ssolar.cmn"
 export STAR_SSOLARINI="$SOLARENV/config/ssolar.ini"
 export DMAKEROOT="$SOLARENVINC/startup"
+export UNOINCLUDES="$DEV_DIR/inc/offuh"
 
-export LD_LIBRARY_PATH=".:$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 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$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"
+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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul  4 15:30:39 2008
@@ -2365,5 +2365,8 @@
 
 
 [ PieceBits ]
+SectionOwner => michael
+# Experimental piece-wise source code split for build
 piece-build.diff
 piece-checkdll.diff
+piece-target.diff

Added: trunk/patches/dev300/piece-target.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-target.diff	Fri Jul  4 15:30:39 2008
@@ -0,0 +1,16 @@
+Index: target.mk
+===================================================================
+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
+@@ -48,7 +48,7 @@ INCPOST*=.
+ ENVINCPRE+=-I$(PRE)$/inc
+ .ENDIF			# "$(PRE)"!=""
+ .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
+-UNOINCLUDES=$(SOLARINCDIR)$/offuh
++UNOINCLUDES*=$(SOLARINCDIR)$/offuh
+ .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
+ SOLARINC+=$(JDKINCS)
+ # make sure INCLUDE isn't set