diff options
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 287 |
1 files changed, 144 insertions, 143 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 93835e0f1..b2885c8af 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -250,167 +250,168 @@ <!-- Atomic JavaSE JARS --> - <property name="nativewindow.core.jar" value="${build.nativewindow}/nativewindow.core.jar" /> - <property name="nativewindow.awt.jar" value="${build.nativewindow}/nativewindow.awt.jar" /> - <property name="nativewindow.os.x11.jar" value="${build.nativewindow}/nativewindow.os.x11.jar" /> - <property name="nativewindow.os.win.jar" value="${build.nativewindow}/nativewindow.os.win.jar" /> - <property name="nativewindow.os.macosx.jar" value="${build.nativewindow}/nativewindow.os.macosx.jar" /> + <property name="nativewindow-core.jar" value="${build.nativewindow}/nativewindow-core.jar" /> + <property name="nativewindow-awt.jar" value="${build.nativewindow}/nativewindow-awt.jar" /> + <property name="nativewindow-os-x11.jar" value="${build.nativewindow}/nativewindow-os-x11.jar" /> + <property name="nativewindow-os-win.jar" value="${build.nativewindow}/nativewindow-os-win.jar" /> + <property name="nativewindow-os-osx.jar" value="${build.nativewindow}/nativewindow-os-osx.jar" /> <path id="nativewindow_all_atoms.classpath"> - <pathelement location="${nativewindow.core.jar}" /> - <pathelement location="${nativewindow.awt.jar}" /> - <pathelement location="${nativewindow.os.x11.jar}" /> - <pathelement location="${nativewindow.os.win.jar}" /> - <pathelement location="${nativewindow.os.macosx.jar}" /> + <pathelement location="${nativewindow-core.jar}" /> + <pathelement location="${nativewindow-awt.jar}" /> + <pathelement location="${nativewindow-os-x11.jar}" /> + <pathelement location="${nativewindow-os-win.jar}" /> + <pathelement location="${nativewindow-os-osx.jar}" /> </path> <path id="nativewindow_all-noawt_atoms.classpath"> - <pathelement location="${nativewindow.core.jar}" /> - <pathelement location="${nativewindow.os.x11.jar}" /> - <pathelement location="${nativewindow.os.win.jar}" /> - <pathelement location="${nativewindow.os.macosx.jar}" /> + <pathelement location="${nativewindow-core.jar}" /> + <pathelement location="${nativewindow-os-x11.jar}" /> + <pathelement location="${nativewindow-os-win.jar}" /> + <pathelement location="${nativewindow-os-osx.jar}" /> </path> <path id="nativewindow_core_atoms.classpath"> - <pathelement location="${nativewindow.core.jar}" /> + <pathelement location="${nativewindow-core.jar}" /> </path> - <property name="jogl.core.jar" value="${build.jogl}/jogl.core.jar" /> - <property name="jogl.sdk.jar" value="${build.jogl}/jogl.sdk.jar" /> - <property name="jogl.glmobile.jar" value="${build.jogl}/jogl.glmobile.jar" /> - <property name="jogl.glmobile.dbg.jar" value="${build.jogl}/jogl.glmobile.dbg.jar" /> - <property name="jogl.util.jar" value="${build.jogl}/jogl.util.jar" /> - <property name="jogl.glutess.jar" value="${build.jogl}/jogl.glu.tess.jar" /> - <property name="jogl.glumipmap.jar" value="${build.jogl}/jogl.glu.mipmap.jar" /> - <property name="jogl.util.fixedfuncemu.jar" value="${build.jogl}/jogl.util.fixedfuncemu.jar" /> - <property name="jogl.awt.jar" value="${build.jogl}/jogl.awt.jar" /> - <property name="jogl.swt.jar" value="${build.jogl}/jogl.swt.jar" /> - <property name="jogl.util.awt.jar" value="${build.jogl}/jogl.util.awt.jar" /> - <property name="jogl.os.x11.jar" value="${build.jogl}/jogl.os.x11.jar" /> - <property name="jogl.os.win.jar" value="${build.jogl}/jogl.os.win.jar" /> - <property name="jogl.os.osx.jar" value="${build.jogl}/jogl.os.osx.jar" /> - <property name="jogl.os.android.jar" value="${build.jogl}/jogl.os.android.jar" /> - <property name="jogl.gldesktop.jar" value="${build.jogl}/jogl.gldesktop.jar" /> - <property name="jogl.gldesktop.dbg.jar" value="${build.jogl}/jogl.gldesktop.dbg.jar" /> - <property name="jogl.glugldesktop.jar" value="${build.jogl}/jogl.glu.gldesktop.jar" /> - <property name="jogl.util.gldesktop.jar" value="${build.jogl}/jogl.util.gldesktop.jar" /> - <property name="jogl.omx.jar" value="${build.jogl}/jogl.omx.jar" /> - <property name="jogl.cg.jar" value="${build.jogl}/jogl.cg.jar" /> + <property name="jogl-core.jar" value="${build.jogl}/jogl-core.jar" /> + <property name="jogl-sdk.jar" value="${build.jogl}/jogl-sdk.jar" /> + <property name="jogl-glmobile.jar" value="${build.jogl}/jogl-glmobile.jar" /> + <property name="jogl-glmobile-dbg.jar" value="${build.jogl}/jogl-glmobile-dbg.jar" /> + <property name="jogl-util.jar" value="${build.jogl}/jogl-util.jar" /> + <property name="jogl-glutess.jar" value="${build.jogl}/jogl-glu-tess.jar" /> + <property name="jogl-glumipmap.jar" value="${build.jogl}/jogl-glu-mipmap.jar" /> + <property name="jogl-util-fixedfuncemu.jar" value="${build.jogl}/jogl-util-fixedfuncemu.jar" /> + <property name="jogl-awt.jar" value="${build.jogl}/jogl-awt.jar" /> + <property name="jogl-swt.jar" value="${build.jogl}/jogl-swt.jar" /> + <property name="jogl-util-awt.jar" value="${build.jogl}/jogl-util-awt.jar" /> + <property name="jogl-os-x11.jar" value="${build.jogl}/jogl-os-x11.jar" /> + <property name="jogl-os-win.jar" value="${build.jogl}/jogl-os-win.jar" /> + <property name="jogl-os-osx.jar" value="${build.jogl}/jogl-os-osx.jar" /> + <property name="jogl-os-android.jar" value="${build.jogl}/jogl-os-android.jar" /> + <property name="jogl-gldesktop.jar" value="${build.jogl}/jogl-gldesktop.jar" /> + <property name="jogl-gldesktop-dbg.jar" value="${build.jogl}/jogl-gldesktop-dbg.jar" /> + <property name="jogl-glu-gldesktop.jar" value="${build.jogl}/jogl-glu-gldesktop.jar" /> + <property name="jogl-util-gldesktop.jar" value="${build.jogl}/jogl-util-gldesktop.jar" /> + <property name="jogl-omx.jar" value="${build.jogl}/jogl-omx.jar" /> + <property name="jogl-cg.jar" value="${build.jogl}/jogl-cg.jar" /> <path id="jogl_all_atoms.classpath"> - <pathelement location="${jogl.core.jar}" /> - <pathelement location="${jogl.sdk.jar}" /> - <pathelement location="${jogl.glmobile.jar}" /> - <pathelement location="${jogl.glmobile.dbg.jar}" /> - <pathelement location="${jogl.util.jar}" /> - <pathelement location="${jogl.glutess.jar}" /> - <pathelement location="${jogl.glumipmap.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> - <pathelement location="${jogl.awt.jar}" /> - <pathelement location="${jogl.swt.jar}" /> - <pathelement location="${jogl.util.awt.jar}" /> - <pathelement location="${jogl.os.x11.jar}" /> - <pathelement location="${jogl.os.win.jar}" /> - <pathelement location="${jogl.os.osx.jar}" /> - <pathelement location="${jogl.gldesktop.jar}" /> - <pathelement location="${jogl.gldesktop.dbg.jar}" /> - <pathelement location="${jogl.glugldesktop.jar}" /> - <pathelement location="${jogl.util.gldesktop.jar}" /> - <pathelement location="${jogl.omx.jar}" /> + <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl-sdk.jar}" /> + <pathelement location="${jogl-glmobile.jar}" /> + <pathelement location="${jogl-glmobile-dbg.jar}" /> + <pathelement location="${jogl-util.jar}" /> + <pathelement location="${jogl-glutess.jar}" /> + <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-util-fixedfuncemu.jar}" /> + <pathelement location="${jogl-awt.jar}" /> + <pathelement location="${jogl-swt.jar}" /> + <pathelement location="${jogl-util-awt.jar}" /> + <pathelement location="${jogl-os-x11.jar}" /> + <pathelement location="${jogl-os-win.jar}" /> + <pathelement location="${jogl-os-osx.jar}" /> + <pathelement location="${jogl-gldesktop.jar}" /> + <pathelement location="${jogl-gldesktop-dbg.jar}" /> + <pathelement location="${jogl-glu-gldesktop.jar}" /> + <pathelement location="${jogl-util-gldesktop.jar}" /> + <pathelement location="${jogl-omx.jar}" /> </path> <path id="jogl_all-noawt_atoms.classpath"> - <pathelement location="${jogl.core.jar}" /> - <pathelement location="${jogl.sdk.jar}" /> - <pathelement location="${jogl.glmobile.jar}" /> - <pathelement location="${jogl.glmobile.dbg.jar}" /> - <pathelement location="${jogl.util.jar}" /> - <pathelement location="${jogl.glutess.jar}" /> - <pathelement location="${jogl.glumipmap.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> - <pathelement location="${jogl.os.x11.jar}" /> - <pathelement location="${jogl.os.win.jar}" /> - <pathelement location="${jogl.os.osx.jar}" /> - <pathelement location="${jogl.gldesktop.jar}" /> - <pathelement location="${jogl.gldesktop.dbg.jar}" /> - <pathelement location="${jogl.glugldesktop.jar}" /> - <pathelement location="${jogl.util.gldesktop.jar}" /> - <pathelement location="${jogl.omx.jar}" /> + <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl-sdk.jar}" /> + <pathelement location="${jogl-glmobile.jar}" /> + <pathelement location="${jogl-glmobile-dbg.jar}" /> + <pathelement location="${jogl-util.jar}" /> + <pathelement location="${jogl-glutess.jar}" /> + <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-util-fixedfuncemu.jar}" /> + <pathelement location="${jogl-os-x11.jar}" /> + <pathelement location="${jogl-os-win.jar}" /> + <pathelement location="${jogl-os-osx.jar}" /> + <pathelement location="${jogl-gldesktop.jar}" /> + <pathelement location="${jogl-gldesktop-dbg.jar}" /> + <pathelement location="${jogl-glu-gldesktop.jar}" /> + <pathelement location="${jogl-util-gldesktop.jar}" /> + <pathelement location="${jogl-omx.jar}" /> </path> <path id="jogl_all-mobile_atoms.classpath"> - <pathelement location="${jogl.core.jar}" /> - <pathelement location="${jogl.glmobile.jar}" /> - <pathelement location="${jogl.glmobile.dbg.jar}" /> - <pathelement location="${jogl.util.jar}" /> - <pathelement location="${jogl.glutess.jar}" /> - <pathelement location="${jogl.glumipmap.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> - <pathelement location="${jogl.omx.jar}" /> + <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl-glmobile.jar}" /> + <pathelement location="${jogl-glmobile-dbg.jar}" /> + <pathelement location="${jogl-util.jar}" /> + <pathelement location="${jogl-glutess.jar}" /> + <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-util-fixedfuncemu.jar}" /> + <pathelement location="${jogl-os-x11.jar}" /> + <pathelement location="${jogl-omx.jar}" /> </path> <path id="jogl_all-android_atoms.classpath"> - <pathelement location="${jogl.core.jar}" /> - <pathelement location="${jogl.glmobile.jar}" /> - <pathelement location="${jogl.glmobile.dbg.jar}" /> - <pathelement location="${jogl.util.jar}" /> - <pathelement location="${jogl.glutess.jar}" /> - <pathelement location="${jogl.glumipmap.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> - <pathelement location="${jogl.os.android.jar}" /> - <pathelement location="${jogl.omx.jar}" /> + <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl-glmobile.jar}" /> + <pathelement location="${jogl-glmobile-dbg.jar}" /> + <pathelement location="${jogl-util.jar}" /> + <pathelement location="${jogl-glutess.jar}" /> + <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-util-fixedfuncemu.jar}" /> + <pathelement location="${jogl-os-android.jar}" /> + <pathelement location="${jogl-omx.jar}" /> </path> <!-- - ${jogl.core.jar} ${jogl.glutess.jar} ${jogl.glumipmap.jar} ${jogl.glugldesktop.jar} ${jogl.os.x11.jar} ${jogl.os.win.jar} ${jogl.os.osx.jar} ${jogl.gldesktop.jar} ${jogl.gldesktop.dbg.jar} ${jogl.glmobile.jar} ${jogl.glmobile.dbg.jar} ${jogl.omx.jar} ${jogl.util.jar} ${jogl.util.gldesktop.jar} ${jogl.util.awt.jar} ${jogl.util.fixedfuncemu.jar} ${jogl.sdk.jar} --> - - <property name="newt.core.jar" value="${build.newt}/newt.core.jar" /> - <property name="newt.ogl.jar" value="${build.newt}/newt.ogl.jar" /> - <property name="newt.awt.jar" value="${build.newt}/newt.awt.jar" /> - <property name="newt.event.jar" value="${build.newt}/newt.event.jar" /> <!-- using NEWT events w/o NEWT --> - <property name="newt.driver.x11.jar" value="${build.newt}/newt.driver.x11.jar" /> - <property name="newt.driver.win.jar" value="${build.newt}/newt.driver.win.jar" /> - <property name="newt.driver.macosx.jar" value="${build.newt}/newt.driver.macosx.jar" /> - <property name="newt.driver.android.jar" value="${build.newt}/newt.driver.android.jar" /> <!-- excluded from all --> - <property name="newt.driver.kd.jar" value="${build.newt}/newt.driver.kd.jar" /> <!-- excluded from all --> - <property name="newt.driver.intelgdl.jar" value="${build.newt}/newt.driver.intelgdl.jar" /> <!-- excluded from all --> - <property name="newt.driver.broadcomegl.jar" value="${build.newt}/newt.driver.broadcomegl.jar" /> <!-- excluded from all --> + ${jogl-core.jar} ${jogl-glutess.jar} ${jogl-glumipmap.jar} ${jogl-glu-gldesktop.jar} ${jogl-os-x11.jar} ${jogl-os-win.jar} ${jogl-os-osx.jar} ${jogl-gldesktop.jar} ${jogl-gldesktop-dbg.jar} ${jogl-glmobile.jar} ${jogl-glmobile-dbg.jar} ${jogl-omx.jar} ${jogl-util.jar} ${jogl-util-gldesktop.jar} ${jogl-util-awt.jar} ${jogl-util-fixedfuncemu.jar} ${jogl-sdk.jar} --> + + <property name="newt-core.jar" value="${build.newt}/newt-core.jar" /> + <property name="newt-ogl.jar" value="${build.newt}/newt-ogl.jar" /> + <property name="newt-awt.jar" value="${build.newt}/newt-awt.jar" /> + <property name="newt-event.jar" value="${build.newt}/newt-event.jar" /> <!-- using NEWT events w/o NEWT --> + <property name="newt-driver-x11.jar" value="${build.newt}/newt-driver-x11.jar" /> + <property name="newt-driver-win.jar" value="${build.newt}/newt-driver-win.jar" /> + <property name="newt-driver-osx.jar" value="${build.newt}/newt-driver-osx.jar" /> + <property name="newt-driver-android.jar" value="${build.newt}/newt-driver-android.jar" /> <!-- excluded from all --> + <property name="newt-driver-kd.jar" value="${build.newt}/newt-driver-kd.jar" /> <!-- excluded from all --> + <property name="newt-driver-intelgdl.jar" value="${build.newt}/newt-driver-intelgdl.jar" /> <!-- excluded from all --> + <property name="newt-driver-broadcomegl.jar" value="${build.newt}/newt-driver-broadcomegl.jar" /> <!-- excluded from all --> <path id="newt_all_atoms.classpath"> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> - <pathelement location="${newt.awt.jar}" /> - <pathelement location="${newt.driver.x11.jar}" /> - <pathelement location="${newt.driver.win.jar}" /> - <pathelement location="${newt.driver.macosx.jar}" /> + <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt-ogl.jar}" /> + <pathelement location="${newt-awt.jar}" /> + <pathelement location="${newt-driver-x11.jar}" /> + <pathelement location="${newt-driver-win.jar}" /> + <pathelement location="${newt-driver-osx.jar}" /> </path> <path id="newt_all-noawt_atoms.classpath"> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> - <pathelement location="${newt.driver.x11.jar}" /> - <pathelement location="${newt.driver.win.jar}" /> - <pathelement location="${newt.driver.macosx.jar}" /> + <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt-ogl.jar}" /> + <pathelement location="${newt-driver-x11.jar}" /> + <pathelement location="${newt-driver-win.jar}" /> + <pathelement location="${newt-driver-osx.jar}" /> </path> <path id="newt_all-mobile_atoms.classpath"> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> - <pathelement location="${newt.driver.x11.jar}" /> - <pathelement location="${newt.driver.win.jar}" /> + <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt-ogl.jar}" /> + <pathelement location="${newt-driver-x11.jar}" /> + <pathelement location="${newt-driver-win.jar}" /> </path> <path id="newt_all-android_atoms.classpath"> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> - <pathelement location="${newt.driver.android.jar}" /> + <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt-ogl.jar}" /> + <pathelement location="${newt-driver-android.jar}" /> </path> <!-- JavaSE combinations --> <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" /> <property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" /> - <property name="jogl.test.jar" value="${jar}/jogl.test.jar"/> - <property name="jogl.test-android.jar" value="${jar}/jogl.test-android.jar"/> - <property name="jogl.test-android.apk" value="${jar}/jogl.test-android.apk"/> + <property name="jogl-test.jar" value="${jar}/jogl-test.jar"/> + <property name="jogl-test-android.jar" value="${jar}/jogl-test-android.jar"/> + <property name="jogl-test-android.apk" value="${jar}/jogl-test-android.apk"/> <!-- JavaSE combinations . AWT --> - <property name="jogl.all.jar" value="${jar}/jogl.all.jar" /> + <property name="jogl-all.jar" value="${jar}/jogl-all.jar" /> <!-- JavaSE combinations . NO.AWT --> - <property name="jogl.all-noawt.jar" value="${jar}/jogl.all-noawt.jar" /> - <property name="jogl.all-mobile.jar" value="${jar}/jogl.all-mobile.jar" /> - <property name="jogl.all-android.jar" value="${jar}/jogl.all-android.jar" /> - <property name="jogl.all-android.apk" value="${jar}/jogl.all-android-${android.abi}.apk" /> + <property name="jogl-all-noawt.jar" value="${jar}/jogl-all-noawt.jar" /> + <property name="jogl-all-mobile.jar" value="${jar}/jogl-all-mobile.jar" /> + <property name="jogl-all-android.jar" value="${jar}/jogl-all-android.jar" /> + <property name="jogl-all-android.apk" value="${jar}/jogl-all-android-${android.abi}.apk" /> <path id="swt_gluegen.classpath"> <pathelement location="${gluegen-rt.jar}" /> @@ -477,7 +478,7 @@ <pathelement location="${android.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> - <pathelement location="${jogl.all.jar}" /> + <pathelement location="${jogl-all.jar}" /> </path> <!-- Test Run w/ AWT .. --> @@ -486,12 +487,12 @@ <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> <pathelement location="${gluegen-rt.jar}" /> - <pathelement location="${jogl.all.jar}" /> - <pathelement location="${jogl.test.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}${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}"/> <!-- Test Run w/o AWT .. --> <path id="junit_jogl_noawt.run.classpath"> @@ -499,12 +500,12 @@ <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> <pathelement location="${gluegen-rt.jar}" /> - <pathelement location="${jogl.all-noawt.jar}" /> - <pathelement location="${jogl.test.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}${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}"/> <!-- Test Run w/ SWT .. --> <path id="junit_jogl_swt.run.classpath"> @@ -513,11 +514,11 @@ <pathelement location="${ant-junit.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${swt.jar}" /> - <pathelement location="${jogl.all.jar}" /> - <pathelement location="${jogl.test.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}${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"> @@ -526,13 +527,13 @@ <pathelement location="${ant-junit.jar}" /> <pathelement location="${android.jar}" /> <pathelement location="${gluegen-rt-android.jar}" /> - <pathelement location="${jogl.all-android.jar}" /> - <pathelement location="${jogl.test.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}${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}"/> + 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}"/> <!-- Dummy extra CLASSPATH value, maybe overwritten --> <property name="junit_extra_classpath" value=""/> |