diff options
| -rw-r--r-- | make/build-junit.xml | 68 | ||||
| -rwxr-xr-x | make/build.xml | 2 |
2 files changed, 36 insertions, 34 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml index 101ab97..82a0403 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -27,30 +27,30 @@ <property name="test.junit.rel" value="com/jogamp/gluegen/test/junit" /> <property name="test.junit.dir" value="${test.base.dir}/${test.junit.rel}" /> - <property name="test.dir" value="${gluegen.root}/${rootrel.build}/test"/> - <property name="results" value="${test.dir}/results" /> - <property name="build" value="${test.dir}/build" /> - <property name="build.gen" value="${build}/gensrc"/> - <property name="build.java" value="${build}/classes"/> - <property name="build.obj" value="${build}/obj"/> - <property name="build.lib" value="${build}/natives"/> + <property name="test.dir" value="${gluegen.root}/${rootrel.build}/test"/> + <property name="results" value="${test.dir}/results" /> + <property name="build_t" value="${test.dir}/build" /> + <property name="build_t.gen" value="${build_t}/gensrc"/> + <property name="build_t.java" value="${build_t}/classes"/> + <property name="build_t.obj" value="${build_t}/obj"/> + <property name="build_t.lib" value="${build_t}/natives"/> <property name="test.junit.rootrel" value="src/junit/${test.junit.rel}" /> - <property name="build.gen.rootrel" value="${rootrel.build}/test/build/gensrc"/> + <property name="build_t.gen.rootrel" value="${rootrel.build}/test/build/gensrc"/> <mkdir dir="${test.dir}"/> <mkdir dir="${results}"/> - <mkdir dir="${build}"/> - <mkdir dir="${build.gen}"/> - <mkdir dir="${build.java}"/> - <mkdir dir="${build.obj}"/> - <mkdir dir="${build.lib}"/> + <mkdir dir="${build_t}"/> + <mkdir dir="${build_t.gen}"/> + <mkdir dir="${build_t.java}"/> + <mkdir dir="${build_t.obj}"/> + <mkdir dir="${build_t.lib}"/> <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" /> <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" /> <property name="junit.jar" value="${gluegen.root}/make/lib/junit-4.5.jar" /> - <property name="gluegen-test.jar" value="${build}/gluegen-test.jar" /> + <property name="gluegen-test.jar" value="${build_t}/gluegen-test.jar" /> <path id="gluegen.classpath"> <pathelement location="${gluegen.jar}" /> @@ -76,11 +76,11 @@ <echo message="test.junit.dir: ${test.junit.dir} "/> <echo message="test.dir: ${test.dir} "/> <echo message="results: ${results} "/> - <echo message="build: ${build} "/> - <echo message="build.gen: ${build.gen} "/> - <echo message="build.java: ${build.java} "/> - <echo message="build.obj: ${build.obj} "/> - <echo message="build.lib: ${build.lib} "/> + <echo message="build_t: ${build_t} "/> + <echo message="build_t.gen: ${build_t.gen} "/> + <echo message="build_t.java: ${build_t.java} "/> + <echo message="build_t.obj: ${build_t.obj} "/> + <echo message="build_t.lib: ${build_t.lib} "/> <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT --> <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask" @@ -91,19 +91,21 @@ <target name="java.build" depends="java.generate"> <echo message=" - - - compiling all java files - - - "/> + <echo message=" test.base.dir ${test.base.dir}"/> + <echo message=" build_t.gen ${build_t.gen}"/> - <javac destdir="${build.java}" + <javac destdir="${build_t.java}" source="1.5" debug="true" fork="yes" verbose="true" debuglevel="lines,vars,source"> <classpath refid="junit.compile.classpath"/> <src path="${test.base.dir}"/> - <src path="${build.gen}" /> + <src path="${build_t.gen}" /> </javac> <jar destfile="${gluegen-test.jar}"> - <fileset dir="${build.java}"> + <fileset dir="${build_t.java}"> <include name="${test.junit.rel}/*.class"/> </fileset> </jar> @@ -142,8 +144,8 @@ <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition> <cc outtype="shared" - objdir="${build.obj}" - outfile="${build.lib}/@{output.lib.name}" + objdir="${build_t.obj}" + outfile="${build_t.lib}/@{output.lib.name}" optimize="${c.compiler.optimise}" debug="${c.compiler.debug}" multithreaded="true" @@ -154,7 +156,7 @@ <compiler extends="@{compiler.cfg.id}" > <includepath path="${test.junit.dir}"/> - <includepath path="${build.gen}/native"/> + <includepath path="${build_t.gen}/native"/> </compiler> <linker extends="@{linker.cfg.id}"> @@ -166,15 +168,15 @@ <!-- FIXME: this is a hack; the cpptask should have an option to change the suffix or at least understand the override from dylib to jnilib --> <antcall target="rename.dylib" inheritRefs="true"> - <param name="src" value="${build.lib}/lib@{output.lib.name}.dylib" /> - <param name="dest" value="${build.lib}/lib@{output.lib.name}.jnilib" /> + <param name="src" value="${build_t.lib}/lib@{output.lib.name}.dylib" /> + <param name="dest" value="${build_t.lib}/lib@{output.lib.name}.jnilib" /> </antcall> <!-- FIXME: this is a hack; the cpptask should have an option to change the suffix or at least understand the override from dylib to jnilib --> <antcall target="rename.mingw.dll" inheritRefs="true"> - <param name="src" value="${build.lib}/lib@{output.lib.name}.so" /> - <param name="dest" value="${build.lib}/@{output.lib.name}.dll" /> + <param name="src" value="${build_t.lib}/lib@{output.lib.name}.so" /> + <param name="dest" value="${build_t.lib}/@{output.lib.name}.dll" /> </antcall> </sequential> </macrodef> @@ -185,14 +187,14 @@ <!-- Perform the junit tests--> <mkdir dir="${results}"/> <junit forkmode="once" showoutput="true" fork="true" haltonerror="true"> - <jvmarg value="-Djava.library.path=${build.lib}"/> + <jvmarg value="-Djava.library.path=${build_t.lib}"/> <jvmarg value="-Drootrel.build=${rootrel.build}"/> <formatter usefile="false" type="plain"/> <formatter usefile="true" type="xml"/> <classpath refid="junit.run.classpath"/> <batchtest todir="${results}"> - <fileset dir="${build.java}"> + <fileset dir="${build_t.java}"> <include name="${test.junit.rel}/Test*"/> </fileset> <formatter usefile="false" type="brief"/> @@ -223,7 +225,7 @@ <dirset id="stub.includes.fileset.test" dir="." includes="${test.junit.dir}/*" /> <gluegen src="${test.junit.dir}/test1-gluegen.c" - outputRootDir="${build.gen}" + outputRootDir="${build_t.gen}" config="${test.junit.dir}/test1-gluegen.cfg" literalInclude="${test.junit.dir}" includeRefid="stub.includes.fileset.test" @@ -236,7 +238,7 @@ <target name="junit.test1.c.build" unless="build.javaonly" > <patternset id="junit.test1.c.src.files"> <include name="${test.junit.rootrel}/test1.c"/> - <include name="${build.gen.rootrel}/native/BindingTest1_JNI.c"/> + <include name="${build_t.gen.rootrel}/native/BindingTest1_JNI.c"/> </patternset> <c.build c.compiler.src.files="junit.test1.c.src.files" diff --git a/make/build.xml b/make/build.xml index 99ea011..5a19974 100755 --- a/make/build.xml +++ b/make/build.xml @@ -562,7 +562,7 @@ <copy file="${antlr.jar}" todir="${build}" /> </target> - <target name="all" depends="gluegen.build" /> + <target name="all" depends="gluegen.build, junit.compile" /> <target name="clean" depends="init"> <delete includeEmptyDirs="true"> |