Skip to content

Commit b4ba88b

Browse files
committed
Move to JDK 11 and latest JOGL 2.4 on Linux
1 parent fc44df9 commit b4ba88b

15 files changed

+71
-3433
lines changed

.travis.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ language: java
66

77
# Configure the build to use Oracle JDK 9
88
jdk:
9-
- oraclejdk11
9+
- openjdk11
1010

1111
# 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
1212
addons:
@@ -17,17 +17,11 @@ addons:
1717
services:
1818
- xvfb
1919

20-
# Use xvfb to run tests that require a GUI and give it some time to start
21-
# before_script:
22-
# - "export DISPLAY=:99.0"
23-
# - "sh -e /etc/init.d/xvfb start"
24-
# - sleep 3
25-
2620
# Build the project
2721
script:
2822
- ant -f release-build.xml
2923

30-
# Deployment has been disabled in preparation for the WorldWind project suspension on April 5, 2019
24+
# Deployment to be re-instated when WWJ is released.
3125
#deploy:
3226
# # Publish API documentation to GitHub Pages
3327
# - provider: pages

gluegen-rt-natives-linux-amd64.jar

-1 Bytes
Binary file not shown.

gluegen-rt.jar

3.19 KB
Binary file not shown.

gluegen.LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ by the generated and deployed GlueGen binaries.
2323
L.1) The GlueGen source tree contains code from the JogAmp Community
2424
which is covered by the Simplified BSD 2-clause license:
2525

26-
Copyright 2010 JogAmp Community. All rights reserved.
26+
Copyright 2010 - 2019 JogAmp Community. All rights reserved.
2727

2828
Redistribution and use in source and binary forms, with or without modification, are
2929
permitted provided that the following conditions are met:

jogl-all-natives-linux-amd64.jar

-1 Bytes
Binary file not shown.

jogl-all.jar

13.3 KB
Binary file not shown.
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
set -x
22

3-
cp patch/MacOSXJAWTWindow.java jogl/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx
4-
cp patch/MacOSXCGLContext.java jogl/src/jogl/classes/jogamp/opengl/macosx/cgl
5-
cp patch/GLCanvas.java jogl/src/jogl/classes/com/jogamp/opengl/awt
6-
73
cd jogl/make
84
ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=dummy.jar
95

10-
./jogl/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java
11-
126

lib-external/jogl-gluegen/linux-copy-jogl.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ set -x
22

33
cp gluegen/build/gluegen-rt-natives-linux-amd64.jar ../..
44
cp gluegen/build/gluegen-rt.jar ../..
5+
cp gluegen/LICENSE.txt ../../gluegen.LICENSE.txt
6+
57
cp jogl/build/jar/jogl-all.jar ../..
68
cp jogl/build/jar/jogl-all-natives-linux-amd64.jar ../..
9+
cp jogl/LICENSE.txt ../../jogl.LICENSE.txt
710

811

0 commit comments

Comments
 (0)