summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-01-31 11:38:54 +0100
committerSven Gothel <[email protected]>2013-01-31 11:38:54 +0100
commit1b7fba6b6e1a53a36afaf72a152c468a4694402a (patch)
tree4e2d4eef1bb5ce2639979ec4208c8390815547a4 /make/build.xml
parent7c47fc72f44f27979c1631247188d99a21576dc8 (diff)
JOAL Fixes: GlueGen, OpenAL Header, Added scripts/tests.sh,
- OpenAL Header - Unique declaration in al-types.h and alc-types.h, remove duplicates in al.h and alc.h - Use ALproc and ALCproc for opaque pointer return values - GlueGen Fixes - Remove duplicates in extension classes ALExt and ALExtConstants - Push all common configurations to joal-common.cfg - Complete ArgumentIsString for ALC methods - Added scripts/tests.sh for convenient manual testing of single unit test -
Diffstat (limited to 'make/build.xml')
-rwxr-xr-xmake/build.xml42
1 files changed, 29 insertions, 13 deletions
diff --git a/make/build.xml b/make/build.xml
index 99fbb37..996bbdf 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -132,6 +132,8 @@
<property name="src.c" value="${project.root}/${rootrel.src.c}" />
<property name="src.java" value="${project.root}/${rootrel.src.java}" />
<property name="build" value="${project.root}/${rootrel.build}" />
+ <property name="tempdir" value="${project.root}/build-temp" />
+ <mkdir dir="${tempdir}" />
<!-- The generated source directories. -->
<property name="src.generated" value="${build}/gensrc" />
@@ -232,6 +234,13 @@
</uptodate>
</target>
+ <target name="java.generate.copy2temp">
+ <copy todir="${tempdir}">
+ <fileset dir="${build}"
+ includes="gensrc/classes/**" />
+ </copy>
+ </target>
+
<!--
- Setup the generating ANT tasks and use it to generate the Java files
- from the C AL headers. This involves setting the taskdef and creating
@@ -244,67 +253,74 @@
<!-- Use the GlueGen task to generate the Java files -->
- <!-- Generate the AL interface class and implementation -->
+ <echo message="Generate the AL interface class and implementation" />
<gluegen src="${stub.includes.openal}/al.h"
outputRootDir="${build}"
config="${joal.cfg}"
includeRefid="stub.includes.fileset.all"
literalInclude="${stub.includes.gluegen.gg}"
- emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter">
+ emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter"
+ debug="false">
<classpath refid="gluegen.classpath" />
</gluegen>
- <!-- Generate the ALConstants interface class -->
+ <echo message="Generate the ALConstants interface class" />
<gluegen src="${stub.includes.openal}/al.h"
outputRootDir="${build}"
config="${joal.constants.cfg}"
includeRefid="stub.includes.fileset.all"
literalInclude="${stub.includes.gluegen.gg}"
- emitter="com.jogamp.gluegen.JavaEmitter">
+ emitter="com.jogamp.gluegen.JavaEmitter"
+ debug="false">
<classpath refid="gluegen.classpath" />
</gluegen>
- <!-- Generate the ALC interface class and implementation -->
+ <echo message="Generate the ALC interface class and implementation" />
<gluegen src="${stub.includes.openal}/alc.h"
outputRootDir="${build}"
config="${joal.alc.cfg}"
includeRefid="stub.includes.fileset.all"
literalInclude="${stub.includes.gluegen.gg}"
- emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter">
+ emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter"
+ debug="false">
<classpath refid="gluegen.classpath" />
</gluegen>
- <!-- Generate the ALCConstants interface class -->
+ <echo message="Generate the ALCConstants interface class" />
<gluegen src="${stub.includes.openal}/alc.h"
outputRootDir="${build}"
config="${joal.alc.constants.cfg}"
includeRefid="stub.includes.fileset.all"
literalInclude="${stub.includes.gluegen.gg}"
- emitter="com.jogamp.gluegen.JavaEmitter">
+ emitter="com.jogamp.gluegen.JavaEmitter"
+ debug="false">
<classpath refid="gluegen.classpath" />
</gluegen>
- <!-- Generate the ALExt interface class and implementation -->
+ <echo message="Generate the ALExt interface class and implementation" />
+ <antcall target="java.generate.copy2temp" inheritRefs="true" />
<gluegen src="${stub.includes.openal}/alext.h"
outputRootDir="${build}"
config="${joal.alext.cfg}"
includeRefid="stub.includes.fileset.all"
literalInclude="${stub.includes.gluegen.gg}"
- emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter">
+ emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter"
+ debug="false">
<classpath refid="gluegen.classpath" />
</gluegen>
- <!-- Generate the ALExt constants interface -->
+ <echo message="Generate the ALExt constants interface" />
+ <antcall target="java.generate.copy2temp" inheritRefs="true" />
<gluegen src="${stub.includes.openal}/alext.h"
outputRootDir="${build}"
config="${joal.alext.constants.cfg}"
includeRefid="stub.includes.fileset.all"
literalInclude="${stub.includes.gluegen.gg}"
- emitter="com.jogamp.gluegen.JavaEmitter">
+ emitter="com.jogamp.gluegen.JavaEmitter"
+ debug="false">
<classpath refid="gluegen.classpath" />
</gluegen>
-
<!-- Inform the user that the generators have successfully created
- the necessary Java files -->
<echo message="" />