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

[Stephan Bergmann]

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

New commits:
commit 4498247e20492103c30b3a3a10891b9184fc41ad
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 29 14:25:23 2015 +0200

    Support Azul Zulu JRE on Linux and Mac OS X, too
    
    Change-Id: I317506319b91daf006a0ba79874ff265ba6ed4da
    (cherry picked from commit 8541b178f4155c8d72a876245433a1aaf3d2634f)

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 1c8c8bd..943b2ce 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 e2925ee..ee5d093 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 c84525e..5809522 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
commit da0f3ca21ec55a8a94b7818233ea1a8af4c2d560
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)

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 07f9c0c..c84525e 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()