Skip to content

Commit

Permalink
JOGL refresh (NASAWorldWind#199)
Browse files Browse the repository at this point in the history
  • Loading branch information
markpet49 authored Jun 18, 2020
1 parent 18a1936 commit d985e8e
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 6 deletions.
Binary file modified gluegen-rt-natives-linux-amd64.jar
Binary file not shown.
Binary file modified gluegen-rt-natives-macosx-universal.jar
Binary file not shown.
Binary file modified gluegen-rt-natives-windows-amd64.jar
Binary file not shown.
Binary file modified gluegen-rt.jar
Binary file not shown.
23 changes: 21 additions & 2 deletions gluegen.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
===============================================

<http://harmony.apache.org/>

Expand All @@ -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.
===============================================

<https://avro.apache.org/>

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

<https://github.com/apache/avro/blob/master/lang/java/avro/src/main/java/org/apache/avro/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

Expand Down
Binary file modified jogl-all-natives-linux-amd64.jar
Binary file not shown.
Binary file modified jogl-all-natives-macosx-universal.jar
Binary file not shown.
Binary file modified jogl-all-natives-windows-amd64.jar
Binary file not shown.
Binary file modified jogl-all.jar
Binary file not shown.
8 changes: 4 additions & 4 deletions jogl.README.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 29 additions & 0 deletions refresh-jogl.py
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit d985e8e

Please sign in to comment.