summaryrefslogtreecommitdiff
path: root/solenv/gbuild/gbuild.mk
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2020-05-07 09:42:22 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-05-27 11:40:20 +0200
commit941b567a41569260fef14a7337511e8f42337323 (patch)
treefe04ef41038df279689e2a979dc28e7fe5b37670 /solenv/gbuild/gbuild.mk
parent77140de3fe925f75620e94dbd848b1c925935fb5 (diff)
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>
Diffstat (limited to 'solenv/gbuild/gbuild.mk')
-rw-r--r--solenv/gbuild/gbuild.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 99547941ef8c..97d2879dcc9b 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -60,6 +60,8 @@ COMMA :=,
OPEN_PAREN :=(
CLOSE_PAREN :=)
+gb_SPACE:=$(gb_SPACE) $(gb_SPACE)
+
gb_VERBOSE := $(verbose)
include $(GBUILDDIR)/Helper.mk