diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-29 14:25:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-29 14:25:55 +0200 |
| commit | 8541b178f4155c8d72a876245433a1aaf3d2634f (patch) | |
| tree | 2600b56d118f94b5e81cc4fa657d65446096173a /jvmfwk | |
| parent | ba81e5c6bd420b41a84ade6ccd774011a8089f7f (diff) | |
Support Azul Zulu JRE on Linux and Mac OS X, too
Change-Id: I317506319b91daf006a0ba79874ff265ba6ed4da
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 c84525e5141d..5809522518e6 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -59,7 +59,8 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/server/jvm.dll" // needed by Azul #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 |