941b567a41
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>
23 lines
1.1 KiB
Makefile
23 lines
1.1 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# 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/.
|
|
#
|
|
|
|
$(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jreproperties))
|
|
|
|
$(call gb_CustomTarget_get_target,jvmfwk/jreproperties) : $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/JREProperties.class
|
|
|
|
$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/JREProperties.class : \
|
|
$(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
|
|
| $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/.dir
|
|
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JCS,1)
|
|
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JCS)
|
|
$(call gb_Helper_abbreviate_dirs, \
|
|
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:
|