Fixed ant build file, tests now run properly

2 files changed, 5 insertions, 79 deletions

diff --git a/build/build.xml b/build/build.xml
index 2bbfd65..918039b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>   
-<project name="cardbasenew" default="test" basedir="..">
+<project name="cardbase" default="test" basedir="..">
   
   <property name="main.build.dir" value="build/main" />  
   <property name="main.src.dir" value="src" />
@@ -33,8 +33,9 @@
 	  <exclude name="${lib.dir}/junit/*sources.jar"/>
 	  <exclude name="${lib.dir}/junit/*javadoc.jar"/>
 	</fileset>
-	<pathelement location="${main.build.dir}"/>
-    <path refid="classpath.base" />
+	<pathelement location="${test.build.dir}"/>
+  	<pathelement location="${main.build.dir}"/>
+  	<path refid="classpath.base" />
   </path>
 
   <target name="test" depends="run, clean" />
@@ -63,7 +64,7 @@
   <!-- Test and build all files  -->
   <!-- To run this: use "ant" (default) or "ant run" -->
   <target name="run" depends="build">
-    <junit printsummary="on" haltonfailure="no">
+    <junit printsummary="on" haltonfailure="yes">
         <classpath>
           <path refid="classpath.test" />
           <pathelement location="${test.build.dir}"/>
diff --git a/build/oldbuild.xml b/build/oldbuild.xml
deleted file mode 100644
index ce3d166..0000000
--- a/build/oldbuild.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<project name="cardbase" default="deploy" basedir="..">
-   
-	<property name="jar.name" value="cardbase" />
-	<property name="src.dir" location="src" />
-	<property name="bin.dir" location="tmpbin" />
-	<property name="build.dir" location="build" />
-	<property name="dist.dir" location="dist" />
-	<property name="lib.dir" value="lib" />
-	<property name="res.dir" value="res" />
-	<property name="test.src.dir" value="test" />
-	<property name="main-class" value="eu.equalparts.cardbase.cli.CardbaseCLI" />
-	
-	<!-- Clean up temporary directories -->
-	<target name="clean" description="clean up">
-		<delete dir="${bin.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-	
-	<!-- Initialise temporary directories -->
-	<target name="init">
-		<mkdir dir="${bin.dir}" />
-	</target>
-	
-	<!-- External libraries classpath, we don't need sources and javadoc -->
-	<path id="classpath">
-		<fileset dir="${basedir}/">
-			<include name="${res.dir}/*" />
-			
-			<include name="${lib.dir}/*.jar" />
-			<exclude name="${lib.dir}/*sources.jar"/>
-			<exclude name="${lib.dir}/*javadoc.jar"/>
-		</fileset>
-	</path>
-	
-	<!-- Compile project including external libraries and copy resource files across as well -->
-	<target name="compile" depends="init" description="compile the source">
-		<javac includeantruntime="false" srcdir="${src.dir}" destdir="${bin.dir}" classpathref="classpath" />
-		
-		<copy todir="${bin.dir}">
-		   <fileset dir="${res.dir}" excludes=""/>
-		</copy>
-	</target>
-	
-	<!-- Create the jar and declare the ext libraries in manifest.mf file -->
-	<target name="jar" depends="compile" >
-		
-		<mkdir dir="${dist.dir}" />
-	 
-		<jar jarfile="${dist.dir}/${jar.name}.jar" basedir="${bin.dir}">
-			
-			<zipgroupfileset dir="${lib.dir}" includes="*.jar" excludes="*sources.jar, *javadoc.jar" />
-			
-			<manifest>
-				<attribute name="Main-Class" value="${main-class}" />
-				<attribute name="Class-Path" value="${classpath.name}" />
-			</manifest>
-		</jar>
-		<delete dir="${bin.dir}" />
-	</target>
-	
-	<!-- Concatenate a the jar to a pre-set header and chmod 755 it -->
-	<target name="shebang" depends="deploy" >
-		<concat destfile="${dist.dir}/${jar.name}" binary="yes">
-			<fileset dir="${build.dir}" includes="header"/>
-			<fileset dir="${dist.dir}" includes="${jar.name}.jar"/>
-		</concat>
-		
-		<chmod file="${dist.dir}/${jar.name}" perm="755"/>
-	</target>
-	
-	<!-- Produce a standalone, runnable jar -->
-	<target name="deploy" depends="clean, compile, jar" />
-	
-</project>
\ No newline at end of file