summaryrefslogtreecommitdiff
path: root/ure
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-12-11 13:23:43 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-02-04 22:03:54 +0100
commitae855bf48163ff64d94cfc34aff8e37abdb5518d (patch)
treecdfc726f47cc69c265288936157295c94d9ec949 /ure
parent494092dc0c2f6fd04dbd973d6f76f1df720dbcf7 (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 'ure')
-rw-r--r--ure/source/README6
-rw-r--r--ure/source/uretest/Makefile.pln4
2 files changed, 6 insertions, 4 deletions
diff --git a/ure/source/README b/ure/source/README
index 8a8a8f0890f6..27a2b6b994ce 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -186,8 +186,10 @@ functionality that these libraries offer, see the "C++ Reference" section of the
SDK HTML documentation. The corresponding C++ header files are not in the URE,
but rather in the SDK.
-- unoloader.jar, juh.jar, jurt.jar, and ridl.jar are the public Java UNO runtime
-Java[tm] Archives (JARs) that client code can call. For details on the
+- unoloader.jar, juh.jar, and ridl.jar are the public Java UNO runtime
+Java[tm] Archives (JARs) that client code can call (jurt.jar is still provided
+for backwards compatibility, but is basically empty and has been merged into
+ridl.jar). For details on the
functionality that these files offer, see the "Java UNO Runtime Reference"
section of the SDK HTML documentation.
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 7c4bcdd8f616..3b44382675bc 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -143,7 +143,7 @@ out.pln/class/javamain/test/java/javamain/JavaMain.class: JavaMain.java \
rm -rf out.pln/class/javamain
mkdir out.pln/class/javamain
javac -classpath \
- $(URE_HOME)/program/classes/jurt.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/tester.jar \
+ $(URE_HOME)/program/classes/ridl.jar:out.pln/tester.jar \
-sourcepath . -d out.pln/class/javamain $<
@@ -194,7 +194,7 @@ out.pln/class/javatest/test/java/javatest/JavaTest.class: JavaTest.java \
rm -rf out.pln/class/javatest
mkdir out.pln/class/javatest
javac -classpath \
- $(URE_HOME)/program/classes/jurt.jar:$(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \
+ $(URE_HOME)/program/classes/ridl.jar:out.pln/types.jar \
-sourcepath . -d out.pln/class/javatest $<