mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS maho2 (1.7.4); FILE MERGED

Browse Source 
2006/04/20 05:01:35 maho 1.7.4.1: #i64442#
javaldx does not work as expected if libgcj.so is not java.home/lib
This commit is contained in:
Jens-Heiner Rechtien
2006-06-09 11:31:46 +00:00
parent 8afef0b58f
commit 7b9bbbeeb5
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: gnujre.cxx,v $ * $RCSfile: gnujre.cxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: vg $ $Date: 2006-03-16 13:13:00 $ * last change: $Author: hr $ $Date: 2006-06-09 12:31:46 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -63,13 +63,8 @@ char const* const* GnuInfo::getJavaExePaths(int * size)
char const* const* GnuInfo::getRuntimePaths(int * size) char const* const* GnuInfo::getRuntimePaths(int * size)
{ {
static char const* ar[]= { static char const* ar[]= {
#ifdef X86_64 "/libgcj.so.7",
"/lib64/libgcj.so.7", "/libgcj.so.6"
"/lib64/libgcj.so.6"
#else
"/lib/libgcj.so.7",
"/lib/libgcj.so.6"
#endif
}; };
*size = sizeof(ar) / sizeof (char*); *size = sizeof(ar) / sizeof (char*);
return ar; return ar;
@@ -87,7 +82,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
OUString sVersionProperty( OUString sVersionProperty(
RTL_CONSTASCII_USTRINGPARAM("java.version")); RTL_CONSTASCII_USTRINGPARAM("java.version"));
OUString sHomeProperty( OUString sHomeProperty(
RTL_CONSTASCII_USTRINGPARAM("java.home")); RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
OUString sAccessProperty( OUString sAccessProperty(
RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies")); RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
@@ -111,19 +106,8 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
} }
else if (!bHome && sHomeProperty.equals(i->first)) else if (!bHome && sHomeProperty.equals(i->first))
{ {
OUString fileURL; m_sHome = i->second;
if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) == bHome = true;
osl_File_E_None)
{
//make sure that the drive letter have all the same case
//otherwise file:///c:/jre and file:///C:/jre produce two
//different objects!!!
if (makeDriveLetterSame( & fileURL))
{
m_sHome = fileURL;
bHome = true;
}
}
} }
else if (!bAccess && sAccessProperty.equals(i->first)) else if (!bAccess && sAccessProperty.equals(i->first))
{ {
@@ -166,7 +150,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
if (!bRt) if (!bRt)
{ {
m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr")); m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"));
for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++) for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
{ {
//Construct an absolute path to the possible runtime //Construct an absolute path to the possible runtime