Skip to content

Commit 1099819

Browse files
authored
Merge pull request #173 from NASAWorldWind/notice-update
Notice update
2 parents 73c712d + 0df5ff9 commit 1099819

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# Set up to run the Java build script per the Travis CI documentation
55
language: java
66

7-
# Configure the build to use Oracle JDK 8
7+
# Configure the build to use Oracle JDK 9
88
jdk:
9-
- oraclejdk8
9+
- oraclejdk9
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:
@@ -15,14 +15,14 @@ addons:
1515
- ant-optional
1616

1717
# Use xvfb to run tests that require a GUI and give it some time to start
18-
before_script:
19-
- "export DISPLAY=:99.0"
20-
- "sh -e /etc/init.d/xvfb start"
21-
- sleep 3
18+
# before_script:
19+
# - "export DISPLAY=:99.0"
20+
# - "sh -e /etc/init.d/xvfb start"
21+
# - sleep 3
2222

2323
# Build the project
2424
script:
25-
- ant build
25+
- ant assemble
2626

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

README.md

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
# WorldWind Java
44

5-
```
6-
Currently WorldWind is undergoing system evaluation. We will not be able to accept any software
7-
update requests. WorldWind users can continue to access the NASA servers and SDKs, available on
8-
Github. More information will be provided in the near future. If you have questions and/or
9-
concerns, please feel free to email at:
5+
## NASA Renews Commitment to WorldWind
6+
WorldWind has received renewed commitment from NASA for continued development and support. NASA will continue to release updates to the WorldWind SDKs, and will continue to make the WorldWind Servers accessible for all Users. We plan to make an announcement soon regarding a path forward for improved support of the WorldWind User & Developer communities.
7+
8+
If you have questions and/or concerns, please feel free to email at:
109

1110
worldwind-info@lists.nasa.gov
12-
```
11+
1312

1413
[![Build Status](https://travis-ci.com/NASAWorldWind/WorldWindJava.svg?branch=develop)](https://travis-ci.com/NASAWorldWind/WorldWindJava)
1514

@@ -27,13 +26,13 @@ Official WorldWind Java releases have the latest stable features, enhancements a
2726
- [GitHub Milestones](https://github.com/NASAWorldWind/WorldWindJava/milestones) documents upcoming releases and the development roadmap
2827
- [Travis CI](https://travis-ci.com/NASAWorldWind/WorldWindJava) provides continuous integration and build automation
2928

30-
## Run a Demo
31-
29+
## Run a Demo
30+
3231
###### From a Web Browser
33-
32+
3433
- [WorldWind Demo App](https://worldwind.arc.nasa.gov/java/latest/webstart/ApplicationTemplate.jnlp) shows WorldWind's basic capabilities
3534
- [Java Demos](https://goworldwind.org/demos) has a complete list of example apps
36-
35+
3736
###### From a Windows Development Environment
3837

3938
- Download and extract the [Latest Release](https://github.com/NASAWorldWind/WorldWindJava/releases/latest)
@@ -53,19 +52,19 @@ sh run-demo.bash
5352
```
5453

5554
###### Troubleshooting
56-
57-
WorldWind requires a modern graphics card with a current driver. Most display problems are caused by out-of-date
58-
graphics drivers. On Windows, visit your graphics card manufacturer's web site for the latest driver: NVIDIA, ATI or
59-
Intel. The drivers are typically under a link named Downloads or Support. If you're using a laptop, the latest drivers
55+
56+
WorldWind requires a modern graphics card with a current driver. Most display problems are caused by out-of-date
57+
graphics drivers. On Windows, visit your graphics card manufacturer's web site for the latest driver: NVIDIA, ATI or
58+
Intel. The drivers are typically under a link named Downloads or Support. If you're using a laptop, the latest drivers
6059
are found at the laptop manufacturer's web site.
6160

6261
## JOGL Native Binaries
6362

64-
JOGL performs runtime extraction of native binaries. Some deployment situations may not allow this because it extracts
65-
the binaries to the application user’s temp directory. Runtime extraction can be avoided by by modifying WorldWind
66-
Java's JOGL distribution to load native binaries directly from the library path instead of dynamically using the native
63+
JOGL performs runtime extraction of native binaries. Some deployment situations may not allow this because it extracts
64+
the binaries to the application user’s temp directory. Runtime extraction can be avoided by by modifying WorldWind
65+
Java's JOGL distribution to load native binaries directly from the library path instead of dynamically using the native
6766
binary JAR files as follows:
68-
67+
6968
1. Extract the GlueGen and JOGL native binary JAR files for the desired platform.
7069
These JAR files follow the naming pattern gluegen-rt-natives-PLATFORM.jar and jogl-all-natives-PLATFORM.jar
7170
2. Place the extracted native binaries either in the program's working directory or in a location specified as the
@@ -94,7 +93,7 @@ binary JAR files as follows:
9493
Government Agency, is an intended third-party beneficiary of all subsequent
9594
distributions or redistributions of the subject software. Anyone who uses, reproduces,
9695
distributes, modifies or redistributes the subject software, as defined herein, or any
97-
part thereof, is, by that action, accepting in full the responsibilities and obligations
96+
part thereof, is, by that action, accepting in full the responsibilities and obligations
9897
contained in this agreement.
9998

10099
Government Agency: National Aeronautics and Space Administration (NASA)

0 commit comments

Comments
 (0)