Skip to content

Commit ae2f9a8

Browse files
markpet49markpet49
committed
Added executable build
1 parent 6c4685f commit ae2f9a8

File tree

3 files changed

+114
-2
lines changed

3 files changed

+114
-2
lines changed

‎release-build.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ milstd2525.png.dir=${milstd2525.out.dir}/png
2626
milstd2525.png.width=128
2727
milstd2525.png.height=128
2828

29+
# executable package build properties
30+
executable.src.dir=${basedir}/executable
31+
executable.out.dir=${worldwind.build.dir}/executable
32+
executable.jar.dir=${executable.out.dir}/jar

‎release-build.xml‎

Lines changed: 109 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<delete file="${basedir}/worldwindx.jar"/>
2929
</target>
3030

31-
<target name="assemble" depends="assembleDebug, assembleRelease, assembleJavadoc, assembleSdkArchive"
31+
<target name="assemble" depends="assembleDebug, assembleRelease, assembleJavadoc, assembleExecutable, assembleSdkArchive"
3232
description="Assembles JAR libraries for all build types and assembles the project documentation."/>
3333

3434
<!-- Targets for compiling Java sources and bundling JAR libraries. -->
@@ -119,6 +119,114 @@
119119
</zip>
120120
</target>
121121

122+
<!-- Tasks for assembling the project Executable package. -->
123+
124+
<target name="assembleExecutable"
125+
depends="assembleRelease, bundleExecutableLibraries, bundleExecutable"
126+
description="Assembles the Executable deployment package."/>
127+
128+
<target name="bundleExecutableLibraries">
129+
<mkdir dir="${executable.jar.dir}"/>
130+
<!-- World Wind library JAR files. -->
131+
<copy file="${worldwind.jar.dir}/release/worldwind.jar" tofile="${executable.jar.dir}/worldwind.jar"/>
132+
<copy file="${worldwind.jar.dir}/release/worldwindx.jar" tofile="${executable.jar.dir}/worldwindx.jar"/>
133+
<!-- JOGL and GlueGen library JAR files. -->
134+
<copy todir="${executable.jar.dir}">
135+
<fileset dir="${basedir}">
136+
<include name="jogl-all*.jar"/>
137+
<include name="gluegen-rt*.jar"/>
138+
<type type="file"/>
139+
</fileset>
140+
</copy>
141+
<!-- GDAL library JAR files. -->
142+
<copy file="${basedir}/gdal.jar" todir="${executable.jar.dir}"/>
143+
<jar jarfile="${executable.jar.dir}/gdaldata.jar">
144+
<manifest>
145+
<attribute name="Permissions" value="all-permissions"/>
146+
</manifest>
147+
<fileset dir="${basedir}/lib-external/gdal/data">
148+
<include name="**"/>
149+
<type type="file"/>
150+
</fileset>
151+
</jar>
152+
<!-- GDAL native library JAR files. -->
153+
<jar jarfile="${executable.jar.dir}/gdal-natives-macosx-universal.jar">
154+
<manifest>
155+
<attribute name="Permissions" value="all-permissions"/>
156+
</manifest>
157+
<fileset dir="${basedir}/lib-external/gdal">
158+
<include name="GDAL_License.txt"/>
159+
<include name="LizardTech_DSDK_License.txt"/>
160+
<include name="LizardTech_3rd_Party.txt"/>
161+
<include name="LizardTech_Redistributable.txt"/>
162+
<include name="libgdalalljni.jnilib"/>
163+
<type type="file"/>
164+
</fileset>
165+
</jar>
166+
<jar jarfile="${executable.jar.dir}/gdal-natives-windows-i586.jar">
167+
<manifest>
168+
<attribute name="Permissions" value="all-permissions"/>
169+
</manifest>
170+
<fileset dir="${basedir}/lib-external/gdal">
171+
<include name="GDAL_License.txt"/>
172+
<include name="LizardTech_DSDK_License.txt"/>
173+
<include name="LizardTech_3rd_Party.txt"/>
174+
<include name="LizardTech_Redistributable.txt"/>
175+
<include name="gdalminjni32.dll"/>
176+
<include name="gdalalljni32.dll"/>
177+
<include name="gdalalljni32.dll.manifest"/>
178+
<type type="file"/>
179+
</fileset>
180+
</jar>
181+
<jar jarfile="${executable.jar.dir}/gdal-natives-windows-amd64.jar">
182+
<manifest>
183+
<attribute name="Permissions" value="all-permissions"/>
184+
</manifest>
185+
<fileset dir="${basedir}/lib-external/gdal">
186+
<include name="GDAL_License.txt"/>
187+
<include name="LizardTech_DSDK_License.txt"/>
188+
<include name="LizardTech_3rd_Party.txt"/>
189+
<include name="LizardTech_Redistributable.txt"/>
190+
<include name="gdalminjni64.dll"/>
191+
<include name="gdalalljni64.dll"/>
192+
<include name="gdalalljni64.dll.manifest"/>
193+
<type type="file"/>
194+
</fileset>
195+
</jar>
196+
<jar jarfile="${executable.jar.dir}/gdal-natives-linux-i586.jar">
197+
<manifest>
198+
<attribute name="Permissions" value="all-permissions"/>
199+
</manifest>
200+
<fileset dir="${basedir}/lib-external/gdal">
201+
<include name="GDAL_License.txt"/>
202+
<include name="LizardTech_DSDK_License.txt"/>
203+
<include name="LizardTech_3rd_Party.txt"/>
204+
<include name="LizardTech_Redistributable.txt"/>
205+
<include name="libgdalalljni32.so"/>
206+
<type type="file"/>
207+
</fileset>
208+
</jar>
209+
<jar jarfile="${executable.jar.dir}/gdal-natives-linux-amd64.jar">
210+
<manifest>
211+
<attribute name="Permissions" value="all-permissions"/>
212+
</manifest>
213+
<fileset dir="${basedir}/lib-external/gdal">
214+
<include name="GDAL_License.txt"/>
215+
<include name="LizardTech_DSDK_License.txt"/>
216+
<include name="LizardTech_3rd_Party.txt"/>
217+
<include name="LizardTech_Redistributable.txt"/>
218+
<include name="libgdalalljni64.so"/>
219+
<type type="file"/>
220+
</fileset>
221+
</jar>
222+
</target>
223+
224+
<target name="bundleExecutable">
225+
<zip destfile="${executable.out.dir}/worldwind-executable.zip">
226+
<fileset dir="${executable.jar.dir}"/>
227+
</zip>
228+
</target>
229+
122230
<!-- Targets for assembling the project SDK archive. -->
123231

124232
<target name="assembleSdkArchive" depends="assembleRelease">

‎src/gov/nasa/worldwindx/examples/TrajectoryPlot.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,6 @@ public static void main(String[] args) {
102102
if (args.length > 0) {
103103
TRAJECTORY_FILE_NAME = args[0];
104104
}
105-
ApplicationTemplate.start("WorldWind Paths", AppFrame.class);
105+
ApplicationTemplate.start("WorldWind CSV Trajectory Plotter", AppFrame.class);
106106
}
107107
}

0 commit comments

Comments
 (0)