Make Measurements build with openoffice.org-sdk-3.0.0-9.10.fc10.i386 .

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index cba727b..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Sun Sep 09 03:08:20 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/Makefile b/Makefile
index 78a8851..28e2824 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 NAME:=measurements
 empty:=
-OO:=/usr/lib/openoffice.org
+# $(OO) is now taken from shell-setup.
 
 IDL_TYPES:=net/mattmccutchen/measurements/XMeasurementsAddIn
 
@@ -23,7 +23,7 @@ bin-types: pkg/$(NAME).uno.rdb
        rm -rf $@
        mkdir -p $(addprefix $@/,$(dir $(IDL_TYPES)))
 # javamaker is temperamental and demands the ./
-       javamaker -BUCR -nD -T$(subst /,.,$(subst $(empty) ,;,$(IDL_TYPES))) -O./$@ $(OO)/program/types.rdb $<
+       javamaker -BUCR -nD -T$(subst /,.,$(subst $(empty) ,;,$(IDL_TYPES))) -O./$@ $(OO)/ure-link/share/misc/types.rdb $<
 
 # We collect both types and implementation into this jar.
 # It seems that the manifest has to be first, so handle it specially.

diff --git a/ooo-api/.classpath b/ooo-api/.classpath
index 9e10b5c..0243d39 100644 (file)
--- a/ooo-api/.classpath
+++ b/ooo-api/.classpath
@@ -1,149 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/agenda.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/classes.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/commonwizards.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/fax.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/form.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/java_uno.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/js.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/juh.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/java/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/jurt.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/jut.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/letter.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/officebean.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/query.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/report.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/ridl.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/ScriptFramework.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/ScriptProviderForBeanShell.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/ScriptProviderForJava.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/ScriptProviderForJavaScript.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/sdbc_hsqldb.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/table.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/unoil.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/unoloader.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/java/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/web.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/writer2latex.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/xmerge.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/XMergeBridge.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/XSLTFilter.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/program/classes/XSLTValidate.jar">
-               <attributes>
-                       <attribute name="javadoc_location" value="file:/usr/lib/openoffice.org/sdk/docs/common/ref/"/>
-               </attributes>
-       </classpathentry>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/ure-link/share/java/java_uno.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/ure-link/share/java/juh.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/ure-link/share/java/jurt.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/ure-link/share/java/ridl.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/ure-link/share/java/unoloader.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/agenda.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/classes.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/commonwizards.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/fax.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/form.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/jut.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/letter.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/LuceneHelpWrapper.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/officebean.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/query.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/report.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/ScriptFramework.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/ScriptProviderForJava.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/table.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/unoil.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/web.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/xmerge.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/XMergeBridge.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/XSLTFilter.jar"/>
+       <classpathentry exported="true" kind="lib" path="/usr/lib/openoffice.org/basis3.0/program/classes/XSLTValidate.jar"/>
        <classpathentry kind="output" path=""/>
 </classpath>

diff --git a/shell-setup b/shell-setup
index 5234a53..357a4f1 100644 (file)
--- a/shell-setup
+++ b/shell-setup
@@ -1,4 +1,5 @@
 # No shebang; it makes no sense to execute this standalone.
 
-export PATH=/usr/lib/openoffice.org/sdk/linux/bin:$PATH
-export LD_LIBRARY_PATH=/usr/lib/openoffice.org/program
+export OO=/usr/lib/openoffice.org/basis3.0
+export PATH=$OO/sdk/bin:$PATH
+export LD_LIBRARY_PATH=$OO/ure-link/lib