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

Resolves: #i66923# Add support for JRockit JVM

Browse Source 
(cherry picked from commit cb38ee0da6fa928118fbc1da118a707d7799cb40)

Conflicts:
	jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
	jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
	jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

Change-Id: Iffd413ba1d74ae3b7da58df7b092c43c4f64a7c9
This commit is contained in:
Ariel Constenla-Haile
2012-06-10 22:31:42 +00:00
committed by Caolán McNamara
parent 7d528592ac
commit 55d2d982d0
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
View File

@@ -20,14 +20,14 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<updated>2012-07-12</updated>
<updated>2013-05-02</updated>
<vendorInfos>
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
<vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion>
<minVersion>1.6.0</minVersion>
</vendor>
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>

4
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
View File

@@ -20,14 +20,14 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<updated>2012-07-12</updated>
<updated>2013-05-02</updated>
<vendorInfos>
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
<vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion>
<minVersion>1.6.0</minVersion>
</vendor>
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>

4
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
View File

@@ -57,6 +57,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
"/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
@@ -65,7 +66,8 @@ char const* const* SunInfo::getRuntimePaths(int * size)
#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 "/classic/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
#endif
};
*size = SAL_N_ELEMENTS(ar);