tdf#131572 Add java 9 module info for libreoffice.jar

Add a java module named "org.libreoffice.uno" for this jar.

This needs to be compiled with Java 9.
But since we want to keep b/c with Java 8,
the rest of the jar has to be compiled with Java 8.

This bumps the *build* requirement to Java 9 while keeping
the *runtime* requirement at Java 8.

The gbuild JavaClassSet class is changed to invoke javac twice,
where the 2nd invocation compiles with --release 9 and a --patch-modules
argument so that it finds the results of the first invocation and also
the javamaker generated files in CustomTargets.

Change-Id: I888f5dbe097cc37136e68db5919939877c981862
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91105
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

2 files changed, 147 insertions, 1 deletions

diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk
index 4d0f5ef2545f..d34ae3f5ebda 100644
--- a/ridljar/Jar_libreoffice.mk
+++ b/ridljar/Jar_libreoffice.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Jar_Jar,libreoffice))
+$(eval $(call gb_Jar_Jar,libreoffice,org.libreoffice.uno))
 
 $(eval $(call gb_Jar_use_customtargets,libreoffice,\
     ridljar/javamaker \
@@ -27,9 +27,15 @@ $(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \
     $(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \
 ))
 
+# ugly: the module-info.class is manually added here since it's not in "com" dir
 $(eval $(call gb_Jar_add_packagedirs,libreoffice,\
     $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \
     $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \
+	$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\
+    ridljar/source/libreoffice/module-info \
 ))
 
 $(eval $(call gb_Jar_add_sourcefiles,libreoffice,\
diff --git a/ridljar/source/libreoffice/module-info.java b/ridljar/source/libreoffice/module-info.java
new file mode 100644
index 000000000000..4399586fc558
--- /dev/null
+++ b/ridljar/source/libreoffice/module-info.java
@@ -0,0 +1,140 @@
+/*
+ * 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.uno
+{
+    exports com.sun.star.accessibility;
+    exports com.sun.star.animations;
+    exports com.sun.star.auth;
+    exports com.sun.star.awt;
+    exports com.sun.star.awt.grid;
+    exports com.sun.star.awt.tab;
+    exports com.sun.star.awt.tree;
+    exports com.sun.star.beans;
+    exports com.sun.star.bridge;
+    exports com.sun.star.bridge.oleautomation;
+    exports com.sun.star.chart;
+    exports com.sun.star.chart2;
+    exports com.sun.star.chart2.data;
+    exports com.sun.star.comp.bridgefactory;
+    exports com.sun.star.comp.connections;
+    exports com.sun.star.comp.helper;
+    exports com.sun.star.comp.loader;
+    exports com.sun.star.comp.servicemanager;
+    exports com.sun.star.comp.urlresolver;
+    exports com.sun.star.configuration;
+    exports com.sun.star.configuration.backend;
+    exports com.sun.star.connection;
+    exports com.sun.star.container;
+    exports com.sun.star.cui;
+    exports com.sun.star.datatransfer;
+    exports com.sun.star.datatransfer.clipboard;
+    exports com.sun.star.datatransfer.dnd;
+    exports com.sun.star.deployment;
+    exports com.sun.star.deployment.test;
+    exports com.sun.star.deployment.ui;
+    exports com.sun.star.document;
+    exports com.sun.star.drawing;
+    exports com.sun.star.drawing.framework;
+    exports com.sun.star.embed;
+    exports com.sun.star.form;
+    exports com.sun.star.form.binding;
+    exports com.sun.star.form.control;
+    exports com.sun.star.form.runtime;
+    exports com.sun.star.form.submission;
+    exports com.sun.star.form.validation;
+    exports com.sun.star.formula;
+    exports com.sun.star.frame;
+    exports com.sun.star.frame.status;
+    exports com.sun.star.gallery;
+    exports com.sun.star.geometry;
+    exports com.sun.star.graphic;
+    exports com.sun.star.i18n;
+    exports com.sun.star.inspection;
+    exports com.sun.star.io;
+    exports com.sun.star.java;
+    exports com.sun.star.lang;
+    exports com.sun.star.ldap;
+    exports com.sun.star.lib.connections.pipe;
+    exports com.sun.star.lib.connections.socket;
+    exports com.sun.star.lib.uno;
+    exports com.sun.star.lib.uno.adapter;
+    exports com.sun.star.lib.uno.bridges.java_remote;
+    exports com.sun.star.lib.uno.environments.java;
+    exports com.sun.star.lib.uno.environments.remote;
+    exports com.sun.star.lib.uno.helper;
+    exports com.sun.star.lib.uno.protocols.urp;
+    exports com.sun.star.lib.uno.typedesc;
+    exports com.sun.star.lib.uno.typeinfo;
+    exports com.sun.star.lib.util;
+    exports com.sun.star.linguistic2;
+    exports com.sun.star.loader;
+    exports com.sun.star.logging;
+    exports com.sun.star.mail;
+    exports com.sun.star.media;
+    exports com.sun.star.mozilla;
+    exports com.sun.star.office;
+    exports com.sun.star.packages;
+    exports com.sun.star.packages.manifest;
+    exports com.sun.star.packages.zip;
+    exports com.sun.star.presentation;
+    exports com.sun.star.qa;
+    exports com.sun.star.rdf;
+    exports com.sun.star.reflection;
+    exports com.sun.star.registry;
+    exports com.sun.star.rendering;
+    exports com.sun.star.report;
+    exports com.sun.star.report.inspection;
+    exports com.sun.star.report.meta;
+    exports com.sun.star.resource;
+    exports com.sun.star.scanner;
+    exports com.sun.star.script;
+    exports com.sun.star.script.browse;
+    exports com.sun.star.script.provider;
+    exports com.sun.star.script.vba;
+    exports com.sun.star.sdb;
+    exports com.sun.star.sdb.application;
+    exports com.sun.star.sdb.tools;
+    exports com.sun.star.sdbc;
+    exports com.sun.star.sdbcx;
+    exports com.sun.star.security;
+    exports com.sun.star.setup;
+    exports com.sun.star.sheet;
+    exports com.sun.star.sheet.opencl;
+    exports com.sun.star.smarttags;
+    exports com.sun.star.style;
+    exports com.sun.star.svg;
+    exports com.sun.star.system;
+    exports com.sun.star.table;
+    exports com.sun.star.task;
+    exports com.sun.star.text;
+    exports com.sun.star.text.textfield;
+    exports com.sun.star.tiledrendering;
+    exports com.sun.star.ucb;
+    exports com.sun.star.ui;
+    exports com.sun.star.ui.dialogs;
+    exports com.sun.star.ui.test;
+    exports com.sun.star.uno;
+    exports com.sun.star.uri;
+    exports com.sun.star.util;
+    exports com.sun.star.view;
+    exports com.sun.star.xforms;
+    exports com.sun.star.xml;
+    exports com.sun.star.xml.crypto;
+    exports com.sun.star.xml.crypto.sax;
+    exports com.sun.star.xml.csax;
+    exports com.sun.star.xml.dom;
+    exports com.sun.star.xml.dom.events;
+    exports com.sun.star.xml.dom.views;
+    exports com.sun.star.xml.input;
+    exports com.sun.star.xml.sax;
+    exports com.sun.star.xml.wrapper;
+    exports com.sun.star.xml.xpath;
+    exports com.sun.star.xml.xslt;
+    exports com.sun.star.xsd;
+}