You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2019/07/27 15:50:09 UTC
svn commit: r1863875 - in /openoffice/trunk/main/jvmfwk:
distributions/OpenOfficeorg/ plugins/sunmajor/javaenvsetup/
plugins/sunmajor/pluginlib/
Author: damjan
Date: Sat Jul 27 15:50:09 2019
New Revision: 1863875
URL: http://svn.apache.org/viewvc?rev=1863875&view=rev
Log:
Add support for the AdoptOpenJDK Java distribution
(https://adoptopenjdk.net/).
Closes #i128157# Add support for AdoptOpenJDK JVM's.
Patch by: me
Modified:
openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
openoffice/trunk/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
Modified: openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml?rev=1863875&r1=1863874&r2=1863875&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml (original)
+++ openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml Sat Jul 27 15:50:09 2019
@@ -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>
Modified: openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml?rev=1863875&r1=1863874&r2=1863875&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml (original)
+++ openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml Sat Jul 27 15:50:09 2019
@@ -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>
Modified: openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml?rev=1863875&r1=1863874&r2=1863875&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml (original)
+++ openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml Sat Jul 27 15:50:09 2019
@@ -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>
Modified: openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml?rev=1863875&r1=1863874&r2=1863875&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml (original)
+++ openoffice/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml Sat Jul 27 15:50:09 2019
@@ -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>
Modified: openoffice/trunk/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx?rev=1863875&r1=1863874&r2=1863875&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx (original)
+++ openoffice/trunk/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx Sat Jul 27 15:50:09 2019
@@ -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);
Modified: openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx?rev=1863875&r1=1863874&r2=1863875&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx (original)
+++ openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx Sat Jul 27 15:50:09 2019
@@ -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()