diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:49:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:49:56 +0000 |
| commit | e40ead8aa7bc889d3db709da7015608113b257db (patch) | |
| tree | 72ae8776f0ed04556a168066458cf1205cecb9c8 /jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | |
| parent | ebd41cb35c4d41e58b1905e2affd6141b3fdb50c (diff) | |
INTEGRATION: CWS jre5issues (1.2.26); FILE MERGED
2005/01/14 10:11:42 jl 1.2.26.1: #i39912# #i40180# fixes for MAC, FREEBSD
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 8fa609db0..e8dff2cf3 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -2,9 +2,9 @@ * * $RCSfile: otherjre.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-07-23 11:51:14 $ + * last change: $Author: rt $ $Date: 2005-01-31 09:49:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,7 @@ Reference<VendorBase> OtherInfo::createInstance() return new OtherInfo; } + char const* const* OtherInfo::getJavaExePaths(int * size) { static char const * ar[] = { @@ -97,9 +98,13 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll" #elif UNX +#ifdef MACOSX + "/../../../JavaVM" +#else "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" #endif +#endif }; *size = sizeof(ar) / sizeof (char*); @@ -111,6 +116,10 @@ char const* const* OtherInfo::getLibraryPaths(int* size) #ifdef UNX static char const * ar[] = { +#ifdef MACOX + "/../Libraries", + "/lib" +#else #if defined(LINUX) && defined(POWERPC) "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/classic", @@ -121,6 +130,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size) "/lib/" JFW_PLUGIN_ARCH "/native_threads", "/lib/" JFW_PLUGIN_ARCH #endif +#endif }; *size = sizeof(ar) / sizeof (char*); @@ -132,10 +142,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size) int OtherInfo::compareVersions(const rtl::OUString& sSecond) const { - //Need to provide an own algorithm for comparing version. Or - //do not override compareVersions and rely on the implementation - //in VendorBase::compareVersion. However, it will throw a MalformedVersionException - //if the version string does not correspond to SUN version strings. + //Need to provide an own algorithm for comparing version. //Because this function returns always 0, which means the version of //this JRE and the provided version "sSecond" are equal, one cannot put //any excludeVersion entries in the javavendors.xml file. |