ooo-build r13372 - in trunk: . doc patches/dev300

[michael svn gnome org]

Author: michael
Date: Wed Jul 23 19:50:47 2008
New Revision: 13372
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13372&view=rev

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

        * patches/dev300/piece-ant.diff,
        * patches/dev300/apply: fix some ant classpath issues.



Added:
   trunk/patches/dev300/piece-ant.diff
Modified:
   trunk/ChangeLog
   trunk/doc/split.txt
   trunk/patches/dev300/apply

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Wed Jul 23 19:50:47 2008
@@ -309,3 +309,4 @@
 make_installer.pl [!] ... can't mangle include path ...
 	+ need a different include path for certain control files [!?]
 
+

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul 23 19:50:47 2008
@@ -2709,6 +2709,7 @@
 piece-remotebridges.diff
 piece-scp2.diff
 piece-solenv.diff
+piece-ant.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-ant.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-ant.diff	Wed Jul 23 19:50:47 2008
@@ -0,0 +1,48 @@
+--- solenv/inc/antsettings.mk	2008-07-23 20:38:00.000000000 +0100
++++ solenv/inc/antsettings.mk	2008-07-23 20:38:00.000000000 +0100
+@@ -82,6 +82,7 @@
+  -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
+  -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+  -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
++ -Dsplit.install=$(SPLITINSTALLDIR) -Dsplit.dev=$(SPLITDEVDIR) -Dsplit.ure=$(SPLITUREDIR) \
+  -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+ 
+ .ELSE # No java
+
+diff -u -r /opt/OpenOffice/dev300-m25/scripting/examples/java/build.xml /usr/src/packages/BUILD/dev300-m25-libs_core/scripting//examples/java/build.xml
+--- scripting/examples/java/build.xml	2008-07-21 16:59:39.000000000 +0100
++++ scripting/examples/java/build.xml	2008-07-23 20:43:42.000000000 +0100
+@@ -42,6 +42,10 @@
+     <pathelement location="${solar.jar}/juh.jar"/>
+     <pathelement location="${solar.jar}/ridl.jar"/>
+     <pathelement location="${out}/class/ScriptFramework.jar"/>
++    <pathelement location="${split.install}/classes/unoil.jar"/>
++    <pathelement location="${split.ure}/share/java/jurt.jar"/>
++    <pathelement location="${split.ure}/share/java/juh.jar"/>
++    <pathelement location="${split.ure}/share/java/ridl.jar"/>
+   </path> 
+ 
+   <!-- ===================== HelloWorld example =========================== -->
+
+
+diff -u -r /opt/OpenOffice/dev300-m25/scripting/java/build.xml /usr/src/packages/BUILD/dev300-m25-libs_core/scripting//java/build.xml
+--- scripting/java/build.xml	2008-07-21 16:59:39.000000000 +0100
++++ scripting/java/build.xml	2008-07-23 20:42:47.000000000 +0100
+@@ -60,6 +60,16 @@
+     <pathelement location="${env.BSH_JAR}"/>
+     <pathelement location="${solar.jar}/js.jar"/>
+     <pathelement location="${jardir}"/>
++    <pathelement location="${split.ure}/share/java/jurt.jar"/>
++    <pathelement location="${split.install}/classes/unoil.jar"/>
++    <pathelement location="${split.install}/classes/jut.jar"/>
++    <pathelement location="${split.ure}/share/java/juh.jar"/>
++    <pathelement location="${split.ure}/share/java/java_uno.jar"/>
++    <pathelement location="${split.ure}/share/java/ridl.jar"/>
++    <pathelement location="${split.install}/classes/js.jar"/>
++    <pathelement location="${split.install}/classes/bsh.jar"/>
++    <pathelement location="${split.install}/classes"/>
++    <pathelement location="${split.ure}/share/java"/>
+   </path> 
+ 
+   <path id="idesupport.class.path">
+