Skip to content

Commit 008cb44

Browse files
author
pdavidc
committed
Repaired ANT build for unsigned Web Start distribution
1 parent 5cd30e8 commit 008cb44

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

build.xml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@
306306
</jar>
307307
</target>
308308

309-
<target name="signWebStartSources" depends="keystoreSetup" if="keystore.enabled">
309+
<target name="signWebStartSources" depends="keystoreAvailable" if="keystore.isAvailable">
310310
<property file="${basedir}/keystore.properties"/>
311311
<copy todir="${webstart.jar.dir}">
312312
<fileset dir="${webstart.unsigned.dir}">
@@ -324,23 +324,26 @@
324324
</signjar>
325325
</target>
326326

327-
<target name="keystoreSetup">
328-
<condition property="keystore.enabled" value="true" else="false">
329-
<available file="${basedir}/keystore.properties"/>
330-
</condition>
331-
</target>
327+
<target name="bundleWebStart" depends="bundleWebStartSigned, bundleWebStartUnsigned"/>
332328

333-
<target name="bundleWebStart">
329+
<target name="bundleWebStartSigned" if="keystore.isAvailable">
334330
<zip destfile="${webstart.out.dir}/worldwind-webstart.zip">
335331
<fileset dir="${webstart.jar.dir}"/>
336332
<fileset dir="${webstart.jnlp.dir}"/>
337333
</zip>
334+
</target>
335+
336+
<target name="bundleWebStartUnsigned">
338337
<zip destfile="${webstart.out.dir}/worldwind-webstart-unsigned.zip">
339338
<fileset dir="${webstart.unsigned.dir}"/>
340339
<fileset dir="${webstart.jnlp.dir}"/>
341340
</zip>
342341
</target>
343342

343+
<target name="keystoreAvailable">
344+
<available property="keystore.isAvailable" file="${basedir}/keystore.properties"/>
345+
</target>
346+
344347
<!-- Tasks for assembling the MIL-STD-2525 symbology package. Rasterizes MIL-STD-2525 SVG image files into PNG image
345348
files. The maxwidth and height parameters control the PNG image dimensions, where the width varies depending on
346349
the SVG image's aspect ratio. PNG files are written to the destination directory according to their relative

0 commit comments

Comments
 (0)