[ooo-build-commit] extensions/ooo2gd

[René Engelhard]

 extensions/ooo2gd/build.xml |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 562983ca554f18e7eba02d12cf78dc3f860c5125
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jan 11 19:36:07 2010 +0100

    fix paths ooo2gds build.xml
    
    * extensions/ooo2gd/build.xml: don't assume not-fixed details of directory layout. use the SDK

diff --git a/extensions/ooo2gd/build.xml b/extensions/ooo2gd/build.xml
index 3019f05..e129566 100644
--- a/extensions/ooo2gd/build.xml
+++ b/extensions/ooo2gd/build.xml
@@ -11,8 +11,8 @@
     <property name="version" value="2.1.0"/>
 
     <property name="ooodir" value="/usr/lib/ooo3"/>
-    <property name="basisdir" value="${ooodir}/basis3.1"/>
-    <property name="clsdir" value="${ooodir}/ure/share/java"/>
+    <property name="basisdir" value="${ooodir}/basis-link"/>
+    <property name="clsdir" value="${ooodir}/basis-link/ure-link/share/java"/>
     <!-- Can we generate this from a list of file names? -->
     <property name="external_jars" value="libs/activation.jar:libs/gdata-client-1.0.jar:libs/gdata-client-meta-1.0.jar:libs/gdata-core-1.0.jar:libs/gdata-docs-2.0.jar:libs/gdata-media-1.0.jar:libs/gdata-spreadsheet-3.0.jar:libs/gdata-spreadsheet-meta-3.0.jar:libs/google-collect-1.0-rc1.jar:libs/mail-1.4.jar"/>
     <property name="ooo_jars" value="${clsdir}/jurt.jar:${clsdir}/juh.jar:${clsdir}/sandbox.jar:${clsdir}/unoil.jar:${clsdir}/ridl.jar"/>
@@ -21,11 +21,11 @@
     <property name="extjarname" value="GDocs.jar"/>
     <property name="packname" value="gdocs_${version}.oxt"/>
 
-    <property name="idlc" value="${ooodir}/solver/bin/idlc"/>
-    <property name="javamaker" value="${ooodir}/solver/bin/javamaker"/>
-    <property name="types.rdb" value="${ooodir}/solver/bin/types.rdb"/>
-    <property name="regmerge" value="${ooodir}/ure/bin/regmerge"/>
-    <property name="libpath" value="/usr/lib/ooo3/ure/lib:"/>
+    <property name="idlc" value="${ooodir}/basis-link/sdk/bin/idlc"/>
+    <property name="javamaker" value="${ooodir}/basis-link/sdk/bin/javamaker"/>
+    <property name="types.rdb" value="${ooodir}/basis-link/ure-link/misc/types.rdb"/>
+    <property name="regmerge" value="${ooodir}/basis-link/ure-link/bin/regmerge"/>
+    <property name="libpath" value="${ooodir}/basis-link/ure-link/lib:"/>
 
     <target name="com">
         <exec executable="${javamaker}">