diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-03-26 15:04:47 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-06-05 01:09:48 +0200 |
| commit | 367c6c78fe9336a363a7a0e582a2e0c0d7c84a4f (patch) | |
| tree | 8fd532f34ff9f13d8eac43a84b5869cbac802c04 /ridljar/JunitTest_urp.mk | |
| parent | Merge branch 'libreoffice-6-4' into (diff) | |
| download | core-367c6c78fe9336a363a7a0e582a2e0c0d7c84a4f.tar.gz core-367c6c78fe9336a363a7a0e582a2e0c0d7c84a4f.zip | |
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>
(cherry picked from commit 35518c92365cc183ba6cce2a4d284a130c0ca13f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95048
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'ridljar/JunitTest_urp.mk')
| -rw-r--r-- | ridljar/JunitTest_urp.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ridljar/JunitTest_urp.mk b/ridljar/JunitTest_urp.mk index 760f81992060..3f5f76eae339 100644 --- a/ridljar/JunitTest_urp.mk +++ b/ridljar/JunitTest_urp.mk @@ -14,7 +14,7 @@ $(eval $(call gb_JunitTest_use_customtargets,ridl_urp,\ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,ridl_urp,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_urp,libreoffice)) $(eval $(call gb_JunitTest_add_classpath,ridl_urp,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) |