diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-29 14:25:23 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-06-01 20:37:34 +0000 |
commit | ee6f1584e4fe2691a428d30ecd08fd371dec0e62 (patch) | |
tree | 996d308a0703f5e8d5128cfdc8de738b0a2fbc77 /jvmfwk | |
parent | cefea9d05085bfc0e485fae5d927544a9e07739c (diff) |
Support Azul Zulu JRE on Linux and Mac OS X, too
Change-Id: I317506319b91daf006a0ba79874ff265ba6ed4da
(cherry picked from commit 8541b178f4155c8d72a876245433a1aaf3d2634f)
Reviewed-on: https://gerrit.libreoffice.org/15972
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 3 | ||||
-rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 5 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 1c8c8bd32cdc..943b2ce1bf45 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -41,6 +41,9 @@ <vendor name="BEA Systems, Inc."> <minVersion>1.5.0</minVersion> </vendor> + <vendor name="Azul Systems, Inc."> + <minVersion>1.6.0</minVersion> + </vendor> </vendorInfos> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index e2925ee8aaaa..ee5d093055b0 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -32,6 +32,9 @@ <vendor name="Oracle Corporation"> <minVersion>1.7.0</minVersion> </vendor> - </vendorInfos> + <vendor name="Azul Systems, Inc."> + <minVersion>1.6.0</minVersion> + </vendor> +</vendorInfos> </javaSelection> diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 07f9c0c05523..549f7d50e35b 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -58,7 +58,8 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/jrockit/jvm.dll" #elif defined UNX #ifdef MACOSX - "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22 + "/../../../../../Frameworks/JavaVM.framework/JavaVM", //as of 1.6.0_22 + "/lib/server/libjvm.dylib" // needed by Azul #else "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 |