Author: damjan
Date: Sat Jul 27 19:55:19 2019
New Revision: 1863883
URL: http://svn.apache.org/viewvc?rev=1863883&view=rev
Log:
Fix detection of Java versions > 1.8
Patch by: me
Modified:
openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
Modified: openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx?rev=1863883&r1=1863882&r2=1863883&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
(original)
+++ openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx Sat
Jul 27 19:55:19 2019
@@ -75,6 +75,7 @@ char const* const* OtherInfo::getRuntime
"/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC
"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA
Systems
+ "/lib/server/libjvm.so", // > 1.8
"/bin/classic/libjvm.so", // fallback for older for IBM Java
"/jre/bin/classic/libjvm.so" // fallback for older for IBM Java
#endif
@@ -102,7 +103,8 @@ char const* const* OtherInfo::getLibrary
"/lib/" JFW_PLUGIN_ARCH "/classic",
"/lib/" JFW_PLUGIN_ARCH "/jrockit",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
- "/lib/" JFW_PLUGIN_ARCH
+ "/lib/" JFW_PLUGIN_ARCH,
+ "/lib" // > 1.8
#endif
};
Modified: openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx?rev=1863883&r1=1863882&r2=1863883&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
(original)
+++ openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Sat Jul
27 19:55:19 2019
@@ -75,7 +75,8 @@ char const* const* SunInfo::getRuntimePa
"/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"
+ "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so",
+ "/lib/server/libjvm.so" // > 1.8
#endif
};
*size = sizeof(ar) / sizeof (char*);
@@ -89,7 +90,8 @@ char const* const* SunInfo::getLibraryPa
"/lib/" JFW_PLUGIN_ARCH "/client",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
- "/lib/" JFW_PLUGIN_ARCH
+ "/lib/" JFW_PLUGIN_ARCH,
+ "/lib" // > 1.8
};
*size = sizeof(ar) / sizeof (char*);
