diff options
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index f9092d0..68f674f 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -36,6 +36,9 @@ <property name="test.junit.generation.rel" value="${test.junit.rel}/gluegen/test/junit/generation" /> <property name="test.junit.generation.dir" value="${test.base.dir}/${test.junit.generation.rel}" /> + <property name="test.jcpp.base.dir" value="${project.root}/jcpp/src/test/java" /> + + <property name="tempdir" value="${project.root}/build-temp" /> <property name="build" location="${project.root}/${rootrel.build}" /> <property name="test.dir" value="${gluegen.root}/${rootrel.build}/test"/> <property name="results" value="${test.dir}/results" /> @@ -50,6 +53,7 @@ <property name="build_t.gen.rootrel" value="${rootrel.build}/test/build/gensrc"/> + <mkdir dir="${tempdir}" /> <mkdir dir="${test.dir}"/> <mkdir dir="${results}"/> <mkdir dir="${build_t}"/> @@ -148,7 +152,7 @@ debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="junit.compile.classpath"/> <compilerarg value="-proc:only"/> - <compilerarg value="-J-Djogamp.gluegen.structgen.debug"/> + <!-- compilerarg value="-J-Djogamp.gluegen.structgen.debug"/ --> <compilerarg value="-J-Djogamp.gluegen.structgen.output=${build_t.gen}/classes"/> <src path="${test.base.dir}/com/jogamp/gluegen/test/junit/structgen"/> <src path="${build_t.gen}/classes/com/jogamp/gluegen/test/junit/structgen" /> @@ -167,6 +171,7 @@ <classpath refid="junit.compile.classpath"/> <compilerarg value="-proc:none"/> <src path="${test.base.dir}"/> + <src path="${test.jcpp.base.dir}"/> <src path="${build_t.gen}" /> </javac> @@ -264,9 +269,10 @@ <target name="junit.compile.check" depends="init"> <uptodate property="junit.compile.skip"> - <srcfiles dir= "." includes="*.xml"/> - <srcfiles dir= "${test.base.dir}" includes="**"/> - <srcfiles file="${gluegen.jar}" /> + <srcfiles dir= "." includes="*.xml"/> + <srcfiles dir= "${test.base.dir}" includes="**"/> + <srcfiles dir= "${test.jcpp.base.dir}" includes="**"/> + <srcfiles file="${gluegen.jar}" /> <mapper type="merge" to="${gluegen-test.jar}"/> </uptodate> </target> @@ -516,6 +522,12 @@ chmod 644 ${results}/* \${line.separator} </antcall> </target> + <target name="java.generate.copy2temp"> + <copy todir="${tempdir}"> + <fileset dir="${build_t}" + includes="gensrc/classes/**" /> + </copy> + </target> <!-- @@ -542,9 +554,11 @@ chmod 644 ${results}/* \${line.separator} includeRefid="stub.includes.fileset.test" emitter="com.jogamp.gluegen.JavaEmitter" dumpCPP="false" - debug="false"> + debug="false" + logLevel="WARNING"> <classpath refid="gluegen.classpath" /> </gluegen> + <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${test.junit.generation.dir}/test1-gluegen.c" outputRootDir="${build_t.gen}" @@ -553,7 +567,8 @@ chmod 644 ${results}/* \${line.separator} includeRefid="stub.includes.fileset.test" emitter="com.jogamp.gluegen.JavaEmitter" dumpCPP="false" - debug="false"> + debug="false" + logLevel="WARNING"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -564,7 +579,8 @@ chmod 644 ${results}/* \${line.separator} includeRefid="stub.includes.fileset.test" emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter" dumpCPP="false" - debug="false"> + debug="false" + logLevel="INFO"> <classpath refid="gluegen.classpath" /> </gluegen> </target> |