Author: mseidel Date: Sun Jul 28 11:04:20 2019 New Revision: 1863894 URL: http://svn.apache.org/viewvc?rev=1863894&view=rev Log: Merged r1863875 and r1863883 from trunk
Add support for the AdoptOpenJDK Java distribution (https://adoptopenjdk.net/). Closes #i128157# Add support for AdoptOpenJDK JVM's. Fix detection of Java versions > 1.8 Patches by: Damjan Modified: openoffice/branches/AOO42X/ (props changed) openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx Propchange: openoffice/branches/AOO42X/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jul 28 11:04:20 2019 @@ -9,4 +9,4 @@ /openoffice/branches/ia2:1417739-1541842 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617 -/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857222,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,185 9839,1860288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057,1863087-1863088,1863107,1863135,1863197,1863408,1863510,1863520,1863528,1863573-1863575,1863578,1863688,1863829-1863830,1863873,1863880 +/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857222,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,185 9839,1860288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057,1863087-1863088,1863107,1863135,1863197,1863408,1863510,1863520,1863528,1863573-1863575,1863578,1863688,1863829-1863830,1863873,1863875,1863880,1863883 Modified: openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml?rev=1863894&r1=1863893&r2=1863894&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml (original) +++ openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml Sun Jul 28 11:04:20 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/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml?rev=1863894&r1=1863893&r2=1863894&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml (original) +++ openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml Sun Jul 28 11:04:20 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/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml?rev=1863894&r1=1863893&r2=1863894&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml (original) +++ openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml Sun Jul 28 11:04:20 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/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml?rev=1863894&r1=1863893&r2=1863894&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml (original) +++ openoffice/branches/AOO42X/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml Sun Jul 28 11:04:20 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/branches/AOO42X/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx?rev=1863894&r1=1863893&r2=1863894&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx (original) +++ openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx Sun Jul 28 11:04:20 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/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx?rev=1863894&r1=1863893&r2=1863894&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx (original) +++ openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx Sun Jul 28 11:04:20 2019 @@ -75,6 +75,7 @@ char const* const* OtherInfo::getRuntime "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA Systems + "/lib/server/libjvm.so", // > 1.8 "/bin/classic/libjvm.so", // fallback for older for IBM Java "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java #endif @@ -102,7 +103,8 @@ char const* const* OtherInfo::getLibrary "/lib/" JFW_PLUGIN_ARCH "/classic", "/lib/" JFW_PLUGIN_ARCH "/jrockit", "/lib/" JFW_PLUGIN_ARCH "/native_threads", - "/lib/" JFW_PLUGIN_ARCH + "/lib/" JFW_PLUGIN_ARCH, + "/lib" // > 1.8 #endif }; Modified: openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx?rev=1863894&r1=1863893&r2=1863894&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx (original) +++ openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Sun Jul 28 11:04:20 2019 @@ -75,7 +75,8 @@ char const* const* SunInfo::getRuntimePa "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", - "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" + "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", + "/lib/server/libjvm.so" // > 1.8 #endif }; *size = sizeof(ar) / sizeof (char*); @@ -89,7 +90,8 @@ char const* const* SunInfo::getLibraryPa "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/native_threads", - "/lib/" JFW_PLUGIN_ARCH + "/lib/" JFW_PLUGIN_ARCH, + "/lib" // > 1.8 }; *size = sizeof(ar) / sizeof (char*); Modified: openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx?rev=1863894&r1=1863893&r2=1863894&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx (original) +++ openoffice/branches/AOO42X/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx Sun Jul 28 11:04:20 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()
