diff options
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index ae3c93b5..3725de1d 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -57,6 +57,8 @@ <property name="project.root" value=".." /> <property name="build" value="${project.root}/${rootrel.build}" /> + <property name="gluegen-rt-android.jar" value="${gluegen.build}/gluegen-rt-android.jar" /> + <property name="rootrel.src.test" value="test" /> <property name="src.test" value="${project.root}/${rootrel.src.test}" /> @@ -73,11 +75,11 @@ <property name="java.dir.junit" value="${java.dir.test}"/> <property name="java.dir.manual" value="${java.dir.test}/manual"/> - <property name="gluegen-rt-android.jar" value="${gluegen.build}/gluegen-rt-android.jar" /> + <property name="jocl-test.jar" value="${build}/jar/jocl-test.jar" /> <property name="obj.all.paths" value="${gluegen.build}/obj${path.separator}${jogl.build}/lib${path.separator}${obj}${path.separator}lib/${os.and.arch}"/> - <property name="classpath.test" value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all.jar}${path.separator}${build}/jocl.jar${path.separator}${build}/jocl-test.jar"/> - <property name="classpath.test.remote" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${build}/jocl.jar${path.separator}${build}/jocl-test.jar"/> + <property name="classpath.test" value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all.jar}${path.separator}${jocl.jar}${path.separator}${jocl-test.jar}"/> + <property name="classpath.test.remote" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${jocl.jar}${path.separator}${jocl-test.jar}"/> <property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/> @@ -92,7 +94,7 @@ fork="yes" includeantruntime="false" srcdir="${src.test}" - classpath="${gluegen-rt.jar};${build}/jocl.jar;${junit.jar};${jogl-all.jar}" + classpath="${gluegen-rt.jar};${jocl.jar};${junit.jar};${jogl-all.jar}" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" @@ -110,7 +112,7 @@ <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> - <jar manifest="${build.test}/manifest-test.mf" destfile="${build}/jocl-test.jar"> + <jar manifest="${build.test}/manifest-test.mf" destfile="${jocl-test.jar}"> <!-- get all class files, but skip any resource files that external tools might have copied into the class directory (otherwise, it's possible to get the same resource file twice in the jar) --> @@ -125,7 +127,7 @@ <javac destdir="${classes.test}" fork="yes" includeAntRuntime="false" - classpath="${android.jar};${gluegen-rt-android.jar};${build}/jocl.jar;${junit.jar}" + classpath="${android.jar};${gluegen-rt-android.jar};${jocl.jar};${junit.jar}" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" @@ -145,7 +147,7 @@ <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> - <jar manifest="${build.test}/manifest-test-android.mf" destfile="${build}/jocl-test-android.jar" filesonly="true"> + <jar manifest="${build.test}/manifest-test-android.mf" destfile="${build}/jar/jocl-test-android.jar" filesonly="true"> <!-- get all class files, but skip any resource files that external tools might have copied into the class directory (otherwise, it's possible to get the same resource file twice in the jar) --> @@ -158,7 +160,7 @@ <aapt.signed assetsdir="resources/assets-test" jarsrcdir="${src.test}" - jarbuilddir="${build}" + jarbuilddir="${build}/jar" jarbasename="jocl-test-android" nativebuilddir="../${rootrel.build}/obj" nativebasename="non-existing" |