diff options
| author | Kenneth Russel <[email protected]> | 2006-02-12 21:02:37 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2006-02-12 21:02:37 +0000 |
| commit | 07862414f8274f88a6243e8963bbe56fe9f640e7 (patch) | |
| tree | f618c04ee8f70f868b189ee0c84174f7eb24451a | |
| parent | 606c984ad87163c1aa9cb975b810e686f30ecab0 (diff) | |
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:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@603 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 33 | ||||
| -rw-r--r-- | make/gl-impl-CustomJavaCode.java | 6 |
2 files changed, 26 insertions, 13 deletions
diff --git a/make/build.xml b/make/build.xml index 11269dd84..e98b75714 100644 --- a/make/build.xml +++ b/make/build.xml @@ -164,12 +164,15 @@ <include name="${stub.includes.dir}/x11/**" /> <include name="${stub.includes.dir}/common/**" /> </dirset> - <fileset id="stub.includes.dependencies.fileset" dir="."> - <include name="${stub.includes.dir}/opengl/**" /> - <include name="${stub.includes.dir}/macosx/**" /> - <include name="${stub.includes.dir}/win32/**" /> - <include name="${stub.includes.dir}/x11/**" /> - <include name="${stub.includes.dir}/common/**" /> + <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes.dir}"> + <include name="opengl/**" /> + <include name="macosx/**" /> + <include name="win32/**" /> + <include name="x11/**" /> + <include name="common/**" /> + </fileset> + <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" /> + <fileset id="stub.includes.dependencies.fileset.3" dir="."> <include name="*.cfg" /> <include name="gl*.java" /> <include name="*.c" /> @@ -443,17 +446,21 @@ <!-- 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" /> - <targetfileset dir="."> - <include name="${src.generated.java}/**/*.java" /> - <include name="${src.generated.c}/**/*.c" /> + <srcfileset refid="stub.includes.dependencies.fileset.1" /> + <srcfileset refid="stub.includes.dependencies.fileset.2" /> + <srcfileset refid="stub.includes.dependencies.fileset.3" /> + <targetfileset dir="${src.generated}"> + <include name="**/*.java" /> + <include name="**/*.c" /> </targetfileset> </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}/javax/media/opengl/GL.java" /> + <uptodate property="java.generate.skip" + targetfile="${src.generated.java}/javax/media/opengl/GL.java"> + <srcfiles refid="stub.includes.dependencies.fileset.1" /> + <srcfiles refid="stub.includes.dependencies.fileset.2" /> + <srcfiles refid="stub.includes.dependencies.fileset.3" /> </uptodate> </target> diff --git a/make/gl-impl-CustomJavaCode.java b/make/gl-impl-CustomJavaCode.java index 0e3762724..210195dec 100644 --- a/make/gl-impl-CustomJavaCode.java +++ b/make/gl-impl-CustomJavaCode.java @@ -24,6 +24,12 @@ public Object getExtension(String extensionName) { return null; } +/** Returns the context this GL object is associated with for better + error checking by DebugGL. */ +public GLContext getContext() { + return _context; +} + private GLContextImpl _context; /** |