X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=build.xml;h=6262bc0da7d1423f4f43e4e4c2924807febb814f;hb=c55a6518fb749ae7131948b6c91001275f7c56fe;hp=394aea4ee87ea6393cdcb1b7f97cf8291b098f6b;hpb=e298a9509613f232227d16d28310611b33c3aa03;p=debian%2Fopenrocket

diff --git a/build.xml b/build.xml
index 394aea4e..6262bc0d 100644
--- 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>
 	
@@ -189,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>