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 /wizards | |
| 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 'wizards')
| -rw-r--r-- | wizards/Jar_commonwizards.mk | 3 | ||||
| -rw-r--r-- | wizards/Jar_form.mk | 3 | ||||
| -rw-r--r-- | wizards/Jar_query.mk | 3 | ||||
| -rw-r--r-- | wizards/Jar_report.mk | 3 | ||||
| -rw-r--r-- | wizards/Jar_reportbuilder.mk | 3 | ||||
| -rw-r--r-- | wizards/Jar_table.mk | 3 |
6 files changed, 6 insertions, 12 deletions
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk index ca432ea37fb0..e2f92031d880 100644 --- a/wizards/Jar_commonwizards.mk +++ b/wizards/Jar_commonwizards.mk @@ -20,8 +20,7 @@ $(eval $(call gb_Jar_Jar,commonwizards)) $(eval $(call gb_Jar_use_jars,commonwizards,\ - ridl \ - juh \ + libreoffice \ java_uno \ )) diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk index 626e5386b1e2..caad29b16702 100644 --- a/wizards/Jar_form.mk +++ b/wizards/Jar_form.mk @@ -20,8 +20,7 @@ $(eval $(call gb_Jar_Jar,form)) $(eval $(call gb_Jar_use_jars,form,\ - ridl \ - juh \ + libreoffice \ java_uno \ commonwizards \ )) diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk index 5d58df01812b..16c27e991435 100644 --- a/wizards/Jar_query.mk +++ b/wizards/Jar_query.mk @@ -20,8 +20,7 @@ $(eval $(call gb_Jar_Jar,query)) $(eval $(call gb_Jar_use_jars,query,\ - ridl \ - juh \ + libreoffice \ java_uno \ commonwizards \ )) diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk index 8f791383b70e..db16bc65716a 100644 --- a/wizards/Jar_report.mk +++ b/wizards/Jar_report.mk @@ -20,8 +20,7 @@ $(eval $(call gb_Jar_Jar,report)) $(eval $(call gb_Jar_use_jars,report,\ - ridl \ - juh \ + libreoffice \ java_uno \ commonwizards \ )) diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk index f97ee8a40934..c6662faaf944 100644 --- a/wizards/Jar_reportbuilder.mk +++ b/wizards/Jar_reportbuilder.mk @@ -20,8 +20,7 @@ $(eval $(call gb_Jar_Jar,reportbuilderwizard)) $(eval $(call gb_Jar_use_jars,reportbuilderwizard,\ - ridl \ - juh \ + libreoffice \ java_uno \ commonwizards \ report \ diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk index 6924c878c32d..cd1568ed6107 100644 --- a/wizards/Jar_table.mk +++ b/wizards/Jar_table.mk @@ -20,8 +20,7 @@ $(eval $(call gb_Jar_Jar,table)) $(eval $(call gb_Jar_use_jars,table,\ - ridl \ - juh \ + libreoffice \ java_uno \ commonwizards \ )) |