diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-05-07 09:42:22 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-05-27 11:40:20 +0200 |
| commit | 941b567a41569260fef14a7337511e8f42337323 (patch) | |
| tree | fe04ef41038df279689e2a979dc28e7fe5b37670 /jvmfwk | |
| parent | 77140de3fe925f75620e94dbd848b1c925935fb5 (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 'jvmfwk')
| -rw-r--r-- | jvmfwk/CustomTarget_jreproperties.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jvmfwk/CustomTarget_jreproperties.mk b/jvmfwk/CustomTarget_jreproperties.mk index ac8f7c053373..da509dbff5ac 100644 --- a/jvmfwk/CustomTarget_jreproperties.mk +++ b/jvmfwk/CustomTarget_jreproperties.mk @@ -17,7 +17,7 @@ $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/JREProperties.class : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JCS,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JCS) $(call gb_Helper_abbreviate_dirs, \ - cd $(dir $@) && $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) + cd $(dir $@) && $(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JCS) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |