diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 1a5703aa9..b201ec4e1 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -211,6 +211,7 @@ <property name="gluegen.jar" value="${build.gluegen}/gluegen.jar" /> <property name="ant.jar" value="${ant.home}/lib/ant.jar" /> <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> + <property name="ant-junit4.jar" value="${ant.home}/lib/ant-junit4.jar" /> <property name="build.joal" value="${joal.root}/${rootrel.build}" /> <!-- optional --> @@ -485,6 +486,7 @@ <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> + <pathelement location="${ant-junit4.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> <path refid="nativewindow_all_atoms.classpath" /> @@ -497,6 +499,7 @@ <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> + <pathelement location="${ant-junit4.jar}" /> <pathelement location="${gluegen-rt-android.jar}" /> <pathelement location="${swt.jar}" /> <path refid="nativewindow_all_atoms.classpath" /> @@ -518,52 +521,56 @@ <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> + <pathelement location="${ant-junit4.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${jogl-all.jar}" /> <pathelement location="${jogl-test.jar}" /> </path> <property name="junit_jogl_awt.run.jars" - value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all.jar}${path.separator}${jogl-test.jar}"/> - <property name="junit_jogl_awt.run.remote.jars" 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}${jogl-all.jar}${path.separator}${jogl-test.jar}"/> + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all.jar}${path.separator}${jogl-test.jar}"/> + <property name="junit_jogl_awt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit4.jar${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all.jar}${path.separator}${jogl-test.jar}"/> <!-- Test Run w/o AWT .. --> <path id="junit_jogl_noawt.run.classpath"> <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> + <pathelement location="${ant-junit4.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${jogl-all-noawt.jar}" /> <pathelement location="${jogl-test.jar}" /> </path> <property name="junit_jogl_noawt.run.jars" - value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${jogl-test.jar}"/> - <property name="junit_jogl_noawt.run.remote.jars" 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}${jogl-all-noawt.jar}${path.separator}${jogl-test.jar}"/> + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${jogl-test.jar}"/> + <property name="junit_jogl_noawt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit4.jar${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${jogl-test.jar}"/> <!-- Test Run w/ SWT .. --> <path id="junit_jogl_swt.run.classpath"> <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> + <pathelement location="${ant-junit4.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> <pathelement location="${jogl-all.jar}" /> <pathelement location="${jogl-test.jar}" /> </path> <property name="junit_jogl_swt.run.jars" - value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${swt.jar}${path.separator}${jogl-all.jar}${path.separator}${jogl-test.jar}"/> + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${gluegen-rt.jar}${path.separator}${swt.jar}${path.separator}${jogl-all.jar}${path.separator}${jogl-test.jar}"/> <!-- Test Run w/ Android [w/o AWT] .. --> <path id="junit_jogl_android.run.classpath"> <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> + <pathelement location="${ant-junit4.jar}" /> <pathelement location="${android.jar}" /> <pathelement location="${gluegen-rt-android.jar}" /> <pathelement location="${jogl-all-android.jar}" /> <pathelement location="${jogl-test.jar}" /> </path> <property name="junit_jogl_android.run.jars" - value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt-android.jar}${path.separator}${jogl-all-android.jar}${path.separator}${jogl-test.jar}"/> + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${gluegen-rt-android.jar}${path.separator}${jogl-all-android.jar}${path.separator}${jogl-test.jar}"/> <property name="junit.run.remote.apks" value="${gluegen.root}/${rootrel.build}/jogamp.android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${jogl-all-android.apk}${path.separator}${jogl-test.apk}"/> |