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-jogl.xml | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 5381c2051..b1f0a02eb 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -949,6 +949,7 @@
                includes="javax/media/opengl/fixedfunc/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2GL3.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java javax/media/opengl/GL3.java javax/media/opengl/GL3bc.java"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                source="1.4" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
@@ -973,6 +974,7 @@
                source="${target.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
@@ -988,6 +990,7 @@
                source="${target.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath-cdc"/>
             <src path="${src.java}" />
@@ -1004,6 +1007,7 @@
                source="${target.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
@@ -1019,6 +1023,7 @@
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath-cdc"/>
             <src path="${src.java}" />
-- 
cgit v1.2.3