diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-09 00:37:27 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-09 00:54:29 +0300 |
| commit | 02864717973c01b055152795ac747aeb9c160169 (patch) | |
| tree | d27129347d9575c6ed20b83f6b094a3d528a9e92 | |
| parent | 2ecae4cd94445371cdee7defaac784707a9642da (diff) | |
Look for Oracle Java 7 in a 64-bit LibreOffice on OS X
Change-Id: Ife3fc97c11ab5216df62aba92dc11ed6cf07c154
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 6 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 11 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 10 |
3 files changed, 25 insertions, 2 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 673ebbf93eb2..172b570a67cc 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -20,7 +20,7 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2006-05-02</updated> + <updated>2013-04-09</updated> <vendorInfos> <vendor name="Apple Computer, Inc."> @@ -29,8 +29,12 @@ <vendor name="Apple Inc."> <minVersion>1.5.0</minVersion> </vendor> + <vendor name="Oracle Corporation"> + <minVersion>1.7.0</minVersion> + </vendor> </vendorInfos> <plugins> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> </plugins> diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index fb77e2a6703d..f82a286d682d 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -59,6 +59,9 @@ char const* const* SunInfo::getRuntimePaths(int * size) "/bin/classic/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", @@ -71,12 +74,18 @@ char const* const* SunInfo::getRuntimePaths(int * size) char const* const* SunInfo::getLibraryPaths(int* size) { -#ifdef UNX +#if defined UNX static char const * ar[] = { +#if defined MACOSX && defined X86_64 + // Oracle Java 7, under /Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home + "/lib/server", + "/lib" +#else "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/server", "/lib/" JFW_PLUGIN_ARCH "/native_threads", "/lib/" JFW_PLUGIN_ARCH +#endif }; *size = SAL_N_ELEMENTS(ar); return ar; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index fea25b05e078..f488b15653db 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -61,6 +61,7 @@ using ::rtl::Reference; #endif #ifdef UNX +#if !(defined MACOSX && defined X86_64) namespace { char const *g_arJavaNames[] = { "", @@ -113,6 +114,7 @@ char const *g_arSearchPaths[] = { #endif }; } +#endif #endif // UNX namespace jfw_plugin @@ -1137,6 +1139,14 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) getJREInfoByPath("file:////usr/jdk/latest", vecInfos); } +#elif defined MACOSX && defined X86_64 + +void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) +{ + // Oracle Java 7 + getJREInfoByPath("file:///Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home", vecInfos); +} + #else void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) { |