diff options
author | Sven Gothel <[email protected]> | 2019-08-19 11:57:04 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-08-19 11:57:04 +0200 |
commit | ddd64dc3eb0172654aff5a4c61a389b23d92d0e3 (patch) | |
tree | c49d98ecc51bcbfe2dfb0982465313fb390fe754 | |
parent | c834ffbeffe454f758089c6ee17f8863acc3e7c5 (diff) |
Bug 1363: Java 11: (Hack) Inject OpenJFX [basic, graphics] into CLASSPATH
The OpenJDK JAR files within this folder
only conveniently serve to compile JOGL on all platforms.
They were extracted from Debian 10's 'libopenjfx-java' package version 11.0.2+1-1
See copyright (also extracted from package above) for (c) details.
Note: This is similar to our SWT injection etc.
-rw-r--r-- | make/build-common.xml | 20 | ||||
-rw-r--r-- | make/lib/openjfx/11/README.txt | 6 | ||||
-rw-r--r-- | make/lib/openjfx/11/copyright | 165 | ||||
-rw-r--r-- | make/lib/openjfx/11/javafx-base-11.jar | bin | 0 -> 845590 bytes | |||
-rw-r--r-- | make/lib/openjfx/11/javafx-graphics-11.jar | bin | 0 -> 5012429 bytes |
5 files changed, 191 insertions, 0 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index a17b7ca6f..97b0699fd 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -486,18 +486,24 @@ <path id="swt_gluegen.classpath"> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> </path> <!-- JOGL Compilation .. --> <path id="nativewindow_gluegen.classpath"> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> <path refid="nativewindow_all_atoms.classpath" /> </path> <path id="nativewindow_gluegen_joal.classpath"> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> <pathelement location="${joal.jar}" /> <path refid="nativewindow_all_atoms.classpath" /> </path> @@ -506,6 +512,8 @@ <pathelement location="${android.jar}" /> <pathelement location="${gluegen-rt-android.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> <path refid="nativewindow_all_atoms.classpath" /> </path> @@ -514,6 +522,8 @@ <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${plugin3.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> <path refid="nativewindow_all_atoms.classpath" /> <path refid="jogl_all_atoms.classpath" /> </path> @@ -523,6 +533,8 @@ <pathelement location="${gluegen-rt-android.jar}" /> <pathelement location="${plugin3.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> <path refid="nativewindow_all_atoms.classpath" /> <path refid="jogl_all_atoms.classpath" /> </path> @@ -537,6 +549,8 @@ <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${gluegen-test-util.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> <path refid="nativewindow_all_atoms.classpath" /> <path refid="jogl_all_atoms.classpath" /> <path refid="newt_all_atoms.classpath" /> @@ -551,6 +565,8 @@ <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${gluegen-test-util.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> <path refid="nativewindow_all_atoms.classpath" /> <path refid="jogl_all_atoms.classpath" /> <path refid="newt_all_atoms.classpath" /> @@ -567,6 +583,8 @@ <pathelement location="${gluegen-rt-android.jar}" /> <pathelement location="${gluegen-test-util.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> <path refid="nativewindow_all_atoms.classpath" /> <path refid="jogl_all_atoms.classpath" /> <path refid="newt_all_atoms.classpath" /> @@ -578,6 +596,8 @@ <pathelement location="${android.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> + <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> <pathelement location="${jogl-all.jar}" /> <pathelement location="${oculusvr.jar}" /> </path> diff --git a/make/lib/openjfx/11/README.txt b/make/lib/openjfx/11/README.txt new file mode 100644 index 000000000..255300c62 --- /dev/null +++ b/make/lib/openjfx/11/README.txt @@ -0,0 +1,6 @@ +The OpenJDK JAR files within this folder +only conveniently serve to compile JOGL on all platforms. + +They were extracted from Debian 10's 'libopenjfx-java' package version 11.0.2+1-1 + +See copyright (also extracted from package above) for (c) details. diff --git a/make/lib/openjfx/11/copyright b/make/lib/openjfx/11/copyright new file mode 100644 index 000000000..7c27bb54f --- /dev/null +++ b/make/lib/openjfx/11/copyright @@ -0,0 +1,165 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: OpenJFX +Source: http://hg.openjdk.java.net/openjfx/8u-dev/rt/ +Files-Excluded: .hg* + .classpath + .project + .idea + apps/samples + modules/javafx.graphics/src/main/native-iio/libjpeg* + modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/* + modules/javafx.web/src/main/native/Source/JavaScriptCore/Scripts/jsmin.py + modules/javafx.web/src/main/native/Tools/TestResultServer/static-dashboards/dygraph-combined.js + +Files: * +Copyright: 2014-2018, Oracle Inc. +License: GPL-2 with Classpath exception + +Files: apps/performance/GraphicsPerformance/* + apps/scenebuilder/* + apps/toys/FX8-3DFeatures/src/fx83dfeatures/utils3d/Vec2f.java + apps/toys/FX8-3DFeatures/src/fx83dfeatures/utils3d/Vec3d.java + apps/toys/FX8-3DFeatures/src/fx83dfeatures/utils3d/Vec3f.java +Copyright: 2008-2018, Oracle Inc. +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + - Neither the name of Oracle Corporation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/* +Copyright: 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + 1995-1998, 2000-2002 Free Software Foundation, Inc + 1999-2003 Erik Walthinsen <[email protected]> + 2000-2011 Wim Taymans <[email protected]> + 2001-2005 Andy Wingo <[email protected]> + 2001-2004 Ronald Bultje <[email protected]> + 2001 Thomas Nyberg <[email protected]> + 2001 RidgeRun (http://www.ridgerun.com/) + 2003-2004, Mark Borgerding + 2003-2007 David Schleef <[email protected]> + 2003-2004 Benjamin Otte <[email protected]> + 2003-2007 Julien Moutte <[email protected]> + 2003 Leif Johnson <[email protected]> + 2004-2006 Zaheer Abbas Merali <[email protected]> + 2004-2005 Thomas Vander Stichele <[email protected]> + 2005-20011 Tim-Philipp Müller <[email protected]> + 2005-2009 Jan Schmidt <[email protected]> + 2005 Ross Burton <[email protected]> + 2005 Sebastien Moutte <[email protected]> + 2005-2010 Stefan Kost <[email protected]> + 2010 Brandon Lewis <[email protected]> + 2006-2010 Edward Hervey <[email protected]> + 2006 Edgard Lima <[email protected]> + 2006 Josep Torra <[email protected]> + 2006 Mathieu Garcia <[email protected]> + 2006-2010 Nokia Corporation + 2006 Ryan Lortie <[email protected]> + 2006-2010 Sebastian Droege <[email protected]> + 2007-2009 Pioneers of the Inevitable <[email protected]> + 2007 Peter Kjellerstedt <[email protected]> + 2008-2011 Thiago Santos <[email protected]> + 2008-2010 Mark Nauwelaerts <[email protected]> + 2008 Ole Andre Vadla Ravnas <[email protected]> + 2009 Axis Communications <[email protected]> + 2009 STEricsson <[email protected]> + 2009 Texas Instruments, Inc + 2010-2011 Alexey Chernov <[email protected]> + 2010 Arun Raghavan <[email protected]> + 2010 Collabora Multimedia + 2010 Fluendo S.A. <[email protected]> + 2011-2013, Oracle +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + . + On Debian systems, the full text of the LGPL-2 license + can be found in the file '/usr/share/common-licenses/LGPL-2' + +Files: modules/javafx.web/src/main/native/* +Copyright: 1995-2013, various contributors +License: custom-licence + LGPL-2+ or BSD-2-clause or BSD-3-clause + . + This is an embedded copy of the WebKit rendering engine, please see + the debian/copyright file of the webkitgtk or qtwebkit packages for a detailed + list of the copyright holders and the applicable licenses. + +Files: debian/* +Copyright: 2014-2018, Emmanuel Bourg <[email protected]> +License: Apache-2.0 + On Debian systems, the full text of the Apache-2.0 license + can be found in the file '/usr/share/common-licenses/Apache-2.0' + +License: GPL-2 with Classpath exception + This code is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License version 2 only, as + published by the Free Software Foundation. Oracle designates this + particular file as subject to the "Classpath" exception as provided + by Oracle in the LICENSE file that accompanied this code. + . + This code is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + version 2 for more details (a copy is included in the LICENSE file that + accompanied this code). + . + You should have received a copy of the GNU General Public License version + 2 along with this work; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + . + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + or visit www.oracle.com if you need additional information or have any + questions. + . + On Debian systems, the complete text of the GNU General Public License + can be found in `/usr/share/common-licenses/GPL-2'. + . + "CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + . + Certain source files distributed by Oracle, Inc. are subject + to the following clarification and special exception to the GPL, but + only where Oracle has expressly included in the particular source file's + header the words "Oracle designates this particular file as subject to + the "Classpath" exception as provided by Oracle in the LICENSE file that + accompanied this code." + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole combination. + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. + If you modify this library, you may extend this exception to your version + of the library, but you are not obligated to do so. If you do not wish + to do so, delete this exception statement from your version. diff --git a/make/lib/openjfx/11/javafx-base-11.jar b/make/lib/openjfx/11/javafx-base-11.jar Binary files differnew file mode 100644 index 000000000..4079d31c8 --- /dev/null +++ b/make/lib/openjfx/11/javafx-base-11.jar diff --git a/make/lib/openjfx/11/javafx-graphics-11.jar b/make/lib/openjfx/11/javafx-graphics-11.jar Binary files differnew file mode 100644 index 000000000..0ed316ec9 --- /dev/null +++ b/make/lib/openjfx/11/javafx-graphics-11.jar |