[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - ridljar/Jar_unoloader.mk ridljar/source solenv/gbuild

[Samuel Mehrbrodt (via logerrit)]

 ridljar/Jar_unoloader.mk                    |   11 ++++++++++-
 ridljar/source/libreoffice/module-info.java |    2 ++
 ridljar/source/unoloader/module-info.java   |   12 ++++++++++++
 solenv/gbuild/JavaClassSet.mk               |    1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 700cf71e3eeced0b39d1782c20e334bde552efce
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon May 18 12:09:03 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Jun 5 01:10:38 2020 +0200

    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 at googlemail.com>
    (cherry picked from commit 89cb33dde0c4cd27ca05e31ddea94b7129bc6ebb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95050
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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;
+}
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 541490448b05..d3e4c3590dc5 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -56,6 +56,7 @@ $(call gb_Helper_abbreviate_dirs,\
 			$(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \
 				$(gb_JavaClassSet_JAVACDEBUG) \
 				-classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
+				--module-path "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
 				$(if $(T_MODULENAME),--patch-module $(T_MODULENAME)="$(subst $(WHITESPACE),$(gb_CLASSPATHSEP),$(strip $(dir $(PACKAGEDIRS))))") \
 				-d $(call gb_JavaClassSet_get_classdir,$(2)) \
 				@$$RESPONSEFILE &&) \