Skip to content

Commit 97aa882

Browse files
authored
Merge pull request #176 from NASAWorldWind/java11-jogl
Java11 jogl
2 parents 1099819 + 9c79634 commit 97aa882

File tree

670 files changed

+10721
-6892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

670 files changed

+10721
-6892
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ testClasses
1515
worldwind.jar
1616

1717
worldwindx.jar
18+
/dist/
19+
/nbproject/private/
20+

.travis.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,26 @@ language: java
66

77
# Configure the build to use Oracle JDK 9
88
jdk:
9-
- oraclejdk9
9+
- oraclejdk11
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:
1313
apt:
1414
packages:
1515
- ant-optional
16-
16+
17+
services:
18+
- xvfb
19+
1720
# Use xvfb to run tests that require a GUI and give it some time to start
1821
# before_script:
19-
# - "export DISPLAY=:99.0"
20-
# - "sh -e /etc/init.d/xvfb start"
21-
# - sleep 3
22+
# - "export DISPLAY=:99.0"
23+
# - "sh -e /etc/init.d/xvfb start"
24+
# - sleep 3
2225

2326
# Build the project
2427
script:
25-
- ant assemble
28+
- ant -f release-build.xml
2629

2730
# Deployment has been disabled in preparation for the WorldWind project suspension on April 5, 2019
2831
#deploy:

GDAL_README.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,12 @@ GDAL bundle in the sub-folders. Therefore we recommend one of two options:
4141
1) Place the GDAL libraries in the folder "lib-external/gdal".
4242
2) Place the GDAL libraries in the application's root folder.
4343

44+
When running WWJ with GDAL on Java 9+, WWJ can no longer automatically locate GDAL bundles during startup. Applications
45+
must either place the GDAL libraries in the root folder, or specify a VM argument to the GDAL bundle
46+
(e.g. -Djava.library.path=lib-external/gdal)
4447

4548
Deploying with Java Web Start
4649
------------------------------------------------------------
4750

4851
Instructions for using the WorldWind GDAL libraries with a Java Web Start application are available at
49-
https://goworldwind.org/getting-started/
52+
https://worldwind.arc.nasa.gov/java/get-started/

WorldWind.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module relativePaths="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="false">
3+
<component name="NewModuleRootManager">
44
<output url="file://$MODULE_DIR$/classes" />
55
<output-test url="file://$MODULE_DIR$/testClasses" />
66
<exclude-output />
@@ -12,8 +12,8 @@
1212
</content>
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
15-
<orderEntry type="library" name="jogl" level="project" />
1615
<orderEntry type="library" name="gdal" level="project" />
1716
<orderEntry type="library" scope="TEST" name="junit4" level="project" />
17+
<orderEntry type="library" name="jogl-gluegen-worldwind231" level="project" />
1818
</component>
1919
</module>

0 commit comments

Comments
 (0)