jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml | 40 ++++----
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 58 ++++++-------
jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 40 ++++----
jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml | 28 ++----
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 40 ++++----
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 1
solenv/gbuild/gbuild.mk | 2
7 files changed, 101 insertions(+), 108 deletions(-)
New commits:
commit 132ecafb310e43ca9bb3623ced6c78d13cda4b6c
Author: himajin100000 <himajin100...@gmail.com>
AuthorDate: Sat Jan 19 14:25:50 2019 +0900
Commit: Vasily Melenchuk <vasily.melenc...@cib.de>
CommitDate: Tue Jan 22 07:34:33 2019 +0300
Support AdoptOpenJDK
Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 13089bca3000..b05b6c797ea8 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -16,25 +16,23 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
- <updated>2012-07-12</updated>
-
- <vendorInfos>
- <vendor name="Oracle Corporation">
- <minVersion>1.7.0</minVersion>
- </vendor>
- <vendor name="Sun Microsystems Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="The FreeBSD Foundation">
- <minVersion>1.6.0</minVersion>
- </vendor>
- <vendor name="Free Software Foundation, Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
- </vendorInfos>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";>
+ <updated>2019-01-19</updated>
+ <vendorInfos>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.7.0</minVersion>
+ </vendor>
+ <vendor name="Sun Microsystems Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="The FreeBSD Foundation">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+ <vendor name="Free Software Foundation, Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
+ </vendorInfos>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 943b2ce1bf45..b008bb1fc0f7 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -16,34 +16,32 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
- <updated>2013-05-02</updated>
-
- <vendorInfos>
- <vendor name="Sun Microsystems Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="Oracle Corporation">
- <minVersion>1.6.0</minVersion>
- </vendor>
- <vendor name="IBM Corporation">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="Blackdown Java-Linux Team">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="Free Software Foundation, Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="BEA Systems, Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="Azul Systems, Inc.">
- <minVersion>1.6.0</minVersion>
- </vendor>
- </vendorInfos>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";>
+ <updated>2019-01-19</updated>
+ <vendorInfos>
+ <vendor name="Sun Microsystems Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+ <vendor name="IBM Corporation">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="Blackdown Java-Linux Team">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="Free Software Foundation, Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="BEA Systems, Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="Azul Systems, Inc.">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
+ </vendorInfos>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 61ab2e29a846..1fe7547d2919 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -16,25 +16,23 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
- <updated>2013-04-09</updated>
-
- <vendorInfos>
- <vendor name="Oracle Corporation">
- <minVersion>1.7.0</minVersion>
- </vendor>
- <vendor name="Apple Computer, Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="Apple Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="Azul Systems, Inc.">
- <minVersion>1.6.0</minVersion>
- </vendor>
-</vendorInfos>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";>
+ <updated>2019-01-19</updated>
+ <vendorInfos>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.7.0</minVersion>
+ </vendor>
+ <vendor name="Apple Computer, Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="Apple Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="Azul Systems, Inc.">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
+ </vendorInfos>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index c7b0568c2d18..7771d81527df 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -16,19 +16,17 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
- <updated>2011-01-07</updated>
-
- <vendorInfos>
- <vendor name="Oracle Corporation">
- <minVersion>1.7.0</minVersion>
- </vendor>
- <vendor name="Sun Microsystems Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
- </vendorInfos>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";>
+ <updated>2019-01-19</updated>
+ <vendorInfos>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.7.0</minVersion>
+ </vendor>
+ <vendor name="Sun Microsystems Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
+ </vendorInfos>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 330461094180..429831121f7b 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -16,25 +16,23 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
- <updated>2013-05-02</updated>
-
- <vendorInfos>
- <vendor name="Oracle Corporation">
- <minVersion>1.6.0</minVersion>
- </vendor>
- <vendor name="Sun Microsystems Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="IBM Corporation">
- <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="Azul Systems, Inc.">
- <minVersion>1.6.0</minVersion>
- </vendor>
- </vendorInfos>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0";>
+ <updated>2019-01-19</updated>
+ <vendorInfos>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+ <vendor name="Sun Microsystems Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="IBM Corporation">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="Azul Systems, Inc.">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
+ </vendorInfos>
</javaSelection>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index a08b237b62cd..afe51216a334 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -41,6 +41,7 @@ BEGIN_VENDOR_MAP()
#endif
VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
+ VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
#ifndef MACOSX
VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
commit 4173966e05134b1ebf18f0d8cfaa9b3f50beccbb
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Aug 17 13:35:58 2016 +0200
Commit: Vasily Melenchuk <vasily.melenc...@cib.de>
CommitDate: Mon Jan 21 12:51:49 2019 +0300
"make debug=t" enables debuginfo again
...which had inadvertently been broken with
99db9f2295eb9a8b3288df9798a292b8d6e1b854 "Make --enable-symbols orthogonal
to
--enable-debug/-dbgutil"
Change-Id: I3962aa8c67426f3aebc5ad746f7ac281c68d941a
(cherry picked from commit 62c4a8aacf76771e97a8da35096e6ad69a11979a)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 04056cd136c8..5b81c37549cf 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -87,12 +87,14 @@ gb_DEBUGLEVEL := 1
# make DEBUG=true should force -g
ifeq ($(origin DEBUG),command line)
ENABLE_DEBUGINFO_FOR := all
+ENABLE_SYMBOLS := TRUE
endif
endif
ifneq ($(strip $(debug)),)
gb_DEBUGLEVEL := 1
ifeq ($(origin debug),command line)
ENABLE_DEBUGINFO_FOR := all
+ENABLE_SYMBOLS := TRUE
endif
endif
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
