diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-03-26 15:04:47 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-06 14:48:21 +0200 |
| commit | 35518c92365cc183ba6cce2a4d284a130c0ca13f (patch) | |
| tree | f3de8bdec6331ce933126336cf701dcaffe9b662 /qadevOOo | |
| parent | 6bf3517d60272bdec878bb6dde92a47b45a3f866 (diff) | |
Move all public Java classes to libreoffice.jar
This moves the classes from juh.jar and ridl.jar to libreoffice.jar
The goal is to have one single jar (and Java module, will be added later)
which developers can include to work with LO.
juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar
on its classpath to keep backwards compatibility.
This is a continuation of ae855bf48163ff64d94cfc34aff8e37abdb5518d
and a preparation to have Java 9 module support.
Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'qadevOOo')
| -rw-r--r-- | qadevOOo/.classpath | 3 | ||||
| -rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/qadevOOo/.classpath b/qadevOOo/.classpath index d8828a72c283..81adde6656f5 100644 --- a/qadevOOo/.classpath +++ b/qadevOOo/.classpath @@ -9,8 +9,7 @@ <classpathentry kind="lib" path="testdocs/qadevlibs/JobExecutor.jar"/> <classpathentry kind="lib" path="testdocs/qadevlibs/MyPersistObjectImpl.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="../instdir/program/classes/juh.jar"/> - <classpathentry kind="lib" path="../instdir/program/classes/ridl.jar"/> + <classpathentry kind="lib" path="../instdir/program/classes/libreoffice.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="output" path="../workdir/qadevooo-bin"/> </classpath> diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index b3f7f3333258..a526ad0ca163 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -14,14 +14,13 @@ gb_JavaClassSet_JAVACDEBUG:= -g $(eval $(call gb_Jar_Jar,OOoRunner)) $(eval $(call gb_Jar_add_manifest_classpath,OOoRunner,\ - ridl.jar \ + libreoffice.jar \ )) $(eval $(call gb_Jar_set_manifest,OOoRunner,$(SRCDIR)/qadevOOo/runner/manifest)) $(eval $(call gb_Jar_use_jars,OOoRunner,\ - ridl \ - juh \ + libreoffice \ java_uno \ )) |