diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-12-11 13:23:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-04 22:03:54 +0100 |
| commit | ae855bf48163ff64d94cfc34aff8e37abdb5518d (patch) | |
| tree | cdfc726f47cc69c265288936157295c94d9ec949 /scripting | |
| parent | 494092dc0c2f6fd04dbd973d6f76f1df720dbcf7 (diff) | |
tdf#117331 Merge jurt and unoil into ridl
jurt.jar and unoil.jar are kept as effectively empty jars, each with a
Class-Path: ridl.jar
in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or
without also loading ridl.jar) will still have access to their content.
Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi)
are not part of the URE, but are now made available by URE's ridl.jar. This
should probably not cause problems in practice.
At least for now, we seal exactly those packages in ridl.jar that were
originally sealed in jurt.jar. Ideally, all of ridl.jar could be sealed now,
but that would be mildly incompatible, as it would prevent 3rd-party code from
introducing additional UNOIDL entities in the relevant namespaces (even if that
is something we do not want 3rd-party code to do anyway).
However, some JunitTest_jurt_* define classes in those sealed packages. In the
past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt.
Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the
gb_JunitTest_use_jar,*,ridl. But the former only makes available the classes
that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the
UNOIDL entities specified via gb_Jar_add_packagedirs. But the tests need the
udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests
get them explicitly. (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use
gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets
leave that for a follow-up clean up.)
As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/.
Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a
Co-authored-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/Jar_HelloWorld.mk | 2 | ||||
| -rw-r--r-- | scripting/Jar_Highlight.mk | 2 | ||||
| -rw-r--r-- | scripting/Jar_MemoryUsage.mk | 2 | ||||
| -rw-r--r-- | scripting/Jar_ScriptFramework.mk | 2 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForBeanShell.mk | 2 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForJava.mk | 2 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForJavaScript.mk | 2 |
7 files changed, 0 insertions, 14 deletions
diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk index 9966e90914d0..c80f628eb765 100644 --- a/scripting/Jar_HelloWorld.mk +++ b/scripting/Jar_HelloWorld.mk @@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,HelloWorld)) $(eval $(call gb_Jar_use_jars,HelloWorld,\ juh \ - jurt \ ridl \ - unoil \ )) $(eval $(call gb_Jar_add_sourcefiles,HelloWorld,\ diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk index 0b643cdae10c..18e3bf916a76 100644 --- a/scripting/Jar_Highlight.mk +++ b/scripting/Jar_Highlight.mk @@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,Highlight)) $(eval $(call gb_Jar_use_jars,Highlight,\ juh \ - jurt \ ridl \ - unoil \ )) $(eval $(call gb_Jar_add_sourcefiles,Highlight,\ diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk index 6d34dbe8e2ff..e1c0f9f8c11a 100644 --- a/scripting/Jar_MemoryUsage.mk +++ b/scripting/Jar_MemoryUsage.mk @@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,MemoryUsage)) $(eval $(call gb_Jar_use_jars,MemoryUsage,\ juh \ - jurt \ ridl \ - unoil \ )) $(eval $(call gb_Jar_add_sourcefiles,MemoryUsage,\ diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk index 9bf31b62cb64..8f0cd9a9062a 100644 --- a/scripting/Jar_ScriptFramework.mk +++ b/scripting/Jar_ScriptFramework.mk @@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,ScriptFramework)) $(eval $(call gb_Jar_use_jars,ScriptFramework,\ juh \ - jurt \ ridl \ - unoil \ )) $(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO)) diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index e0b4c3ab5776..fdbbec8ab201 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell)) $(eval $(call gb_Jar_use_jars,ScriptProviderForBeanShell,\ juh \ - jurt \ ridl \ - unoil \ ScriptFramework \ )) diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk index 64014f4f1a44..e0d4bee3756e 100644 --- a/scripting/Jar_ScriptProviderForJava.mk +++ b/scripting/Jar_ScriptProviderForJava.mk @@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForJava)) $(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\ juh \ - jurt \ ridl \ - unoil \ ScriptFramework \ )) diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index f89551cec429..976c6ee7b809 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/scripting/Jar_ScriptProviderForJavaScript.mk @@ -11,9 +11,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript)) $(eval $(call gb_Jar_use_jars,ScriptProviderForJavaScript,\ juh \ - jurt \ ridl \ - unoil \ ScriptFramework \ )) |