From 4512900ddcb9ce9a498411d257b1b6d6010ec006 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 4 Jun 2010 05:21:32 +0200
Subject: JOGL: Unify library loading (impl and binding), incl. lookup ;
 GLAutoDrawable: dispose() calls only with created context.

- Using the EGL approach of DynamicLookupHelper,
  now generalized in abstract GLDynamicLookupHelper,
  DesktopGLDynamicLookupHelper and EGLGLDynamicLookupHelper.
  The implementation of these are self contained.

  - Sharing common code.
  - Unifying implementation and binding loading,
    as well as the function lookup within the impl libs.

- Removed DRIHack, since its no more required
  due to the new DesktopGLDynamicLookupHelper.

- Removed compile time link to GL and GLU libs

- Removed redundant library OS functions from X11/WGL
  bindings, GlueGen's common code is being used now.

- GLAutoDrawable: dispose() calls only with created context.
  This cleans up stack traces in case of eventual bugs,
  where context creation is not successful.
---
 make/build-junit.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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

diff --git a/make/build-junit.xml b/make/build-junit.xml
index 749e73dbd..3ec367cbb 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -53,7 +53,21 @@
     <!--
        - Build/run junit.
       -->
-    <target name="junit.compile" depends="init">
+    <target name="junit.compile.check" depends="init">
+      <property name="jogl.test.jar.path" location="${jogl.test.jar}"/> <!-- absolute path -->
+      <echo message="jogl.test.jar ${jogl.test.jar.path}"/>
+      <uptodate property="junit.compile.skip">
+        <srcfiles dir= "."                 includes="*.xml"/>
+        <srcfiles dir= "${src.junit}"      includes="**"/>
+        <srcfiles                          file="${nativewindow.all.jar}" />
+        <srcfiles                          file="${jogl.all.jar}" />
+        <srcfiles                          file="${newt.all.jar}" />
+        <srcfiles                          file="${gluegen.jar}" />
+        <mapper type="merge" to="${jogl.test.jar.path}"/>
+      </uptodate>
+    </target>
+
+    <target name="junit.compile" depends="junit.compile.check" unless="junit.compile.skip">
         <!-- Perform the junit pass Java compile -->
         <javac destdir="${classes}"
                source="${host.sourcelevel}"
@@ -64,6 +78,9 @@
             <classpath refid="junit_jogl_newt.compile.classpath"/>
             <src path="${src.junit}" />
         </javac>
+        <delete includeEmptyDirs="true" quiet="true">
+            <fileset file="${jogl.test.jar}" />
+        </delete>
         <jar destfile="${jogl.test.jar}" filesonly="true">
             <fileset dir="${classes}">
                 <include name="${java.part.test}"/>
-- 
cgit v1.2.3