diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 287 | ||||
| -rw-r--r-- | make/build-jogl.xml | 50 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 10 | ||||
| -rw-r--r-- | make/build-newt.xml | 22 | ||||
| -rw-r--r-- | make/build-test.xml | 14 | ||||
| -rw-r--r-- | make/build.xml | 18 | ||||
| -rwxr-xr-x | make/scripts/setenv-jogl.sh | 4 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 16 |
8 files changed, 211 insertions, 210 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=""/> diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 0c7328c4a..6845354f6 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1550,7 +1550,7 @@ <srcfileset dir="${src.java}" includes="${java.part.nonjava}"/> <targetfileset dir="." - includes="${jogl.util.jar} ${jogl.util.fixedfuncemu.jar}" /> + includes="${jogl-util.jar} ${jogl-util-fixedfuncemu.jar}" /> </dependset> </target> <target name="build-jars" depends="build-jars-dependset,build-jars-javase" /> @@ -1570,48 +1570,48 @@ </target> <target name="build-jars-os-desktop-javase" depends="setup-manifestfile"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.x11.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-os-x11.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glx}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.win.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-os-win.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.wgl}" /> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.osx.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-os-osx.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.cgl}"/> </jar> </target> <target name="build-jars-android" depends="setup-manifestfile" if="isAndroid"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.android.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-os-android.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.android}"/> </jar> </target> <target name="build-jars-mobile-javase" depends="setup-manifestfile"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glmobile.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.egl} ${java.part.es1} ${java.part.es2}" excludes="${java.part.awt} ${java.part.swt} ${java.part.es1.dbg} ${java.part.es2.dbg}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.dbg.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glmobile-dbg.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.es1.dbg} ${java.part.es2.dbg}"/> </jar> </target> <target name="build-jars-awt-javase" depends="setup-manifestfile" unless="setup.noAWT"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.awt.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.awt}" /> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.awt.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.awt}"/> </jar> </target> <target name="build-jars-swt-javase" depends="setup-manifestfile" unless="setup.noSWT"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.swt.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-swt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.swt}" /> </jar> @@ -1619,22 +1619,22 @@ <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase"> <!--os specific gldesktop--> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.gldesktop.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-gldesktop.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.gldesktop}" excludes="${java.part.gldesktop.dbg} ${java.part.glugldesktop}"/> </jar> <!-- misc --> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.gldesktop.dbg.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-gldesktop-dbg.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.gldesktop.dbg}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glugldesktop.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glu-gldesktop.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glugldesktop}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.gldesktop.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-gldesktop.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.gldesktop}" excludes="${java.part.awt} ${java.part.util.awt} ${java.part.swt}"/> @@ -1643,50 +1643,50 @@ <target name="build-jars-javase" depends="setup-manifestfile, build-jars-android, build-jars-mobile-javase, build-jars-desktop-javase, build-jars-awt-javase, build-jars-swt-javase"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.core.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}" excludes="${java.part.core.exclude}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.sdk.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-sdk.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.sdk}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glutess.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glutess.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glutess}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glumipmap.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glumipmap.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.glumipmap}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util} ${java.part.util.glsl} ${java.part.util.graph}" excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/> <fileset dir="resources/assets" includes="jogl/util/**" /> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-fixedfuncemu.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.fixedfuncemu}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.omx.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-omx.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.openmax}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.cg.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-cg.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.nv-cg}"/> </jar> <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true"> <fileset dir="${obj.jogl}"> <include name="*.${native.library.suffix}" /> - <exclude name="*jogl_cg.${native.library.suffix}" /> + <exclude name="*jogl-cg.${native.library.suffix}" /> </fileset> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl_cg-natives-${os.and.arch}.jar" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-cg-natives-${os.and.arch}.jar" filesonly="true"> <fileset dir="${obj.jogl}"> - <include name="*jogl_cg.${native.library.suffix}" /> + <include name="*jogl-cg.${native.library.suffix}" /> </fileset> </jar> </target> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 233108823..c77558d6b 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -820,7 +820,7 @@ </target> <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.awt.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.awt}" excludes="${java.excludes.awt}"/> @@ -828,28 +828,28 @@ </target> <target name="build-jars-x11" depends="setup-manifestfile"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.x11.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-os-x11.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.x11}" /> </jar> </target> <target name="build-jars-windows" depends="setup-manifestfile"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.win.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-os-win.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.windows}" /> </jar> </target> <target name="build-jars-macosx" depends="setup-manifestfile"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.macosx.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-os-osx.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.macosx}" /> </jar> </target> <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-x11,build-jars-windows,build-jars-macosx"> - <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.core.jar}" filesonly="true"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}" excludes="${java.part.awt} ${java.part.x11} ${java.part.windows}"/> diff --git a/make/build-newt.xml b/make/build-newt.xml index 695c86d19..a6be5042e 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -701,52 +701,52 @@ </target> <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.awt.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-awt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.awt}"/> </jar> </target> <target name="build-jars-opengl" depends="setup-manifestfile" unless="setup.noOpenGL"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.ogl.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-ogl.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.opengl}"/> </jar> </target> <target name="build-jars-driver" depends="setup-manifestfile"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.x11.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-x11.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.x11}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.win.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-win.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.windows}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.macosx.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-osx.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.macosx}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.kd.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-kd.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.kd}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.broadcomegl.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-broadcomegl.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.broadcomegl}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.intelgdl.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-intelgdl.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.intelgdl}"/> </jar> </target> <target name="build-jars-javase" depends="setup-manifestfile,build-jars-opengl,build-jars-awt,build-jars-driver"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.core.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}"/> </jar> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.event.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-event.jar}" filesonly="true"> <fileset dir="${classes}"> <include name="com/jogamp/newt/Display*" /> <include name="com/jogamp/newt/Screen*" /> @@ -759,7 +759,7 @@ </target> <target name="build-jars-android" depends="setup-manifestfile" if="isAndroid"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.android.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-android.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.driver.android}"/> </jar> diff --git a/make/build-test.xml b/make/build-test.xml index f5437902e..51eadfebd 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -51,7 +51,7 @@ <fileset dir="." includes="*.png" /> <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> - <fileset file="${jogl.test.jar}" /> + <fileset file="${jogl-test.jar}" /> </delete> </target> @@ -85,7 +85,7 @@ </filterset> </copy> - <jar manifest="${build.test}/manifest-test.mf" destfile="${jogl.test.jar}" filesonly="true"> + <jar manifest="${build.test}/manifest-test.mf" destfile="${jogl-test.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) --> @@ -121,7 +121,7 @@ </filterset> </copy> - <jar manifest="${build.test}/manifest-test-android.mf" destfile="${jogl.test-android.jar}" filesonly="true"> + <jar manifest="${build.test}/manifest-test-android.mf" destfile="${jogl-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) --> @@ -134,7 +134,7 @@ assetsdir="resources/assets-test" jarsrcdir="${src}/test" jarbuilddir="${jar}" - jarbasename="jogl.test-android" + jarbasename="jogl-test-android" nativebuilddir="${lib}" nativebasename="non-existing" androidmanifest.path="resources/android/AndroidManifest-test.xml" @@ -149,8 +149,8 @@ <mkdir dir="${obj.test}" /> <mkdir dir="${classes}" /> - <property name="jogl.test.jar.path" location="${jogl.test.jar}"/> <!-- absolute path --> - <echo message="jogl.test.jar ${jogl.test.jar.path}"/> + <property name="jogl-test.jar.path" location="${jogl-test.jar}"/> <!-- absolute path --> + <echo message="jogl-test.jar ${jogl-test.jar.path}"/> <uptodate property="test.compile.skip"> <srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "${src.test}" includes="**"/> @@ -159,7 +159,7 @@ <srcfiles dir="${src}/nativewindow" /> <srcfiles dir="${src}/jogl" /> <srcfiles dir="${src}/newt" /> - <mapper type="merge" to="${jogl.test.jar.path}"/> + <mapper type="merge" to="${jogl-test.jar.path}"/> </uptodate> </target> diff --git a/make/build.xml b/make/build.xml index 9258df0e9..23aa218b4 100644 --- a/make/build.xml +++ b/make/build.xml @@ -99,7 +99,7 @@ </target> <target name="one.jar.dir.android" depends="one.jar.dir.prep" if="isAndroid" unless="one.dir.skip"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-android.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-android.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_core_atoms.classpath"/> @@ -111,7 +111,7 @@ </target> <target name="one.jar.dir" depends="one.jar.dir.prep,one.jar.dir.android" unless="one.dir.skip"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all_atoms.classpath"/> @@ -120,7 +120,7 @@ </zips> </archives> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-noawt.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-noawt.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all-noawt_atoms.classpath"/> @@ -129,7 +129,7 @@ </zips> </archives> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-mobile.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-mobile.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all-noawt_atoms.classpath"/> @@ -147,8 +147,8 @@ </target> <target name="android.package.jogl.skip.check" depends="init,gluegen.cpptasks.detect.os"> - <uptodate property="android.package.jogl.skip" targetfile="${jogl.all-android.apk}"> - <srcfiles dir="${jar}" includes="jogl.all-android.jar" /> + <uptodate property="android.package.jogl.skip" targetfile="${jogl-all-android.apk}"> + <srcfiles dir="${jar}" includes="jogl-all-android.jar" /> <srcfiles dir="resources/android" includes="**" /> </uptodate> </target> @@ -158,7 +158,7 @@ assetsdir="resources/assets" jarsrcdir="${src}/jogl/classes" jarbuilddir="${jar}" - jarbasename="jogl.all-android" + jarbasename="jogl-all-android" nativebuilddir="${lib}" nativebasename="" android.abi="${android.abi}" @@ -173,12 +173,12 @@ <uptodate property="one.dir.skip.native" targetfile="${jar}/jogl-all-natives-${os.and.arch}.jar"> <srcfiles dir="${lib}" includes="*.${native.library.suffix}" /> </uptodate> - <uptodate property="one.dir.skip.all" targetfile="${jogl.all.jar}"> + <uptodate property="one.dir.skip.all" targetfile="${jogl-all.jar}"> <srcfiles dir="${build.nativewindow}" includes="*.jar"/> <srcfiles dir="${build.jogl}" includes="*.jar"/> <srcfiles dir="${build.newt}" includes="*.jar"/> </uptodate> - <uptodate property="one.dir.skip.android" targetfile="${jogl.all-android.jar}"> + <uptodate property="one.dir.skip.android" targetfile="${jogl-all-android.jar}"> <srcfiles dir="${build.nativewindow}" includes="*.jar"/> <srcfiles dir="${build.jogl}" includes="*.jar"/> <srcfiles dir="${build.newt}" includes="*.jar"/> diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh index 2d91f278f..4067e65c9 100755 --- a/make/scripts/setenv-jogl.sh +++ b/make/scripts/setenv-jogl.sh @@ -93,8 +93,8 @@ CLASSPATH=.:$GLUEGEN_JAR:$JOGL_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS export CLASSPATH # We use TempJarCache per default now! -#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR -#export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR +export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR echo JOGAMP_ALL_AWT_CLASSPATH: $CLASSPATH echo JOGAMP_ALL_NOAWT_CLASSPATH: $CLASSPATH diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 702b0dc8c..8f4237012 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -69,11 +69,11 @@ function jrun() { #D_ARGS="-Dnewt.test.Screen.disableScreenMode -Dnewt.debug.Screen" #D_ARGS="-Djogl.debug.ExtensionAvailabilityCache -Djogl.debug=all -Dnativewindow.debug=all -Djogamp.debug.ProcAddressHelper=true -Djogamp.debug.NativeLibrary=true -Djogamp.debug.NativeLibrary.Lookup=true" #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" + #D_ARGS="-Djogl.debug=all -Djogamp.debug.Lock -Djogamp.common.utils.locks.Lock.timeout=600000" #D_ARGS="-Dnewt.debug.MainThread" #D_ARGS="-Dnewt.debug.Window" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all" #D_ARGS="-Dnativewindow.debug.GraphicsConfiguration -Dnativewindow.debug.NativeWindow" - #D_ARGS="-Djogl.debug=all" #D_ARGS="-Djogl.debug.GLCanvas -Djogl.debug.Animator -Djogl.debug.GLDrawable -Djogl.debug.GLContext -Djogl.debug.GLContext.TraceSwitch" #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.ExtensionAvailabilityCache" #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GLProfile -Djogl.debug.GLDrawable" @@ -120,11 +120,9 @@ function jrun() { #D_ARGS="-Dnativewindow.debug.ToolkitLock.TraceLock" #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode -Djogl.debug.TraceGL" #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLState" - #D_ARGS="-Djogamp.debug.JARUtil" - #D_ARGS="-Djogamp.debug.TempFileCache" - #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JARUtil" - #D_ARGS="-Djogamp.debug.JNILibLoader" - #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.gluegen.UseTempJarCache=false -Djogamp.debug.JARUtil" + #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil" + #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil" + #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogamp.gluegen.UseTempJarCache=false" #D_ARGS="-Dnewt.test.EDTMainThread -Dnewt.debug.MainThread" #C_ARG="com.jogamp.newt.util.MainThread" #D_ARGS="-Dnewt.debug.MainThread" @@ -143,6 +141,8 @@ function jrun() { X_ARGS="-Djava.awt.headless=false $X_ARGS" else export CLASSPATH=$JOGAMP_ALL_NOAWT_CLASSPATH + #export CLASSPATH=$JOGAMP_MOBILE_CLASSPATH + #export CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILD_DIR/jar/atomic/jogl-core.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-gldesktop.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-util.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-core.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-core.jar:$JOGL_BUILD_DIR/jar/atomic/newt-driver-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-ogl.jar:$JOGL_BUILD_DIR/jar/jogl-test.jar:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS X_ARGS="-Djava.awt.headless=true $X_ARGS" fi if [ $swton -eq 1 ] ; then @@ -332,8 +332,8 @@ function testawtswt() { #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTexture01AWT #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileNEWT $* -testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01AWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01NEWT $* +#testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01AWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite02NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTextureSequence01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTextureSequence01AWT $* |