diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-05-18 12:09:03 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-05-27 11:40:40 +0200 |
| commit | 89cb33dde0c4cd27ca05e31ddea94b7129bc6ebb (patch) | |
| tree | 2d894be3cd27e4fee01dc04f5f0451f36492faba /ridljar | |
| parent | 941b567a41569260fef14a7337511e8f42337323 (diff) | |
tdf#131572 Add java 9 module info for unoloader.jar
Add a java module named "org.libreoffice.unoloader" for this jar.
Require this module from org.libreoffice.uno
(libreoffice.jar has unoloader.jar in its classpath,
so add the same dependency to the modules)
Change-Id: I7471d65ac7a0d2c6a11c002027a21f0c441dd1f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94419
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'ridljar')
| -rw-r--r-- | ridljar/Jar_unoloader.mk | 11 | ||||
| -rw-r--r-- | ridljar/source/libreoffice/module-info.java | 2 | ||||
| -rw-r--r-- | ridljar/source/unoloader/module-info.java | 12 |
3 files changed, 24 insertions, 1 deletions
diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk index 50b32e8f0f88..2acf20b5b289 100644 --- a/ridljar/Jar_unoloader.mk +++ b/ridljar/Jar_unoloader.mk @@ -7,12 +7,21 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Jar_Jar,unoloader)) +$(eval $(call gb_Jar_Jar,unoloader,org.libreoffice.unoloader)) $(eval $(call gb_Jar_set_packageroot,unoloader,com)) $(eval $(call gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest)) +# the module-info.class is manually added here since it's not in "com" dir +$(eval $(call gb_Jar_add_packagedirs,unoloader,\ + $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,unoloader))/module-info.class \ +)) + +$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ + ridljar/source/unoloader/module-info \ +)) + $(eval $(call gb_Jar_add_sourcefiles,unoloader,\ ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \ ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader \ diff --git a/ridljar/source/libreoffice/module-info.java b/ridljar/source/libreoffice/module-info.java index 4399586fc558..8d24c7ccb13c 100644 --- a/ridljar/source/libreoffice/module-info.java +++ b/ridljar/source/libreoffice/module-info.java @@ -8,6 +8,8 @@ module org.libreoffice.uno { + requires org.libreoffice.unoloader; + exports com.sun.star.accessibility; exports com.sun.star.animations; exports com.sun.star.auth; diff --git a/ridljar/source/unoloader/module-info.java b/ridljar/source/unoloader/module-info.java new file mode 100644 index 000000000000..6eed39c96df4 --- /dev/null +++ b/ridljar/source/unoloader/module-info.java @@ -0,0 +1,12 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +module org.libreoffice.unoloader +{ + exports com.sun.star.lib.unoloader; +} |