3460c16d7f
...even for JREs not listed in javavendors.xml, making it default to a
VersionInfo with sMinVersion = "1.8.0".
3d27b2fa9c
"tdf#124503: Support JRE installations
with unknown java.vendor property", which had changed getVersionInformation to
return an optional<VersionInfo>, said in the commit message: "For simplicity,
assume that any versions of such JREs are supported. Our baseline is Java 6,
and there are unlikely any older versions of JREs from unknown vendors out
there." Our baseline is Java 8 by now, and there are still unlikely any older
JREs out there, but for macOS ARM64 we may want to restrict to at least Java 17
implementing <http://openjdk.java.net/jeps/391> "JEP 391: macOS/AArch64 Port",
and this commit is a prerequisite for such a change (where we would then e.g.
change the hardcoded "1.8.0" to "17" for just that one platform).
(OtherInfo::compareVersions in jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
unconditionally returns 0, meaning "versions compare equal", so introducing a
default version of "1.8.0" should have no negative effect on any JREs that use
OtherInfo.)
Change-Id: I34dc5f2b755c2254a91d42c262786ceec70c746e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123958
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
130 lines
3.5 KiB
C++
130 lines
3.5 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* 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/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
#ifndef INCLUDED_JVMFWK_INC_FWKBASE_HXX
|
|
#define INCLUDED_JVMFWK_INC_FWKBASE_HXX
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <string_view>
|
|
#include <vector>
|
|
|
|
#include <rtl/ustring.hxx>
|
|
#include "libxmlutil.hxx"
|
|
|
|
namespace jfw
|
|
{
|
|
struct VersionInfo;
|
|
|
|
class VendorSettings
|
|
{
|
|
CXmlDocPtr m_xmlDocVendorSettings;
|
|
CXPathContextPtr m_xmlPathContextVendorSettings;
|
|
|
|
public:
|
|
VendorSettings();
|
|
|
|
VersionInfo getVersionInformation(std::u16string_view sVendor) const;
|
|
};
|
|
|
|
/* The class offers functions to retrieve verified bootstrap parameters.
|
|
*/
|
|
namespace BootParams
|
|
{
|
|
/* Gets the file URL to the JRE which has been determined by the
|
|
bootstrap parameter UNO_JAVA_JFW_JREHOME or UNO_JAVA_JFW_ENV_JREHOME.
|
|
|
|
In direct mode either of them must be set. If not an exception is thrown.
|
|
*/
|
|
OUString getJREHome();
|
|
|
|
::std::vector<OString> getVMParameters();
|
|
|
|
OUString getUserData();
|
|
|
|
OUString getSharedData();
|
|
|
|
/* returns the file URL to the vendor settings xml file.
|
|
*/
|
|
OUString getVendorSettings();
|
|
|
|
/* User the parameter UNO_JAVA_JFW_CLASSPATH and UNO_JAVA_JFW_ENV_CLASSPATH
|
|
to compose a classpath
|
|
*/
|
|
OString getClasspath();
|
|
|
|
OUString getClasspathUrls();
|
|
|
|
} //end namespace
|
|
|
|
enum JFW_MODE
|
|
{
|
|
JFW_MODE_APPLICATION,
|
|
|
|
JFW_MODE_DIRECT
|
|
};
|
|
|
|
JFW_MODE getMode();
|
|
|
|
/** creates the -Djava.class.path option with the complete classpath, including
|
|
the paths which are set by UNO_JAVA_JFW_CLASSPATH_URLS.
|
|
*/
|
|
OString makeClassPathOption(std::u16string_view sUserClassPath);
|
|
|
|
OString getSettingsPath(const OUString& sURL);
|
|
|
|
/** Get the system path to the javasettings.xml
|
|
Converts the URL returned from getUserSettingsURL to a
|
|
Systempath. An empty string is returned if the file
|
|
does not exist.
|
|
@throws FrameworkException
|
|
*/
|
|
OString getUserSettingsPath();
|
|
|
|
/** Returns the system path of the share settings file.
|
|
Returns a valid string or throws an exception.
|
|
@throws FrameworkException
|
|
*/
|
|
OString getSharedSettingsPath();
|
|
|
|
/* returns a valid string or throws an exception.
|
|
@throws FrameworkException
|
|
*/
|
|
OString getVendorSettingsPath();
|
|
|
|
/** Called from writeJavaInfoData. It sets the process identifier. When
|
|
java is to be started, then the current id is compared to the one set by
|
|
this function. If they are identical then the Java was selected in the
|
|
same process. If that Java needs a prepared environment, such as a
|
|
LD_LIBRARY_PATH, then it must not be started in this process.
|
|
*/
|
|
void setJavaSelected();
|
|
|
|
/** Determines if the currently selected Java was set in this process.
|
|
|
|
@see setProcessId()
|
|
*/
|
|
bool wasJavaSelectedInSameProcess();
|
|
/* Only for application mode.
|
|
*/
|
|
OUString getApplicationClassPath();
|
|
}
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|