Update build scripts

[GpsPrune.git] / buildtools / build.xml

diff --git a/buildtools/build.xml b/buildtools/build.xml
index 01e49e89af07b91a61e9bcd288c2efc1a5d81c69..50dd1389150b4f86c518ded36d3d46807e845ad0 100644 (file)
--- a/buildtools/build.xml
+++ b/buildtools/build.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0"?>\r
 \r
-<project name="Prune" default="dist" basedir=".">\r
+<project name="GpsPrune" default="jar" basedir=".">\r
        <!-- This file was supplied by Denny from the OpenSuse build service project -->\r
 \r
-       <property file="build.properties" />\r
        <property file="version.properties" />\r
-       <property name="src" value="." />\r
+       <property name="src" value="src" />\r
        <property name="build" value="build" />\r
        <property name="dist" value="dist" />\r
 \r
+       <path id="j3dlibs">\r
+               <fileset dir="/usr/share/java/" includes="*.jar"/>\r
+       </path>\r
+\r
        <!-- Init -->\r
 \r
        <target name="init">\r
@@ -27,28 +30,28 @@
        <!-- Build -->\r
 \r
        <target name="build" description="Build from source" depends="clean,init">\r
-               <javac srcdir="${src}" destdir="${build}" />\r
-       </target>\r
-\r
-       <!-- Distribution -->\r
-\r
-       <target name="dist" description="Create distributable jar from sources" depends="build,jar">\r
-               <fileset dir="${build}" casesensitive="yes">\r
-                       <include name="**/*" />\r
-                       <exclude name="**/*test*" />\r
-               </fileset>\r
+               <javac srcdir="${src}" destdir="${build}">\r
+                       <classpath refid="j3dlibs" />\r
+               </javac>\r
        </target>\r
 \r
        <!-- Jar -->\r
 \r
-       <target name="jar" description="Create jar file">\r
+       <target name="jar" description="Create jar file" depends="build">\r
+               <copy todir="${build}/tim/prune/lang">\r
+                       <fileset dir="${src}/tim/prune/lang"/>\r
+               </copy>\r
+               <copy todir="${build}/tim/prune/gui/images">\r
+                       <fileset dir="${src}/tim/prune/gui/images"/>\r
+               </copy>\r
+               <copy todir="${build}/tim/prune/">\r
+                       <fileset dir="${src}/tim/prune">\r
+                               <include name="*.txt"/>\r
+                       </fileset>\r
+               </copy>\r
+               <copy file="${src}/tim/prune/function/srtm/srtmtiles.dat" todir="${build}/tim/prune/function/srtm"/>\r
                <fileset dir="${build}" casesensitive="yes">\r
                        <include name="build/*" />\r
-                       <include name="tim/prune/lang/*" />\r
-                       <include name="license.txt" />\r
-                       <include name="readme.txt" />\r
-                       <include name="tim/prune/gui/images/*" />\r
-                       <exclude name="tim/prune/test/*" />\r
                </fileset>\r
                <jar destfile="${dist}/${ant.project.name}-${version}.jar" basedir="${build}">\r
                        <!-- define MANIFEST.MF -->\r
@@ -60,11 +63,8 @@
                                <attribute name="Implementation-Title" value="${ant.project.name}" />\r
                                <attribute name="Implementation-Version" value="${version}" />\r
                                <!-- details -->\r
-                               <attribute name="Main-Class" value="GpsPruner" />\r
+                               <attribute name="Main-Class" value="tim.prune.GpsPrune" />\r
                                <attribute name="Class-Path" value="${ant.project.name}.jar" />\r
-                               <section name="AntDemo.class">\r
-                                       <attribute name="Sealed" value="false" />\r
-                               </section>\r
                        </manifest>\r
                </jar>\r
        </target>\r