aboutsummaryrefslogtreecommitdiffstats
path: root/make/build-junit.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-06-04 05:21:32 +0200
committerSven Gothel <[email protected]>2010-06-04 05:21:32 +0200
commit4512900ddcb9ce9a498411d257b1b6d6010ec006 (patch)
treeae9878c82cda41920f46ea639178f7d951d5af8f /make/build-junit.xml
parent6bbf70d2f4a06b8aa0b100d83ed9aca6dd80040e (diff)
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.
Diffstat (limited to 'make/build-junit.xml')
-rw-r--r--make/build-junit.xml19
1 files changed, 18 insertions, 1 deletions
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}"/>