From 48e6e34ebc8747ef80a4c74c18679f027a8172f0 Mon Sep 17 00:00:00 2001
From: kbr <kbr@dev.java.net>
Date: Sun, 12 Feb 2006 21:02:37 +0000
Subject: Added checking of whether the correct GLContext is current to the
 DebugGL pipeline. Fixed dependencies in JOGL and JOAL build.xml files so that
 generated code gets automatically rebuilt if GlueGen is updated.

git-svn-id: file:///home/mbien/NetBeansProjects/JOGAMP/joal-sync/git-svn/../svn-server-sync/joal/trunk@112 03bf7f67-59de-4072-a415-9a990d468a3f
---
 make/build.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'make')

diff --git a/make/build.xml b/make/build.xml
index ebe3bc6..30f1ca1 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -162,8 +162,11 @@
         <dirset id="stub.includes.fileset.all" dir=".">
             <include name="${stub.includes.dir}/openal/**" />
         </dirset>
-        <fileset id="stub.includes.dependencies.fileset" dir=".">
-            <include name="${stub.includes.dir}/openal/**" />
+        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes.dir}">
+            <include name="openal/**" />
+        </fileset>
+        <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" />
+        <fileset id="stub.includes.dependencies.fileset.3" dir=".">
             <include name="*.cfg" />
             <include name="*.java" />
             <include name="*.c" />
@@ -318,10 +321,9 @@
         <!-- Blow away all target files if any dependencies are violated
              (the uptodate task doesn't allow arbitrary source and target filesets but should) -->
         <dependset>
-            <srcfileset refid="stub.includes.dependencies.fileset" />
-            <srcfileset dir=".">
-	        <include name="${classes}/net/java/games/gluegen/**/*.class" />
-            </srcfileset>
+            <srcfileset refid="stub.includes.dependencies.fileset.1" />
+            <srcfileset refid="stub.includes.dependencies.fileset.2" />
+            <srcfileset refid="stub.includes.dependencies.fileset.3" />
             <targetfileset dir=".">
                 <include name="${src.generated.java}/**/*.java" />
                 <include name="${src.generated.c}/**/*.c" />
@@ -329,9 +331,11 @@
         </dependset>
 
         <!-- Now check for the presence of one well-known file -->
-        <uptodate property="java.generate.skip">
-            <srcfiles refid="stub.includes.dependencies.fileset" />
-            <mapper type="merge" to="${src.generated.java}/net/java/games/joal/AL.java" />
+        <uptodate property="java.generate.skip"
+                  targetfile="${src.generated.java}/net/java/games/joal/AL.java">
+            <srcfiles refid="stub.includes.dependencies.fileset.1" />
+            <srcfiles refid="stub.includes.dependencies.fileset.2" />
+            <srcfiles refid="stub.includes.dependencies.fileset.3" />
         </uptodate>
     </target>
 
-- 
cgit v1.2.3