diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-10-20 10:38:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-10-20 15:21:58 +0200 |
| commit | 18bdf78e156f3cd1e6ccbb3ae28e919583bac70c (patch) | |
| tree | 6e61fba59a53a57c766d0c9b8553ac7cbaedc216 /jvmfwk | |
| parent | c99b73c16b725ec2bf2f5417f28d1688c3322d7d (diff) | |
Azul is just another OpenJDK variant
...so there was no good reason for 0f95f8ffd7a3685ca53876005a9c96f2e2e7bc99
"Support Azul Zulu JRE (at least on Windows)" to map it to OtherInfo rather than
SunInfo. (That way, it benefits from SunInfo::compareVersions's proper
implementation, unlike OtherInfo::compareVersions which always returns 0.
Although trying to add e.g. the too-old Java 7
<https://cdn.azul.com/zulu/bin/zulu7.50.0.11-ca-jdk7.0.322-linux_x64.tar.gz>
would already have failed before this commit due to a
java.lang.UnsupportedClassVersionError when executing the JREProperties code.)
This also reverts all the "needed by Azul" additions in
OtherInfo::getRuntimePaths; it is unlikely that any of the other JREs using
OtherInfo silently also benefited from them, and JREs of unknown vendor use
SunInfo (which does have those two paths already, as they are not only needed by
Azul there).
Change-Id: I4af9b4b9e65cd2346011522c105cfc62ec59f552
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123874
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 6 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 5c7f3ba9afc8..578c51f0b0cc 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -52,12 +52,10 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll", - "/bin/jrockit/jvm.dll", - "/bin/server/jvm.dll" // needed by Azul + "/bin/jrockit/jvm.dll" #elif defined UNX #ifdef MACOSX - "/../../../../../Frameworks/JavaVM.framework/JavaVM", //as of 1.6.0_22 - "/lib/server/libjvm.dylib" // needed by Azul + "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22 #else "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index 183075e0c9af..b68152e80906 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -40,6 +40,7 @@ VendorSupportMapEntry const gVendorMap[] ={ VENDOR_MAP_ENTRY<SunInfo>("Oracle Corporation"), VENDOR_MAP_ENTRY<SunInfo>("AdoptOpenJdk"), VENDOR_MAP_ENTRY<SunInfo>("Amazon.com Inc."), + VENDOR_MAP_ENTRY<SunInfo>("Azul Systems, Inc."), #ifndef MACOSX VENDOR_MAP_ENTRY<OtherInfo>("IBM Corporation"), VENDOR_MAP_ENTRY<OtherInfo>("Blackdown Java-Linux Team"), @@ -47,7 +48,6 @@ VendorSupportMapEntry const gVendorMap[] ={ VENDOR_MAP_ENTRY<GnuInfo>("Free Software Foundation, Inc."), VENDOR_MAP_ENTRY<OtherInfo>("The FreeBSD Foundation"), #endif - VENDOR_MAP_ENTRY<OtherInfo>("Azul Systems, Inc."), {nullptr, nullptr, nullptr} }; } |