diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-04-26 08:51:11 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2013-04-26 08:51:11 +0000 |
| commit | a3eded9728647bde4af68b9f3c75a51dc0676fc7 (patch) | |
| tree | cfeb4aa0fc407ec282143fedfc7374ec432af623 | |
| parent | 7a309ee2def4ece46f78371ee18e94fae9fc3c05 (diff) | |
#i121715# find official JRE>=7 on OSX
Notes
Notes:
merged as: b828a6f494cc90e1a135e7442589679993eb2a5c
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 8 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 5 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 149387611e54..63eb024a9a5e 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -23,18 +23,22 @@ <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-01-01</updated> <vendorInfos> <vendor name="Apple Computer, Inc."> <minVersion>1.5.0</minVersion> </vendor> <vendor name="Apple Inc."> - <minVersion>1.5.0</minVersion> + <minVersion>1.5.0</minVersion> + </vendor> + <vendor name="Oracle Corporation"> + <minVersion>1.7.0</minVersion> </vendor> </vendorInfos> <plugins> <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> </plugins> </javaSelection> diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 925520da5cdd..cf816fd1bed4 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -69,13 +69,14 @@ char const* const* SunInfo::getRuntimePaths(int * size) "/bin/classic/jvm.dll", "/bin/client/jvm.dll", // TODO add jrockit here -#elif UNX +#elif defined(MACOSX) + "/lib/server/libjvm.dylib" +#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 "/jrockit/libjvm.so" #endif - }; *size = sizeof(ar) / sizeof (char*); return ar; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 41c581637d7f..57c19ee78fc5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -97,6 +97,7 @@ char const *g_arCollectDirs[] = { char const *g_arSearchPaths[] = { #ifdef MACOSX "", + "Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin", "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/" #else "", |