6c697a99c9
...so no need to return non-empty SunInfo::getLibraryPaths (for the Oracle JRE, cf. how this had always returned an empty set for the Apple JRE in otherjre.cxx). This fixes the bug that selecting the Oracle JRE in the Advanced options pane didn't stick, because jfw_areEqualJavaInfo was called on a JavaInfo read back from XML where nRequirements had been cleared (in CNodeJavaInfo::loadFromNode) and a JavaInfo where non-empty SunInfo::getLibraryPaths -> VendorBase::needsRestart() == true -> nRequirements == JFW_REQUIRE_NEEDRESTART, so always returned false. (There's multiple errors here. It is questionable whether jfw_areEqualJavaInfo should take nRequirements into account, at least when used from SvxJavaOptionsPage. And VendorBase::getLibraryPaths appears to be only used to compute VendorBase::needsRestart, ignoring the actual path data. But leave that for future clean-up.) Change-Id: I5f004434b1cb7e909a153c43c474a2317f24b0c1
117 lines
3.2 KiB
C++
117 lines
3.2 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 .
|
|
*/
|
|
|
|
|
|
#include "osl/thread.h"
|
|
#include "sunjre.hxx"
|
|
#include "sunversion.hxx"
|
|
#include "diagnostics.h"
|
|
|
|
using namespace std;
|
|
|
|
namespace jfw_plugin
|
|
{
|
|
|
|
rtl::Reference<VendorBase> SunInfo::createInstance()
|
|
{
|
|
return new SunInfo;
|
|
}
|
|
|
|
char const* const* SunInfo::getJavaExePaths(int * size)
|
|
{
|
|
static char const * ar[] = {
|
|
#if defined(WNT)
|
|
"java.exe",
|
|
"bin/java.exe",
|
|
"jre/bin/java.exe"
|
|
#elif defined UNX
|
|
"java",
|
|
"bin/java",
|
|
"jre/bin/java"
|
|
#endif
|
|
};
|
|
*size = SAL_N_ELEMENTS(ar);
|
|
return ar;
|
|
}
|
|
|
|
char const* const* SunInfo::getRuntimePaths(int * size)
|
|
{
|
|
static char const* ar[]= {
|
|
#if defined(WNT)
|
|
"/bin/client/jvm.dll",
|
|
"/bin/hotspot/jvm.dll",
|
|
"/bin/classic/jvm.dll",
|
|
"/bin/jrockit/jvm.dll",
|
|
// The 64-bit JRE has the jvm in bin/server
|
|
"/bin/server/jvm.dll"
|
|
#elif defined MACOSX && defined X86_64
|
|
// Oracle Java 7, under /Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home
|
|
"/lib/server/libjvm.dylib"
|
|
#elif defined UNX
|
|
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
|
|
"/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
|
|
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
|
|
"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
|
|
#endif
|
|
};
|
|
*size = SAL_N_ELEMENTS(ar);
|
|
return ar;
|
|
}
|
|
|
|
char const* const* SunInfo::getLibraryPaths(int* size)
|
|
{
|
|
#if defined UNX && !defined MACOSX
|
|
static char const * ar[] = {
|
|
"/lib/" JFW_PLUGIN_ARCH "/client",
|
|
"/lib/" JFW_PLUGIN_ARCH "/server",
|
|
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
|
|
"/lib/" JFW_PLUGIN_ARCH
|
|
};
|
|
*size = SAL_N_ELEMENTS(ar);
|
|
return ar;
|
|
#else
|
|
*size = 0;
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
int SunInfo::compareVersions(const OUString& sSecond) const
|
|
{
|
|
OUString sFirst = getVersion();
|
|
|
|
SunVersion version1(sFirst);
|
|
JFW_ENSURE(version1, "[Java framework] sunjavaplugin" SAL_DLLEXTENSION
|
|
" does not know the version: "
|
|
+ sFirst + " as valid for a SUN/Oracle JRE.");
|
|
SunVersion version2(sSecond);
|
|
if ( ! version2)
|
|
throw MalformedVersionException();
|
|
|
|
if (version1 == version2)
|
|
return 0;
|
|
if (version1 > version2)
|
|
return 1;
|
|
else
|
|
return -1;
|
|
}
|
|
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|