You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/08/05 16:27:35 UTC
[openoffice] 01/02: Add support for the AdoptOpenJDK Java
distribution (https://adoptopenjdk.net/).
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO417
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 76c3a0c573cde39048d0726c858eb62004271068
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jul 27 15:50:09 2019 +0000
Add support for the AdoptOpenJDK Java distribution
(https://adoptopenjdk.net/).
Closes #i128157# Add support for AdoptOpenJDK JVM's.
Patch by: me
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1863875 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 2bf1cfb0fb5470896af21c2c584f53f556e1551b)
---
main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 6 +++++-
main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 7 ++++++-
main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml | 6 +++++-
main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 6 +++++-
main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 4 +++-
main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 1 +
6 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 33fe362..58c4cc8 100644
--- a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2012-10-06</updated>
+ <updated>2019-07-27</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
@@ -44,6 +44,9 @@
<vendor name="BEA Systems, Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJDK">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
<plugins>
@@ -53,5 +56,6 @@
<library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
</plugins>
</javaSelection>
diff --git a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 40bbdb1..60a4b27 100644
--- a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2013-01-01</updated>
+ <updated>2019-07-27</updated>
<vendorInfos>
<vendor name="Apple Computer, Inc.">
@@ -35,10 +35,15 @@
<vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJDK">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
+
<plugins>
<library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
<library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
+ <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
</plugins>
</javaSelection>
diff --git a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 1ceccd7..cb622ce 100644
--- a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2011-01-07</updated>
+ <updated>2019-07-27</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
@@ -32,10 +32,14 @@
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJDK">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
<plugins>
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
</plugins>
</javaSelection>
diff --git a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 04957ba..c86f017 100644
--- a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -23,7 +23,7 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2012-10-06</updated>
+ <updated>2019-07-27</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
@@ -35,11 +35,15 @@
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJDK">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
<plugins>
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
<library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
+ <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
</plugins>
</javaSelection>
diff --git a/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 0555319..1ae01c6 100644
--- a/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -120,6 +120,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
+ rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("AdoptOpenJDK"));
if ( ! (sVendor0.equals(pInfo->sVendor) == sal_True
|| sVendor1.equals(pInfo->sVendor) == sal_True
|| sVendor2.equals(pInfo->sVendor) == sal_True
@@ -128,7 +129,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
|| sVendor5.equals(pInfo->sVendor) == sal_True
|| sVendor6.equals(pInfo->sVendor) == sal_True
|| sVendor7.equals(pInfo->sVendor) == sal_True
- || sVendor8.equals(pInfo->sVendor) == sal_True))
+ || sVendor8.equals(pInfo->sVendor) == sal_True
+ || sVendor9.equals(pInfo->sVendor) == sal_True))
return 0;
rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 601a265..6eb493b 100644
--- a/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -51,6 +51,7 @@ BEGIN_VENDOR_MAP()
VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
+ VENDOR_MAP_ENTRY("AdoptOpenJDK", OtherInfo)
END_VENDOR_MAP()