diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 108 | ||||
| -rw-r--r-- | make/build-jogl.xml | 4 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 2 | ||||
| -rw-r--r-- | make/build-newt.xml | 2 | ||||
| -rwxr-xr-x | make/scripts/lstjars.sh | 4 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 2 |
6 files changed, 61 insertions, 61 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 4eafd5386..c508e1706 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -268,54 +268,54 @@ <!-- 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-osx.jar" value="${build.nativewindow}/nativewindow-os-osx.jar" /> + <property name="nativewindow.jar" value="${build.nativewindow}/nativewindow.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.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.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.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-util-graph.jar" value="${build.jogl}/jogl-util-graph.jar" /> - <property name="jogl-util-graph-fonts-p0.jar" value="${build.jogl}/jogl-fonts-p0.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.jar" value="${build.jogl}/jogl-glu.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" /> + <property name="jogl.jar" value="${build.jogl}/jogl.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-util-graph.jar" value="${build.jogl}/jogl-util-graph.jar" /> + <property name="jogl-util-graph-fonts-p0.jar" value="${build.jogl}/jogl-fonts-p0.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.jar" value="${build.jogl}/jogl-glu.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.jar}" /> <pathelement location="${jogl-sdk.jar}" /> <pathelement location="${jogl-glmobile.jar}" /> <pathelement location="${jogl-glmobile-dbg.jar}" /> @@ -336,7 +336,7 @@ <pathelement location="${jogl-omx.jar}" /> </path> <path id="jogl_all-noawt_atoms.classpath"> - <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl.jar}" /> <pathelement location="${jogl-sdk.jar}" /> <pathelement location="${jogl-glmobile.jar}" /> <pathelement location="${jogl-glmobile-dbg.jar}" /> @@ -354,7 +354,7 @@ <pathelement location="${jogl-omx.jar}" /> </path> <path id="jogl_all-mobile_atoms.classpath"> - <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl.jar}" /> <pathelement location="${jogl-glmobile.jar}" /> <pathelement location="${jogl-glmobile-dbg.jar}" /> <pathelement location="${jogl-util.jar}" /> @@ -365,7 +365,7 @@ <pathelement location="${jogl-omx.jar}" /> </path> <path id="jogl_all-android_atoms.classpath"> - <pathelement location="${jogl-core.jar}" /> + <pathelement location="${jogl.jar}" /> <pathelement location="${jogl-glmobile.jar}" /> <pathelement location="${jogl-glmobile-dbg.jar}" /> <pathelement location="${jogl-util.jar}" /> @@ -376,24 +376,24 @@ <pathelement location="${jogl-omx.jar}" /> </path> <!-- - ${jogl-core.jar} ${jogl-glu.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-graph.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-swt.jar" value="${build.newt}/newt-swt.jar" /> - <property name="newt-event.jar" value="${build.newt}/newt-event.jar" /> <!-- using NEWT events w/o NEWT --> - <property name="newt-driver-linux.jar" value="${build.newt}/newt-driver-linux.jar" /> - <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-bcm-old.jar" value="${build.newt}/newt-driver-bcm-old.jar" /> <!-- excluded from all --> - <property name="newt-driver-bcm-vc.jar" value="${build.newt}/newt-driver-bcm-vc.jar" /> + ${jogl.jar} ${jogl-glu.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-graph.jar} ${jogl-util-gldesktop.jar} ${jogl-util-awt.jar} ${jogl-util-fixedfuncemu.jar} ${jogl-sdk.jar} --> + + <property name="newt.jar" value="${build.newt}/newt.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-swt.jar" value="${build.newt}/newt-swt.jar" /> + <property name="newt-event.jar" value="${build.newt}/newt-event.jar" /> <!-- using NEWT events w/o NEWT --> + <property name="newt-driver-linux.jar" value="${build.newt}/newt-driver-linux.jar" /> + <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-bcm-old.jar" value="${build.newt}/newt-driver-bcm-old.jar" /> <!-- excluded from all --> + <property name="newt-driver-bcm-vc.jar" value="${build.newt}/newt-driver-bcm-vc.jar" /> <path id="newt_all_atoms.classpath"> - <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt.jar}" /> <pathelement location="${newt-ogl.jar}" /> <pathelement location="${newt-awt.jar}" /> <pathelement location="${newt-swt.jar}" /> @@ -404,7 +404,7 @@ <pathelement location="${newt-driver-bcm-vc.jar}" /> </path> <path id="newt_all-noawt_atoms.classpath"> - <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt.jar}" /> <pathelement location="${newt-ogl.jar}" /> <pathelement location="${newt-driver-linux.jar}" /> <pathelement location="${newt-driver-x11.jar}" /> @@ -413,7 +413,7 @@ <pathelement location="${newt-driver-bcm-vc.jar}" /> </path> <path id="newt_all-mobile_atoms.classpath"> - <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt.jar}" /> <pathelement location="${newt-ogl.jar}" /> <pathelement location="${newt-driver-linux.jar}" /> <pathelement location="${newt-driver-x11.jar}" /> @@ -421,7 +421,7 @@ <pathelement location="${newt-driver-bcm-vc.jar}" /> </path> <path id="newt_all-android_atoms.classpath"> - <pathelement location="${newt-core.jar}" /> + <pathelement location="${newt.jar}" /> <pathelement location="${newt-ogl.jar}" /> <pathelement location="${newt-driver-android.jar}" /> </path> diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 09ca94ab0..9e56cd1e1 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1719,7 +1719,7 @@ <srcfileset dir="${src.java}" includes="${java.part.nonjava}"/> <targetfileset dir="." - includes="${jogl-core.jar} ${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-fixedfuncemu.jar}" /> + includes="${jogl.jar} ${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-fixedfuncemu.jar}" /> </dependset> </target> <target name="build-jars" depends="build-jars-dependset,build-jars-javase" /> @@ -1814,7 +1814,7 @@ <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.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}" excludes="${java.part.core.exclude}"/> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index bb31dc0d0..881e322d5 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -827,7 +827,7 @@ </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.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 dd0ccc1d6..d9d2e6645 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -804,7 +804,7 @@ </target> <target name="build-jars-javase" depends="setup-manifestfile,build-jars-opengl,build-jars-awt,build-jars-swt,build-jars-driver"> - <jar manifest="${build.newt}/manifest.mf" destfile="${newt-core.jar}" filesonly="true"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}"/> <fileset dir="resources/assets" includes="newt/data/**" /> diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh index 2cb4e1b56..d515013b0 100755 --- a/make/scripts/lstjars.sh +++ b/make/scripts/lstjars.sh @@ -45,7 +45,7 @@ function listdeployment() { echo echo JOGL Min X11 Min egl es1 es2 - report gluegen-rt.$JAR_SUFFIX atomic/jogl-core.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow-core.$JAR_SUFFIX atomic/newt-core.$JAR_SUFFIX atomic/nativewindow-os-x11.$JAR_SUFFIX atomic/newt-driver-x11.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz libnativewindow_x11.so.gz libnewt.so.gz + report gluegen-rt.$JAR_SUFFIX atomic/jogl.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow.$JAR_SUFFIX atomic/newt.$JAR_SUFFIX atomic/nativewindow-os-x11.$JAR_SUFFIX atomic/newt-driver-x11.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz libnativewindow_x11.so.gz libnewt.so.gz echo echo JOGL Android - mobile egl es1 es2 @@ -53,7 +53,7 @@ function listdeployment() { echo echo JOGL Min Android/Mobile Min egl es1 es2 - report gluegen-rt-android.$JAR_SUFFIX atomic/jogl-core.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-os-android.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow-core.$JAR_SUFFIX atomic/newt-core.$JAR_SUFFIX atomic/newt-driver-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz + report gluegen-rt-android.$JAR_SUFFIX atomic/jogl.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-os-android.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow.$JAR_SUFFIX atomic/newt.$JAR_SUFFIX atomic/newt-driver-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz echo } diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index aa06046df..173f397af 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -290,7 +290,7 @@ function jrun() { #export USE_CLASSPATH=$JOGAMP_MOBILE_CLASSPATH #export USE_CLASSPATH=$JOGAMP_ALL_NOAWT_ALT_CLASSPATH #export USE_CLASSPATH=$JOGAMP_MOBILE_ALT_CLASSPATH - #export USE_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 + #export USE_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILD_DIR/jar/atomic/jogl.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.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt.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 |