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

[michael svn gnome org]

Author: michael
Date: Thu Jul 17 09:34:18 2008
New Revision: 13264
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13264&view=rev

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

        * patches/dev300/piece-ridljar.diff,
        * patches/dev300/piece-offapi.diff,
        * patches/dev300/piece-offuh.diff,
        * patches/dev300/apply: fix up ure for new build scheme.



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

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Thu Jul 17 09:34:18 2008
@@ -42,12 +42,12 @@
 export DMAKEROOT="$SOLARENVINC/startup"
 export UNOINCLUDES="$DEV_DIR/inc/offuh"
 
-export LD_LIBRARY_PATH=".:$DEV_DIR/lib:$URE_DIR/lib:$INSTALL_DIR:$SOLARPIECE/$INPATH/lib:$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="$SOLARPIECE/$INPATH/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"
+export LD_LIBRARY_PATH=".:$DEV_DIR/lib:$URE_DIR/lib:$INSTALL_DIR:$SOLARPIECE/$INPATH/lib:$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/lib:/opt/OpenOffice/HEAD/build/lib:/opt/mozilla/lib:"
+export PATH="$SOLARPIECE/$INPATH/bin:$URE_DIR/bin:$JAVA_HOME/bin:.:$SOLARVER/bin:$SOLARENV/$OUTPATH/bin:$SOLARENV/bin:$PRESERVE_PATH"
+SOLARINC=" -I. -I$SOLARVER/inc/stl -I$SOLARVER/inc/external -I$SOLARVER/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=" -L../lib -L$SOLARENV/$OUTPATH/lib -L$SOLARVER/lib -L$SOLARENV/$OUTPATH/lib"
 SOLARLIB="$SOLARLIB -L$URE_DIR/lib -L$INSTALL_DIR -L$SOLARPIECE/$INPATH/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/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul 17 09:34:18 2008
@@ -2583,6 +2583,9 @@
 piece-helpcontent2.diff
 piece-sdext.diff
 piece-writerfilter.diff
+piece-ridljar.diff
+piece-offapi.diff
+piece-offuh.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-offapi.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-offapi.diff	Thu Jul 17 09:34:18 2008
@@ -0,0 +1,23 @@
+--- /tmp/makefile.mk	2008-07-17 10:24:20.000000000 +0100
++++ /usr/src/packages/BUILD/dev300-m21-ure/offapi/util/makefile.mk	2008-07-17 10:25:46.000000000 +0100
+@@ -158,15 +158,16 @@
+        $(REGISTRYCHECKFLAG) \
+        $(UNOTYPE_STATISTICS)
+ 
+-$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
++UDKRDB=$(SOLARPIECE)$/$(INPATH)$/bin
++$(UCR)$/types.db : $(UCR)$/offapi.db $(UDKRDB)$/udkapi.rdb
+ 	-$(RM) $(REGISTRYCHECKFLAG)
+ 	$(GNUCOPY) -f $(UCR)$/offapi.db $@
+-	$(REGMERGE) $(REGMERGEFLAGS) $@ / $(SOLARBINDIR)$/udkapi.rdb
++	$(REGMERGE) $(REGMERGEFLAGS) $@ / $(UDKRDB)$/udkapi.rdb
+ 
+-$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
++$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(UDKRDB)$/udkapi_doc.rdb
+ 	-$(RM) $(REGISTRYCHECKFLAG)
+ 	$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
+-	$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
++	$(REGMERGE) $@ / $(UDKRDB)$/udkapi_doc.rdb
+ 
+ #JSC: The type library has changed, all temporary not checked types are removed
+ #     and will be check from now on.

Added: trunk/patches/dev300/piece-offuh.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-offuh.diff	Thu Jul 17 09:34:18 2008
@@ -0,0 +1,10 @@
+--- /tmp/makefile.mk	2008-07-17 10:16:39.000000000 +0100
++++ /usr/src/packages/BUILD/dev300-m21-ure/offuh/source/makefile.mk	2008-07-17 10:29:04.000000000 +0100
+@@ -39,6 +39,7 @@
+ 
+ # ------------------------------------------------------------------
+ 
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb
+ $(MISC)$/$(TARGET).don : $(UNOUCRRDB)
+ 	@@-$(RM) $@
+ 	$(CPPUMAKER) -E$(UNOUCROUT)/linking_catch.hxx -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@

Added: trunk/patches/dev300/piece-ridljar.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-ridljar.diff	Thu Jul 17 09:34:18 2008
@@ -0,0 +1,11 @@
+--- ridljar/javamaker/makefile.mk
++++ ridljar/javamaker/makefile.mk
+@@ -35,7 +35,7 @@
+ 
+ .INCLUDE: settings.mk
+ 
+-RDB = $(SOLARBINDIR)$/udkapi.rdb
++RDB = $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
+ 
+ .INCLUDE: target.mk
+ 

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Thu Jul 17 09:34:18 2008
@@ -34,3 +34,17 @@
  STDOBJGUI=
  STDSLOGUI=
  STDOBJCUI=
+
+--- solenv/inc/settings.mk
++++ solenv/inc/settings.mk
+@@ -1088,10 +1082,6 @@
+ LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS)
+ LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON
+ 
+-.IF "$(ENABLE_GSTREAMER)" == "TRUE"
+-CDEFS+=-DGSTREAMER
+-.ENDIF
+-
+ # compose flags and defines for GUI
+ .IF "$(TARGETTYPE)"=="GUI"
+ CDEFS+= $(CDEFSGUI)