From 5d2fd3da2541e9ddfdad6cdbba9d251fd305bfd7 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 10 Apr 2010 01:12:57 +0200
Subject: *** Now Using Apache-Ant-1.8.0 *** Adding ant-contrib-1.0b3.jar for
 loops and mutable properties. Cleanup:     - Adding Javac includeAntRuntime
 argument (false whenever possible)     - Clear junit results folder before
 testing     - Move deprecated stuff from lib to lib/archive

---
 make/build-junit.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'make/build-junit.xml')

diff --git a/make/build-junit.xml b/make/build-junit.xml
index 2da5997..e401128 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -103,6 +103,7 @@
         <javac destdir="${build_t.java}" 
                source="1.5" debug="true" 
                fork="yes"
+               includeAntRuntime="false"
                debuglevel="lines,vars,source">
             <classpath refid="junit.compile.classpath"/>
             <src path="${test.base.dir}"/>
@@ -176,13 +177,16 @@
     <target name="junit.compile" depends="init, java.generate, java.build, native.build"/>
 
     <target name="junit.run" depends="init,gluegen.cpptasks.detect.os">
+        <mkdir dir="${results}"/>
+        <delete quiet="true">
+            <fileset dir="${results}" includes="**"/>
+        </delete>
+
         <!-- Use absolute path -->
         <property name="gluegen.lib.abs" location="${gluegen.lib}" />
         <property name="build_t.lib.abs" location="${build_t.lib}" />
 
-
         <!-- Perform the junit tests-->
-        <mkdir dir="${results}"/>
         <junit forkmode="once" showoutput="true" fork="true">
             <env key="${system.env.library.path}" path="${gluegen.lib.abs}${path.separator}${build_t.lib.abs}"/>
             <jvmarg value="-Djava.library.path=${gluegen.lib.abs}${path.separator}${build_t.lib.abs}"/>
-- 
cgit v1.2.3