version 1.1.4pre

[debian/openrocket] / build.xml

diff --git a/build.xml b/build.xml
index 94676a627be00d13daf5843372a55217cbba9013..6262bc0da7d1423f4f43e4e4c2924807febb814f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -23,7 +23,6 @@
        
        <!-- The main class of the application -->
        <property name="main-class"  value="net.sf.openrocket.startup.Startup"/>
-       <property name="main-dir" value="net/sf/openrocket/startup"/>
 
        
        <!-- Classpath definitions -->
@@ -36,6 +35,7 @@
                <pathelement location="${basedir}"/>
                <pathelement location="${build-test.dir}"/>
                <pathelement location="${classes.dir}"/>
+               <pathelement location="${src-test.dir}"/>
 <!--           <pathelement location="${ant.library.dir}/junit4.jar"/> -->
                <pathelement location="lib-test/junit-4.7.jar"/>
        </path>
@@ -52,10 +52,9 @@
        <!-- BUILD -->
        <target name="build">
                <mkdir dir="${classes.dir}"/>
-               <echo>Compiling main classes</echo>
-               <javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" excludes="${main-dir}/*" classpathref="classpath"/>
-               <echo>Compiling startup classes</echo>
-               <javac debug="true" srcdir="${src.dir}/${main-dir}" destdir="${classes.dir}" source="1.4" classpathref="classpath"/>
+               <echo level="info">Compiling main classes</echo>
+               <javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+               <echo level="info">Copying build.properties</echo>
                <copy file="build.properties" todir="${dist.dir}"/>
        </target>
        
@@ -130,6 +129,7 @@
        <target name="check" depends="checktodo,checkascii"/>
        
        <!-- CHECK TODOs -->
+       <target name="todo" depends="checktodo"/>
        <target name="checktodo">
                <tempfile property="todo.file" prefix="checktodo-"/>
                <echo>Checking project for critical TODOs.</echo>
@@ -155,6 +155,7 @@ ${criticaltodos}</fail>
        
        
        <!-- CHECK TODOs -->
+       <target name="ascii" depends="checkascii"/>
        <target name="checkascii">
                <tempfile property="ascii.file" prefix="checkascii-"/>
                <echo>Checking project for non-ASCII characters.</echo>
@@ -187,14 +188,15 @@ ${nonascii}</fail>
                
                <echo>Running unit tests</echo>
                <mkdir dir="tmp/rawtestoutput"/>
-               <junit fork="yes" forkmode="once" printsummary="true" failureproperty="junit.failure">
+               <junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure">
                        <classpath>
                                <path refid="test-classpath"/>
                                <path location="${basedir}"/>
                        </classpath>
                        <batchtest todir="tmp/rawtestoutput">
                                <fileset dir="${build-test.dir}">
-                                       <include name="**/*Test*.class" />
+                                       <include name="**/Test*.class" />
+                                       <include name="**/*Test.class" />
                                        <exclude name="**/*$*.class" />
                                        <exclude name="Test.class" />
                                </fileset>