Skip to content

Commit 7127b44

Browse files
author
pdavidc
committed
Consolidated Web Start configuration files
1 parent 677d635 commit 7127b44

30 files changed

+37
-41
lines changed

‎build.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<!-- Tasks for assembling the project Web Start package. -->
119119

120120
<target name="assembleWebStart"
121-
depends="compileWebStartConfiguration, bundleWebStartLibraries, signWebStartSources, bundleWebStart"
121+
depends="assembleRelease, compileWebStartConfiguration, bundleWebStartLibraries, signWebStartSources, bundleWebStart"
122122
description="Assembles the Java Web Start deployment package."/>
123123

124124
<target name="compileWebStartConfiguration">
@@ -132,7 +132,7 @@
132132
</copy>
133133
</target>
134134

135-
<target name="bundleWebStartLibraries" depends="assembleRelease">
135+
<target name="bundleWebStartLibraries">
136136
<mkdir dir="${webstart.unsigned.dir}"/>
137137
<!-- World Wind library JAR files. -->
138138
<copy file="${worldwind.jar.dir}/worldwind-release.jar" tofile="${webstart.unsigned.dir}/worldwind.jar"/>
@@ -288,7 +288,7 @@
288288

289289
<!-- Targets for assembling the project SDK archive. -->
290290

291-
<target name="assembleSdkArchive">
291+
<target name="assembleSdkArchive" depends="assembleRelease">
292292
<zip destfile="${worldwind.build.dir}/worldwind.zip">
293293
<fileset dir="${basedir}">
294294
<include name="**/*"/>
@@ -365,10 +365,10 @@
365365
the SVG image's aspect ratio. PNG files are written to the destination directory according to their relative
366366
path in the source directory. -->
367367

368-
<target name="assembleMilStd2525" depends="compileMilStd2525, bundleMilStd2525"
368+
<target name="assembleMilStd2525" depends="assembleRelease, compileMilStd2525, bundleMilStd2525"
369369
description="Assembles the MIL-STD-2525 symbology package."/>
370370

371-
<target name="compileMilStd2525" depends="assembleRelease">
371+
<target name="compileMilStd2525">
372372
<mkdir dir="${milstd2525.png.dir}"/>
373373
<!-- Rasterize the MIL-STD-2525 SVG sources. Exclude empty directories in order to suppress erroneous error
374374
messages from the Apache Batik Rasterizer. -->

‎travis/update_website.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,15 @@ cd $GH_PAGES_DIR
5050
# Remove existing build assets from the repository, if any
5151
git rm -rfq --ignore-unmatch ./assets/java/${FOLDER}
5252

53-
# Copy new javadocs to the repository
53+
# Copy new Javadocs to the repository
5454
mkdir -p ./assets/java/${FOLDER}/javadoc
5555
cp -Rf ${TRAVIS_BUILD_DIR}/build/doc/javadoc/* ./assets/java/${FOLDER}/javadoc
5656

57-
# Copy new Web Start binaries to the repository
57+
# Copy new Web Start files to the repository
5858
mkdir -p ./assets/java/${FOLDER}/webstart
5959
cp -Rf ${TRAVIS_BUILD_DIR}/build/webstart/jar/* ./assets/java/${FOLDER}/webstart
6060
cp -Rf ${TRAVIS_BUILD_DIR}/build/webstart/jnlp/* ./assets/java/${FOLDER}/webstart
6161

62-
# Copy new Web Start demos to the repository
63-
mkdir -p ./assets/java/${FOLDER}/demos
64-
cp -Rf ${TRAVIS_BUILD_DIR}/demos/* ./assets/java/${FOLDER}/demos
65-
6662
# Commit and push the changes (quietly)
6763
git add -f .
6864
git commit -m "Updated assets from successful travis build $TRAVIS_BUILD_NUMBER in $TRAVIS_BRANCH"

demos/AirspaceBuilder.jnlp renamed to webstart/AirspaceBuilder.jnlp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
-->
3535
<resources>
3636
<java version="1.7+" max-heap-size="1024m"/>
37-
<extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
37+
<extension name="worldwindx" href="worldwindx.jnlp"/>
3838
</resources>
3939

4040
<!--

demos/Airspaces.jnlp renamed to webstart/Airspaces.jnlp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
-->
3535
<resources>
3636
<java version="1.7+" max-heap-size="1024m"/>
37-
<extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
37+
<extension name="worldwindx" href="worldwindx.jnlp"/>
3838
</resources>
3939

4040
<!--

demos/AnaglyphStereo.jnlp renamed to webstart/AnaglyphStereo.jnlp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
-->
3535
<resources>
3636
<java version="1.7+" max-heap-size="1024m"/>
37-
<extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
37+
<extension name="worldwindx" href="worldwindx.jnlp"/>
3838
</resources>
3939

4040
<!--

demos/AnalyticSurface.jnlp renamed to webstart/AnalyticSurface.jnlp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
-->
3737
<resources>
3838
<java version="1.7+" max-heap-size="1024m"/>
39-
<extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
40-
<extension name="gdal" href="../webstart/gdal.jnlp"/>
39+
<extension name="worldwindx" href="worldwindx.jnlp"/>
40+
<extension name="gdal" href="gdal.jnlp"/>
4141
</resources>
4242

4343
<!--

demos/AnnotationControls.jnlp renamed to webstart/AnnotationControls.jnlp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
-->
3535
<resources>
3636
<java version="1.7+" max-heap-size="1024m"/>
37-
<extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
37+
<extension name="worldwindx" href="worldwindx.jnlp"/>
3838
</resources>
3939

4040
<!--

demos/Annotations.jnlp renamed to webstart/Annotations.jnlp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
-->
3535
<resources>
3636
<java version="1.7+" max-heap-size="1024m"/>
37-
<extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
37+
<extension name="worldwindx" href="worldwindx.jnlp"/>
3838
</resources>
3939

4040
<!--

demos/ApplicationTemplate.jnlp renamed to webstart/ApplicationTemplate.jnlp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
-->
3535
<resources>
3636
<java version="1.7+" max-heap-size="1024m"/>
37-
<extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
37+
<extension name="worldwindx" href="worldwindx.jnlp"/>
3838
</resources>
3939

4040
<!--

demos/ExportImageOrElevations.jnlp renamed to webstart/ExportImageOrElevations.jnlp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
-->
3535
<resources>
3636
<java version="1.7+" max-heap-size="1024m"/>
37-
<extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
37+
<extension name="worldwindx" href="worldwindx.jnlp"/>
3838
</resources>
3939

4040
<!--

0 commit comments

Comments
 (0)