95c38f6d77
...which no longer worked anyway at least since
aafc10c9ed "Bump Java baseline to Java 8":
According to <https://en.wikipedia.org/wiki/GNU_Compiler_for_Java>, the last
version of GCC providing Java was GCC 6.5. But trying to add a build of that
("Tools - Options... - LibreOffice - Advanced - Java Options - Add...") would
already have failed before this commit due to a java.lang.ClassFormatError
("JREProperties (unrecognized class file version)") when executing the
JREProperties code compiled with --release 8. (Whereas now it fails because it
cannot even determine a JRE installation there according to the SunInfo rather
than GnuInfo rules used for the now-unknown vendor.)
The <updated> elements of the modified
jvmfwk/distributions/OpenOfficeorg/javavendors_*.xml have not been updated in
line with the rules documented at the end of jvmfwk/README.md: As mentioned
above, a GNU Java JRE cannot have been selected prior to this commit anyway, so
even though this is nominally an incompatible change of the xml files,
actually updating <updated> would only have negative ("just annoying if an
already selected JRE is still supported") but no positive consequences.
Change-Id: Ica245677dae977360bdb3c6544897eb060c3f844
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123906
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
85 lines
2 KiB
Makefile
85 lines
2 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_Library_Library,jvmfwk))
|
|
|
|
$(eval $(call gb_Library_add_defs,jvmfwk,\
|
|
-DJVMFWK_DLLIMPLEMENTATION \
|
|
))
|
|
|
|
ifneq ($(JVM_ONE_PATH_CHECK),)
|
|
$(eval $(call gb_Library_add_defs,jvmfwk,\
|
|
-DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\" \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Library_set_include,jvmfwk,\
|
|
-I$(SRCDIR)/jvmfwk/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_api,jvmfwk,\
|
|
udkapi \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_libraries,jvmfwk,\
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
salhelper \
|
|
))
|
|
|
|
ifeq ($(OS),ANDROID)
|
|
$(eval $(call gb_Library_use_libraries,jvmfwk,\
|
|
lo-bootstrap \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\
|
|
advapi32 \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Library_use_externals,jvmfwk,\
|
|
boost_headers \
|
|
libxml2 \
|
|
valgrind \
|
|
))
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
$(eval $(call gb_Library_add_cxxflags,jvmfwk,\
|
|
$(gb_OBJCXXFLAGS) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_objcxxobjects,jvmfwk,\
|
|
jvmfwk/plugins/sunmajor/pluginlib/util_cocoa \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_libs,jvmfwk,\
|
|
-framework Foundation \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,jvmfwk,\
|
|
jvmfwk/plugins/sunmajor/pluginlib/otherjre \
|
|
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin \
|
|
jvmfwk/plugins/sunmajor/pluginlib/sunjre \
|
|
jvmfwk/plugins/sunmajor/pluginlib/sunversion \
|
|
jvmfwk/plugins/sunmajor/pluginlib/util \
|
|
jvmfwk/plugins/sunmajor/pluginlib/vendorbase \
|
|
jvmfwk/plugins/sunmajor/pluginlib/vendorlist \
|
|
jvmfwk/source/elements \
|
|
jvmfwk/source/framework \
|
|
jvmfwk/source/fwkbase \
|
|
jvmfwk/source/fwkutil \
|
|
jvmfwk/source/libxmlutil \
|
|
))
|
|
|
|
# vim:set noet sw=4 ts=4:
|