[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - jvmfwk/distributions jvmfwk/plugins

[Stephan Bergmann]

 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |    3 +++
 jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx         |    3 ++-
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx       |    1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 129e0fbcdd00aa6d5f6096a90e561c846cbf54b5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 27 17:29:39 2015 +0200

    Support Azul Zulu JRE (at least on Windows)
    
    (<http://www.azulsystems.com/products/zulu/downloads> also offers it for Linux
    and Mac OS X, so it could be added to more javavendors_*.xml if need be; I only
    checked it actually works with a Windows 64-bit LO build)
    
    Change-Id: If549a0d5bf1459eba2f6ba2bd545cfd55a20cea6
    (cherry picked from commit 0f95f8ffd7a3685ca53876005a9c96f2e2e7bc99)
    Reviewed-on: https://gerrit.libreoffice.org/15971
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 4f76089..b1ad4e4 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -32,6 +32,9 @@
   <vendor name="IBM Corporation">
     <minVersion>1.5.0</minVersion>
   </vendor>
+  <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 549f7d5..5809522 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -55,7 +55,8 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
         "/bin/client/jvm.dll",
         "/bin/hotspot/jvm.dll",
         "/bin/classic/jvm.dll",
-    "/bin/jrockit/jvm.dll"
+        "/bin/jrockit/jvm.dll",
+        "/bin/server/jvm.dll" // needed by Azul
 #elif defined UNX
 #ifdef MACOSX
         "/../../../../../Frameworks/JavaVM.framework/JavaVM", //as of  1.6.0_22
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index ee4d6d0..a1ee9ff 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -50,6 +50,7 @@ BEGIN_VENDOR_MAP()
     VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
     VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
 #endif
+    VENDOR_MAP_ENTRY("Azul Systems, Inc.", OtherInfo)
 END_VENDOR_MAP()