ooo-build r13384 - in trunk: . patches/dev300

[michael svn gnome org]

Author: michael
Date: Fri Jul 25 01:54:28 2008
New Revision: 13384
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13384&view=rev

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

        * patches/dev300/piece-setup_native.diff,
        * patches/dev300/piece-extensions.diff,
        * patches/dev300/apply: fix xcs path for xcufiles.
        * patches/dev300/piece-forms.diff: fix oovbaapi.rdb path.



Added:
   trunk/patches/dev300/piece-extensions.diff
   trunk/patches/dev300/piece-forms.diff
   trunk/patches/dev300/piece-setup_native.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul 25 01:54:28 2008
@@ -2712,6 +2712,9 @@
 piece-scp2.diff
 piece-solenv.diff
 piece-ant.diff
+piece-extensions.diff
+piece-setup_native.diff
+piece-forms.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-extensions.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-extensions.diff	Fri Jul 25 01:54:28 2008
@@ -0,0 +1,16 @@
+--- extensions/source/update/check/makefile.mk
++++ extensions/source/update/check/makefile.mk
+@@ -37,10 +37,10 @@
+ LIBTARGET=NO
+ ENABLE_EXCEPTIONS=TRUE
+ 
+-ABSXCSROOT=$(SOLARXMLDIR)
++ABSXCSROOT=$(SPLITINSTALLDIR)$/..$/share
+ XCSROOT=..
+-DTDDIR=$(ABSXCSROOT)
+-XSLDIR=$(ABSXCSROOT)$/processing
++DTDDIR=$(SOLARXMLDIR)
++XSLDIR=$(SOLARXMLDIR)$/processing
+ PROCESSOUT=$(MISC)$/$(TARGET)
+ PROCESSORDIR=$(SOLARBINDIR)
+ 

Added: trunk/patches/dev300/piece-forms.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-forms.diff	Fri Jul 25 01:54:28 2008
@@ -0,0 +1,12 @@
+--- forms/source/misc/makefile.mk	2008-07-21 16:59:48.000000000 +0100
++++ forms/source/misc/makefile.mk	2008-07-25 02:42:27.000000000 +0100
+@@ -67,7 +67,7 @@
+ 
+ $(SLOFILES) : $(MISC)$/$(TARGET).don
+ 
+-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++$(MISC)$/$(TARGET).don : $(SPLITINSTALLDIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SPLITINSTALLDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+         echo $@
+ 

Added: trunk/patches/dev300/piece-setup_native.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-setup_native.diff	Fri Jul 25 01:54:28 2008
@@ -0,0 +1,16 @@
+--- setup_native/registry/data/org/openoffice/Office//makefile.mk	2008-07-25 02:38:34.000000000 +0100
++++ setup_native/registry/data/org/openoffice/Office//makefile.mk	2008-07-25 02:38:34.000000000 +0100
+@@ -34,10 +34,10 @@
+ TARGET=data_stclient
+ PACKAGE=org.openoffice.Office
+ 
+-ABSXCSROOT=$(SOLARXMLDIR)
++ABSXCSROOT=$(SPLITINSTALLDIR)$/..$/share
+ XCSROOT=..
+-DTDDIR=$(ABSXCSROOT)
+-XSLDIR=$(ABSXCSROOT)$/processing
++DTDDIR=$(SOLARXMLDIR)
++XSLDIR=$(SOLARXMLDIR)$/processing
+ PROCESSOUT=$(MISC)$/$(TARGET)
+ PROCESSORDIR=$(SOLARBINDIR)
+