diff --git a/gluegen-rt-natives-linux-amd64.jar b/gluegen-rt-natives-linux-amd64.jar index 70716d0229..826d6d6fa9 100644 Binary files a/gluegen-rt-natives-linux-amd64.jar and b/gluegen-rt-natives-linux-amd64.jar differ diff --git a/gluegen-rt-natives-macosx-universal.jar b/gluegen-rt-natives-macosx-universal.jar index 38fd2e7df4..79bd94ee67 100644 Binary files a/gluegen-rt-natives-macosx-universal.jar and b/gluegen-rt-natives-macosx-universal.jar differ diff --git a/gluegen-rt-natives-windows-amd64.jar b/gluegen-rt-natives-windows-amd64.jar index c2d949926d..2d1fe14112 100644 Binary files a/gluegen-rt-natives-windows-amd64.jar and b/gluegen-rt-natives-windows-amd64.jar differ diff --git a/gluegen-rt.jar b/gluegen-rt.jar index ac720c3e6b..aef08ef85c 100644 Binary files a/gluegen-rt.jar and b/gluegen-rt.jar differ diff --git a/gluegen.LICENSE.txt b/gluegen.LICENSE.txt index 4ab32a1f75..30a5756192 100644 --- a/gluegen.LICENSE.txt +++ b/gluegen.LICENSE.txt @@ -140,8 +140,8 @@ L.3) The GlueGen source tree contains CGRAM http://www.antlr.org/grammar/cgram/, A.1) The GlueGen source tree contains code from The Apache Software Foundation which is covered by the Apache License Version 2.0 - Apache Harmony - Open Source Java SE - ===================================== +A.1.1) Apache Harmony - Open Source Java SE + =============================================== @@ -157,6 +157,25 @@ A.1) The GlueGen source tree contains code from The Apache Software Foundation - src/java/com/jogamp/common/net/Uri.java (derived from java.net.URI.Helper and heavily modified) +A.1.2) Apache Avro - A data serialization system. + =============================================== + + + + Copyright 2010-2019 The Apache Software Foundation + + Apache License Version 2.0, January 2004 + http://www.apache.org/licenses/LICENSE-2.0 + Or within this repository: doc/licenses/Apache.LICENSE-2.0 + + Files: + - src/java/com/jogamp/common/util/WeakIdentityHashMap.java + + + Taken as commit 70260919426f89825ca148f5ee815f3b2cf4764d + and using our JogAmp 'New BSD 2-Clause License' since migration. + + A.2) The GlueGen source tree contains code from Ben Mankin, a.k.a 'Shevek', which is covered by the Apache License Version 2.0 diff --git a/jogl-all-natives-linux-amd64.jar b/jogl-all-natives-linux-amd64.jar index f76fca8228..55953e236b 100644 Binary files a/jogl-all-natives-linux-amd64.jar and b/jogl-all-natives-linux-amd64.jar differ diff --git a/jogl-all-natives-macosx-universal.jar b/jogl-all-natives-macosx-universal.jar index 198f4a16b2..124ef6d7e5 100644 Binary files a/jogl-all-natives-macosx-universal.jar and b/jogl-all-natives-macosx-universal.jar differ diff --git a/jogl-all-natives-windows-amd64.jar b/jogl-all-natives-windows-amd64.jar index efd0264a22..4384250365 100644 Binary files a/jogl-all-natives-windows-amd64.jar and b/jogl-all-natives-windows-amd64.jar differ diff --git a/jogl-all.jar b/jogl-all.jar index 28f2f87a76..dbbde557f5 100644 Binary files a/jogl-all.jar and b/jogl-all.jar differ diff --git a/jogl.README.txt b/jogl.README.txt index 7fb24a8f6c..3e024a4ca9 100644 --- a/jogl.README.txt +++ b/jogl.README.txt @@ -1,16 +1,16 @@ -Java (TM) Binding for the OpenGL (r) API, version 2.3 +Java (TM) Binding for the OpenGL (r) API, version 2.4 ----------------------------------------------------------------------------- This software is licensed as specified in the LICENSE.txt file. You must use this software in accordance with the terms under which the code is licensed. -This is build version 2.3.2, based on: +This is build version 2.4.0-rc-20200306, based on: branch origin/master - commit e794fc40ba723f2fca4ac892e873975fb393e007 + commit 0779f229b0e9538c640b18b9a4e095af1f5a35b3 -Instructions for unzipping Java Binding for the OpenGL API, version 2.3 +Instructions for unzipping Java Binding for the OpenGL API, version 2.4 ---------------------------------------------------------------------------------- After downloading and unzipping the zip file containing the diff --git a/refresh-jogl.py b/refresh-jogl.py new file mode 100755 index 0000000000..a2be16bb56 --- /dev/null +++ b/refresh-jogl.py @@ -0,0 +1,29 @@ +#!/usr/bin/python3 + +import sys +from pathlib import Path +import shutil + +# Script to update WWJ JOGL libs from a new jogamp-all-platforms.7z unpacked distribution. +# Example: ./refresh-jogl.py ../../downloads/jogamp-all-platforms/jar +if len(sys.argv)<2: + print('Usage: refresh-jogl.py [path to jars]') + sys.exit(1) + +srcPath=sys.argv[1] +jogl_jars=['gluegen-rt.jar','gluegen-rt-natives-linux-amd64.jar','gluegen-rt-natives-macosx-universal.jar','gluegen-rt-natives-windows-amd64.jar', \ + 'jogl-all.jar','jogl-all-natives-linux-amd64.jar','jogl-all-natives-macosx-universal.jar','jogl-all-natives-windows-amd64.jar'] +for jar in jogl_jars: + srcJar=srcPath+'/'+jar + destJar='./'+jar + print(srcJar, ' => ', destJar) + shutil.copyfile(srcJar,destJar) + +jogl_txts=['jogl.README.txt','jogl.LICENSE.txt','gluegen.LICENSE.txt'] +folderIdx=srcPath.rfind('/') +txtPath=srcPath[:folderIdx] +for txt in jogl_txts: + srcTxt=txtPath+'/'+txt + destTxt='./'+txt + print(srcTxt, ' => ', destTxt) + shutil.copyfile(srcTxt,destTxt)