From 987fb51e6c2dc3a8553ff1e01162fd10c3bc8fab Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 10 Apr 2010 01:20:56 +0200
Subject: *** Now Using Apache-Ant-1.8.0 ***

Cleanup:
    - Adding Javac includeAntRuntime argument (false whenever possible)

    - Clear junit results folder before testing

    - <ant ..> tasks, use inheritRefs="true" inheritAll="true" whenever possible
      for better performance and consistency (no duplicate property names).
      The JOGL build -> build-<component> tree is clean in this respect.

junit.run: Test*NEWT*
    Emulation of junit task,
    due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
    Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).

    Fixed NEWT tests:
        - No more println .. using Assertions ..
        - Offscreen produces 2 files correctly (Linux/NVidia, OSX/NVidia, Win32/Emulation)
---
 make/build.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'make/build.xml')

diff --git a/make/build.xml b/make/build.xml
index e39e6dea2..8d2c9765a 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -30,15 +30,15 @@
     </target>
 
     <target name="build.nativewindow" depends="init">
-        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="all" inheritAll="false"/>
+        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="all" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="build.jogl" depends="init">
-        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="all" inheritAll="false"/>
+        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="all" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="build.newt" depends="init">
-        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="all" inheritAll="false"/>
+        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="all" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="one-lib-dir" depends="init,gluegen.cpptasks.detect.os">
@@ -128,18 +128,18 @@
     <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-lib-dir,developer-zip-archive,source-archive" />
 
     <target name="junit.compile">
-      <ant antfile="build-junit.xml" target="junit.compile"/>
+      <ant antfile="build-junit.xml" target="junit.compile" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="test" depends="junit.run"/>
     <target name="junit.run" description="Run JUNIT tests in nativewindow, jogl and newt projects">
-      <ant antfile="build-junit.xml" target="junit.run"/>
+      <ant antfile="build-junit.xml" target="junit.run" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="clean" depends="init">
-        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="clean" inheritAll="false"/>
-        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="clean" inheritAll="false"/>
-        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="clean" inheritAll="false"/>
+        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make}" target="clean" inheritRefs="true" inheritAll="true"/>
+        <ant antfile="${jogl.build.xml}" dir="${jogl.make}" target="clean" inheritRefs="true" inheritAll="true"/>
+        <ant antfile="${newt.build.xml}" dir="${newt.make}" target="clean" inheritRefs="true" inheritAll="true"/>
         <delete includeEmptyDirs="true" quiet="true">
             <fileset dir="${build}" />
         </delete>
-- 
cgit v1.2.3