diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-05-18 12:09:03 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-06-05 01:10:38 +0200 |
commit | 700cf71e3eeced0b39d1782c20e334bde552efce (patch) | |
tree | dc499142cfc534ef9f0ee3acca67c12e773a780b /ridljar/Jar_unoloader.mk | |
parent | 8b6c0b73afbf201ffef6541625b902939dd116f6 (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>
(cherry picked from commit 89cb33dde0c4cd27ca05e31ddea94b7129bc6ebb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95050
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'ridljar/Jar_unoloader.mk')
-rw-r--r-- | ridljar/Jar_unoloader.mk | 11 |
1 files changed, 10 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 \ |