diff options
Diffstat (limited to 'ure')
-rw-r--r-- | ure/source/README | 18 | ||||
-rw-r--r-- | ure/source/uretest/Makefile.pln | 10 |
2 files changed, 15 insertions, 13 deletions
diff --git a/ure/source/README b/ure/source/README index 27a2b6b994ce..aad11505e971 100644 --- a/ure/source/README +++ b/ure/source/README @@ -36,6 +36,7 @@ ELF platforms (Linux, Solaris, *BSD): /opt/libreoffice/ure/share/java/unoloader.jar /opt/libreoffice/ure/share/java/juh.jar /opt/libreoffice/ure/share/java/jurt.jar +/opt/libreoffice/ure/share/java/libreoffice.jar /opt/libreoffice/ure/share/java/ridl.jar /opt/libreoffice/ure/share/misc/types.rdb /opt/libreoffice/ure/share/misc/services.rdb @@ -93,6 +94,7 @@ Program Files\URE\bin\purpenvhelper3MSC.dll Program Files\URE\bin\sal3.dll Program Files\URE\bin\salhelper3MSC.dll Program Files\URE\java\unoloader.jar +Program Files\URE\java\libreoffice.jar Program Files\URE\java\juh.jar Program Files\URE\java\jurt.jar Program Files\URE\java\ridl.jar @@ -159,8 +161,8 @@ Files marked as [private] are private to the URE installation. To avoid stability issues, applications that use the URE should not access the functionality of these files. -Files marked as [GAC] are installed in the Global Assembly Cache on Windows. The -file path reflects the path as seen in the Explorer with the Assembly +Files marked as [GAC] are installed in the Global Assembly Cache on Windows. The +file path reflects the path as seen in the Explorer with the Assembly Cache Viewer Tool (Shfusion.dll) installed. The actual paths are different. @@ -186,12 +188,12 @@ functionality that these libraries offer, see the "C++ Reference" section of the SDK HTML documentation. The corresponding C++ header files are not in the URE, but rather in the SDK. -- unoloader.jar, juh.jar, and ridl.jar are the public Java UNO runtime -Java[tm] Archives (JARs) that client code can call (jurt.jar is still provided -for backwards compatibility, but is basically empty and has been merged into -ridl.jar). For details on the -functionality that these files offer, see the "Java UNO Runtime Reference" -section of the SDK HTML documentation. +- libreoffice.jar and unoloader.jar are the public Java UNO runtime +Java[tm] Archives (JARs) that client code can call. +juh.jar, jurt.jar, ridl.jar, unoil.jar are still provided for backwards compatibility, +but are basically empty and have been merged into libreoffice.jar. +For details on the functionality that these files offer, see the +"Java UNO Runtime Reference" section of the SDK HTML documentation. - types.rdb and services.rdb are preconfigured UNO type and service registries. For more details, see the "Deploying a URE" section of this README. diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln index 3b44382675bc..3ea8c34827cc 100644 --- a/ure/source/uretest/Makefile.pln +++ b/ure/source/uretest/Makefile.pln @@ -143,7 +143,7 @@ out.pln/class/javamain/test/java/javamain/JavaMain.class: JavaMain.java \ rm -rf out.pln/class/javamain mkdir out.pln/class/javamain javac -classpath \ - $(URE_HOME)/program/classes/ridl.jar:out.pln/tester.jar \ + $(URE_HOME)/program/classes/libreoffice.jar:out.pln/tester.jar \ -sourcepath . -d out.pln/class/javamain $< @@ -176,7 +176,7 @@ out.pln/class/tester/test/java/tester/Tester.class: Tester.java \ rm -rf out.pln/class/tester mkdir out.pln/class/tester javac -classpath \ - $(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \ + $(URE_HOME)/program/classes/libreoffice.jar:out.pln/types.jar \ -sourcepath . -d out.pln/class/tester $< @@ -194,7 +194,7 @@ out.pln/class/javatest/test/java/javatest/JavaTest.class: JavaTest.java \ rm -rf out.pln/class/javatest mkdir out.pln/class/javatest javac -classpath \ - $(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \ + $(URE_HOME)/program/classes/libreoffice.jar:out.pln/types.jar \ -sourcepath . -d out.pln/class/javatest $< @@ -212,7 +212,7 @@ out.pln/class/javanative/test/java/javanative/JavaNative.class: \ rm -rf out.pln/class/javanative mkdir out.pln/class/javanative javac -classpath \ - $(URE_HOME)/program/classes/juh.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/tester.jar \ + $(URE_HOME)/program/classes/libreoffice.jar:out.pln/tester.jar \ -sourcepath . -d out.pln/class/javanative $< @@ -230,7 +230,7 @@ out.pln/class/javaclient/test/java/javaclient/JavaClient.class: \ rm -rf out.pln/class/javaclient mkdir out.pln/class/javaclient javac -classpath \ - $(URE_HOME)/program/classes/juh.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \ + $(URE_HOME)/program/classes/libreoffice.jar:out.pln/types.jar \ -sourcepath . -d out.pln/class/javaclient $< |