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 /scripting | |
| 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 'scripting')
| -rw-r--r-- | scripting/Jar_HelloWorld.mk | 3 | ||||
| -rw-r--r-- | scripting/Jar_Highlight.mk | 3 | ||||
| -rw-r--r-- | scripting/Jar_MemoryUsage.mk | 3 | ||||
| -rw-r--r-- | scripting/Jar_ScriptFramework.mk | 3 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForBeanShell.mk | 3 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForJava.mk | 3 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForJavaScript.mk | 3 |
7 files changed, 7 insertions, 14 deletions
diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk index c80f628eb765..1a44592e115c 100644 --- a/scripting/Jar_HelloWorld.mk +++ b/scripting/Jar_HelloWorld.mk @@ -10,8 +10,7 @@ $(eval $(call gb_Jar_Jar,HelloWorld)) $(eval $(call gb_Jar_use_jars,HelloWorld,\ - juh \ - ridl \ + libreoffice \ )) $(eval $(call gb_Jar_add_sourcefiles,HelloWorld,\ diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk index 18e3bf916a76..fb756cc8b1ff 100644 --- a/scripting/Jar_Highlight.mk +++ b/scripting/Jar_Highlight.mk @@ -10,8 +10,7 @@ $(eval $(call gb_Jar_Jar,Highlight)) $(eval $(call gb_Jar_use_jars,Highlight,\ - juh \ - ridl \ + libreoffice \ )) $(eval $(call gb_Jar_add_sourcefiles,Highlight,\ diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk index e1c0f9f8c11a..8f917d360c45 100644 --- a/scripting/Jar_MemoryUsage.mk +++ b/scripting/Jar_MemoryUsage.mk @@ -10,8 +10,7 @@ $(eval $(call gb_Jar_Jar,MemoryUsage)) $(eval $(call gb_Jar_use_jars,MemoryUsage,\ - juh \ - ridl \ + libreoffice \ )) $(eval $(call gb_Jar_add_sourcefiles,MemoryUsage,\ diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk index 8f0cd9a9062a..397de3ccbc72 100644 --- a/scripting/Jar_ScriptFramework.mk +++ b/scripting/Jar_ScriptFramework.mk @@ -10,8 +10,7 @@ $(eval $(call gb_Jar_Jar,ScriptFramework)) $(eval $(call gb_Jar_use_jars,ScriptFramework,\ - juh \ - ridl \ + libreoffice \ )) $(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO)) diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index fdbbec8ab201..6f362818d7b3 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -10,8 +10,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell)) $(eval $(call gb_Jar_use_jars,ScriptProviderForBeanShell,\ - juh \ - ridl \ + libreoffice \ ScriptFramework \ )) diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk index e0d4bee3756e..8e7d3e2d17a9 100644 --- a/scripting/Jar_ScriptProviderForJava.mk +++ b/scripting/Jar_ScriptProviderForJava.mk @@ -10,8 +10,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForJava)) $(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\ - juh \ - ridl \ + libreoffice \ ScriptFramework \ )) diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index 976c6ee7b809..c777cbcab302 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/scripting/Jar_ScriptProviderForJavaScript.mk @@ -10,8 +10,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript)) $(eval $(call gb_Jar_use_jars,ScriptProviderForJavaScript,\ - juh \ - ridl \ + libreoffice \ ScriptFramework \ )) |