updates for 0.9.4

[debian/openrocket] / build.xml

diff --git a/build.xml b/build.xml
index 97f5a4e41c299b35b95b279870ba79b3288438aa..b77dd04ff00861074af6af99cdf6f43996891a61 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -33,9 +33,11 @@
        
        <path id="test-classpath">
                <path refid="classpath"/>
+               <pathelement location="${basedir}"/>
                <pathelement location="${build-test.dir}"/>
                <pathelement location="${classes.dir}"/>
-               <pathelement location="${ant.library.dir}/junit4.jar"/>
+<!--           <pathelement location="${ant.library.dir}/junit4.jar"/> -->
+               <pathelement location="lib-test/junit-4.7.jar"/>
        </path>
        
 
@@ -51,9 +53,9 @@
        <target name="build">
                <mkdir dir="${classes.dir}"/>
                <echo>Compiling main classes</echo>
-               <javac srcdir="${src.dir}" destdir="${classes.dir}" excludes="${main-dir}/*" classpathref="classpath"/>
+               <javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" excludes="${main-dir}/*" classpathref="classpath"/>
                <echo>Compiling startup classes</echo>
-               <javac srcdir="${src.dir}/${main-dir}" destdir="${classes.dir}" source="1.4" classpathref="classpath"/>
+               <javac debug="true" srcdir="${src.dir}/${main-dir}" destdir="${classes.dir}" source="1.4" classpathref="classpath"/>
                <copy file="build.properties" todir="${dist.dir}"/>
        </target>
        
@@ -150,7 +152,7 @@ ${criticaltodos}</fail>
        <target name="unittest" description="Execute unit tests" depends="build">
                <echo>Building unit tests</echo>
                <mkdir dir="${build-test.dir}"/>
-               <javac srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath"/>
+               <javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath"/>
                
                <echo>Running unit tests</echo>
                <mkdir dir="tmp/rawtestoutput"/>