Merge pull request #178 from NASAWorldWind/jogl-update

Jogl update
NASAWorldWind · Sep 11, 2019 · 1e4713e · 1e4713e
2 parents bfaf136 + 93f4953
commit 1e4713e
Show file tree

Hide file tree

Showing 21 changed files with 77 additions and 3,437 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ language: java
 
 # Configure the build to use Oracle JDK 9
 jdk:
-  - oraclejdk11
+  - openjdk11
 
 # Install the Ant JUnit package, which is missing from the Travis CI environment. See the Travis documentation: https://docs.travis-ci.com/user/installing-dependencies/#Adding-APT-Packages
 addons:
@@ -17,17 +17,11 @@ addons:
 services:
   - xvfb
 
-# Use xvfb to run tests that require a GUI and give it some time to start
-# before_script:
-#  - "export DISPLAY=:99.0"
-#  - "sh -e /etc/init.d/xvfb start"
-#  - sleep 3
-
 # Build the project
 script:
   - ant -f release-build.xml
 
-# Deployment has been disabled in preparation for the WorldWind project suspension on April 5, 2019
+# Deployment to be re-instated when WWJ is released.
 #deploy:
 #  # Publish API documentation to GitHub Pages
 #  - provider: pages

diff --git a/gluegen-rt-natives-linux-amd64.jar b/gluegen-rt-natives-linux-amd64.jar
diff --git a/gluegen-rt-natives-macosx-universal.jar b/gluegen-rt-natives-macosx-universal.jar
diff --git a/gluegen-rt-natives-windows-amd64.jar b/gluegen-rt-natives-windows-amd64.jar
diff --git a/gluegen-rt.jar b/gluegen-rt.jar
diff --git a/gluegen.LICENSE.txt b/gluegen.LICENSE.txt
@@ -23,7 +23,7 @@ by the generated and deployed GlueGen binaries.
 L.1) The GlueGen source tree contains code from the JogAmp Community
      which is covered by the Simplified BSD 2-clause license:
 
-   Copyright 2010 JogAmp Community. All rights reserved.
+   Copyright 2010 - 2019 JogAmp Community. All rights reserved.
 
    Redistribution and use in source and binary forms, with or without modification, are
    permitted provided that the following conditions are met:

diff --git a/jogl-all-natives-linux-amd64.jar b/jogl-all-natives-linux-amd64.jar
diff --git a/jogl-all-natives-macosx-universal.jar b/jogl-all-natives-macosx-universal.jar
diff --git a/jogl-all-natives-windows-amd64.jar b/jogl-all-natives-windows-amd64.jar
diff --git a/jogl-all.jar b/jogl-all.jar
diff --git a/lib-external/jogl-gluegen/build-jogl.sh b/lib-external/jogl-gluegen/build-jogl.sh
@@ -1,12 +1,6 @@
 set -x
 
-cp patch/MacOSXJAWTWindow.java jogl/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx
-cp patch/MacOSXCGLContext.java jogl/src/jogl/classes/jogamp/opengl/macosx/cgl
-cp patch/GLCanvas.java jogl/src/jogl/classes/com/jogamp/opengl/awt
-
 cd jogl/make
 ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=dummy.jar
 
-./jogl/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java
-
 
diff --git a/lib-external/jogl-gluegen/linux-copy-jogl.sh b/lib-external/jogl-gluegen/linux-copy-jogl.sh
@@ -2,7 +2,10 @@ set -x
 
 cp gluegen/build/gluegen-rt-natives-linux-amd64.jar ../..
 cp gluegen/build/gluegen-rt.jar ../..
+cp gluegen/LICENSE.txt ../../gluegen.LICENSE.txt
+
 cp jogl/build/jar/jogl-all.jar ../..
 cp jogl/build/jar/jogl-all-natives-linux-amd64.jar ../..
+cp jogl/LICENSE.txt ../../jogl.LICENSE.txt
 
 
diff --git a/lib-external/jogl-gluegen/osx-copy-jogl.sh b/lib-external/jogl-gluegen/osx-copy-jogl.sh
@@ -1,8 +1,9 @@
 set -x 
 
 cp gluegen/build/gluegen-rt-natives-macosx-universal.jar ../..
-cp gluegen/build/gluegen-rt.jar ../..
-cp jogl/build/jar/jogl-all.jar ../..
+# The other artifacts are copied by the Linux build.
+# cp gluegen/build/gluegen-rt.jar ../..
+# cp jogl/build/jar/jogl-all.jar ../..
 cp jogl/build/jar/jogl-all-natives-macosx-universal.jar ../..