new upstream version

[debian/openrocket] / build.xml

diff --git a/build.xml b/build.xml
index 3482ffec84689342ddbddba57d11020d811ebf89..0ebe47092b7dc3a9b1d2c9d4aea9d590726f3b4f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -13,6 +13,7 @@
        
        <property name="classes.dir" value="${dist.dir}"/>      <!-- Directory for classes -->
        <property name="jar.dir"     value="${build.dir}/jar"/> <!-- Directory for built jar's -->
+       <property name="lib.dir"     value="lib"/>                              <!-- Library source directory -->
 
        <property name="pkgname"     value="${ant.project.name}-${build.version}"/>
        
@@ -26,10 +27,7 @@
        
        <!-- Classpath definitions -->
        <path id="classpath">
-               <!-- update manifest class-path definition below too when making changes here -->
-               <pathelement location="/usr/share/java/jcommon.jar"/>
-               <pathelement location="/usr/share/java/jfreechart.jar"/>
-               <pathelement location="/usr/share/java/miglayout.jar"/>
+               <fileset dir="${lib.dir}" includes="**/*.jar"/>
        </path>
        
        <path id="test-classpath">
@@ -38,7 +36,7 @@
                <pathelement location="${build-test.dir}"/>
                <pathelement location="${classes.dir}"/>
                <pathelement location="${src-test.dir}"/>
-               <pathelement location="/usr/share/java/junit4.jar"/>
+               <fileset dir="lib-test/" includes="*.jar"/>
        </path>
        
 
@@ -65,15 +63,18 @@
                <copy todir="${dist.dir}/">
                        <fileset dir="." includes="LICENSE.TXT README.TXT ChangeLog ReleaseNotes build.properties fileformat.txt" />
                        <fileset dir="." includes="datafiles/ pix/ l10n/" />
+                       <fileset dir="src/" includes="META-INF/" />
                </copy>
                <mkdir dir="${jar.dir}"/>
                <jar destfile="${jar.file}" basedir="${dist.dir}">
                        <manifest>
                                <attribute name="Main-Class" value="${main-class}"/>
                                <attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
-                               <attribute name="Class-Path" value="/usr/share/j
-ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /usr/share/java/itext.jar"/>
                        </manifest>
+                       <zipfileset src="lib/miglayout15-swing.jar" />
+                       <zipfileset src="lib/jcommon-1.0.16.jar" />
+                       <zipfileset src="lib/jfreechart-1.0.13.jar" />
+                       <zipfileset src="lib/iText-5.0.2.jar" />
                </jar>
        </target>
        
@@ -86,10 +87,10 @@ ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /us
                <mkdir dir="${build.dir}/${pkgname}"/>
                <mkdir dir="${jar.dir}"/>
                <copy todir="${build.dir}/${pkgname}">
-                       <fileset dir="." includes="*">
+                       <fileset dir="." includes="*" excludes="*.log">
                                <type type="file"/>
                        </fileset>
-                       <fileset dir="." includes="datafiles/ pix/ src/ test/"/>
+                       <fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/ l10n/"/>
                </copy>
                <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
                <delete dir="${build.dir}/${pkgname}"/>
@@ -132,7 +133,7 @@ ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /us
        <target name="todo" depends="checktodo"/>
        <target name="checktodo">
                <tempfile property="todo.file" prefix="checktodo-"/>
-               <echo>Checking project for critical TODOs.</echo>
+               <echo>Checking project for FIXMEs.</echo>
                <concat destfile="${todo.file}">
                        <fileset dir="${src.dir}">
                            <include name="**/*.java"/>
@@ -142,7 +143,7 @@ ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /us
                        </fileset>
                        <filterchain>
                                <linecontainsregexp>
-                                       <regexp pattern="TODO:.*CRITICAL"/>
+                                       <regexp pattern="(FIXME|TODO:.*CRITICAL)"/>
                                </linecontainsregexp>
                        </filterchain>
                </concat>
@@ -213,4 +214,4 @@ ${nonascii}</fail>
                </echo>
        </target>
     
-</project>
+</project>
\ No newline at end of file