Consolidated Web Start configuration files

Author: pdavidc

build.xml

@@ -118,7 +118,7 @@
     <!-- Tasks for assembling the project Web Start package. -->
 
     <target name="assembleWebStart"
-            depends="compileWebStartConfiguration, bundleWebStartLibraries, signWebStartSources, bundleWebStart"
+            depends="assembleRelease, compileWebStartConfiguration, bundleWebStartLibraries, signWebStartSources, bundleWebStart"
             description="Assembles the Java Web Start deployment package."/>
 
     <target name="compileWebStartConfiguration">
@@ -132,7 +132,7 @@
         </copy>
     </target>
 
-    <target name="bundleWebStartLibraries" depends="assembleRelease">
+    <target name="bundleWebStartLibraries">
         <mkdir dir="${webstart.unsigned.dir}"/>
         <!-- World Wind library JAR files. -->
         <copy file="${worldwind.jar.dir}/worldwind-release.jar" tofile="${webstart.unsigned.dir}/worldwind.jar"/>
@@ -288,7 +288,7 @@
 
     <!-- Targets for assembling the project SDK archive. -->
 
-    <target name="assembleSdkArchive">
+    <target name="assembleSdkArchive" depends="assembleRelease">
         <zip destfile="${worldwind.build.dir}/worldwind.zip">
             <fileset dir="${basedir}">
                 <include name="**/*"/>
@@ -365,10 +365,10 @@
          the SVG image's aspect ratio. PNG files are written to the destination directory according to their relative
          path in the source directory. -->
 
-    <target name="assembleMilStd2525" depends="compileMilStd2525, bundleMilStd2525"
+    <target name="assembleMilStd2525" depends="assembleRelease, compileMilStd2525, bundleMilStd2525"
             description="Assembles the MIL-STD-2525 symbology package."/>
 
-    <target name="compileMilStd2525" depends="assembleRelease">
+    <target name="compileMilStd2525">
         <mkdir dir="${milstd2525.png.dir}"/>
         <!-- Rasterize the MIL-STD-2525 SVG sources. Exclude empty directories in order to suppress erroneous error
              messages from the Apache Batik Rasterizer. -->

travis/update_website.sh

@@ -50,19 +50,15 @@ cd $GH_PAGES_DIR
 # Remove existing build assets from the repository, if any
 git rm -rfq --ignore-unmatch ./assets/java/${FOLDER}
 
-# Copy new javadocs to the repository
+# Copy new Javadocs to the repository
 mkdir -p ./assets/java/${FOLDER}/javadoc
 cp -Rf ${TRAVIS_BUILD_DIR}/build/doc/javadoc/* ./assets/java/${FOLDER}/javadoc
 
-# Copy new Web Start binaries to the repository
+# Copy new Web Start files to the repository
 mkdir -p ./assets/java/${FOLDER}/webstart
 cp -Rf ${TRAVIS_BUILD_DIR}/build/webstart/jar/* ./assets/java/${FOLDER}/webstart
 cp -Rf ${TRAVIS_BUILD_DIR}/build/webstart/jnlp/* ./assets/java/${FOLDER}/webstart
 
-# Copy new Web Start demos to the repository
-mkdir -p ./assets/java/${FOLDER}/demos
-cp -Rf ${TRAVIS_BUILD_DIR}/demos/* ./assets/java/${FOLDER}/demos
-
 # Commit and push the changes (quietly)
 git add -f .
 git commit -m "Updated assets from successful travis build $TRAVIS_BUILD_NUMBER in $TRAVIS_BRANCH"

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

@@ -34,7 +34,7 @@
     -->
     <resources>
         <java version="1.7+" max-heap-size="1024m"/>
-        <extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
+        <extension name="worldwindx" href="worldwindx.jnlp"/>
     </resources>
 
     <!--

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

@@ -34,7 +34,7 @@
     -->
     <resources>
         <java version="1.7+" max-heap-size="1024m"/>
-        <extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
+        <extension name="worldwindx" href="worldwindx.jnlp"/>
     </resources>
 
     <!--

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

@@ -34,7 +34,7 @@
     -->
     <resources>
         <java version="1.7+" max-heap-size="1024m"/>
-        <extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
+        <extension name="worldwindx" href="worldwindx.jnlp"/>
     </resources>
 
     <!--

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

@@ -36,8 +36,8 @@
     -->
     <resources>
         <java version="1.7+" max-heap-size="1024m"/>
-        <extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
-        <extension name="gdal" href="../webstart/gdal.jnlp"/>
+        <extension name="worldwindx" href="worldwindx.jnlp"/>
+        <extension name="gdal" href="gdal.jnlp"/>
     </resources>
 
     <!--

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

@@ -34,7 +34,7 @@
     -->
     <resources>
         <java version="1.7+" max-heap-size="1024m"/>
-        <extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
+        <extension name="worldwindx" href="worldwindx.jnlp"/>
     </resources>
 
     <!--

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

@@ -34,7 +34,7 @@
     -->
     <resources>
         <java version="1.7+" max-heap-size="1024m"/>
-        <extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
+        <extension name="worldwindx" href="worldwindx.jnlp"/>
     </resources>
 
     <!--

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

@@ -34,7 +34,7 @@
     -->
     <resources>
         <java version="1.7+" max-heap-size="1024m"/>
-        <extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
+        <extension name="worldwindx" href="worldwindx.jnlp"/>
     </resources>
 
     <!--

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

@@ -34,7 +34,7 @@
     -->
     <resources>
         <java version="1.7+" max-heap-size="1024m"/>
-        <extension name="worldwindx" href="../webstart/worldwindx.jnlp"/>
+        <extension name="worldwindx" href="worldwindx.jnlp"/>
     </resources>
 
     <!--