diff options
Diffstat (limited to 'make')
24 files changed, 297 insertions, 94 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 4de5de58b..df19cb7a5 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -140,7 +140,7 @@ <istrue value="${isLinuxX86}" /> </condition> <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> - <istrue value="${isLinuxARMv7}" /> <!-- FIXME JAU .. hack --> + <istrue value="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack --> </condition> <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack --> @@ -370,7 +370,7 @@ <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 --> + <property name="newt-driver-bcm.jar" value="${build.newt}/newt-driver-bcm.jar" /> <!-- excluded from all --> <path id="newt_all_atoms.classpath"> <pathelement location="${newt-core.jar}" /> <pathelement location="${newt-ogl.jar}" /> diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 2605104d9..40859845c 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1119,7 +1119,7 @@ <includepath path="/usr/local/include" /> </compiler> - <compiler id="compiler.cfg.linux.armv7.jogl.x11" extends="compiler.cfg.linux.armv7"> + <compiler id="compiler.cfg.linux.armv6.jogl.x11" extends="compiler.cfg.linux.armv6"> <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> <compilerarg value="-idirafter" /> <compilerarg value="/usr/include" /> @@ -1147,7 +1147,7 @@ <syslibset libs="X11"/> </linker> - <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7"> + <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6"> <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/> </linker> @@ -1236,10 +1236,10 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" /> </target> - <target name="c.configure.linux.armv7" if="isLinuxARMv7"> - <echo message="Linux.armv7" /> - <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7.jogl.x11" /> - <property name="linker.cfg.id.os" value="linker.cfg.linux.armv7.jogl.x11" /> + <target name="c.configure.linux.armv6" if="isLinuxARMv6"> + <echo message="Linux.armv6" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.jogl.x11" /> + <property name="linker.cfg.id.os" value="linker.cfg.linux.armv6.jogl.x11" /> </target> <target name="c.configure.linux.ia64" if="isLinuxIA64"> @@ -1284,7 +1284,7 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> - <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> + <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index c77558d6b..6a9dbdc2e 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -342,7 +342,7 @@ <includepath path="/usr/local/include" /> </compiler> - <compiler id="compiler.cfg.linux.armv7.nativewindow.x11" extends="compiler.cfg.linux.armv7"> + <compiler id="compiler.cfg.linux.armv6.nativewindow.x11" extends="compiler.cfg.linux.armv6"> <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> <compilerarg value="-idirafter" /> <compilerarg value="/usr/include" /> @@ -396,7 +396,7 @@ <syslibset libs="Xrender"/> </linker> - <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7"> + <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6"> <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" /> <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> @@ -487,10 +487,10 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" /> </target> - <target name="c.configure.linux.armv7" if="isLinuxARMv7"> - <echo message="Linux.armv7" /> - <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7.nativewindow.x11" /> - <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv7.nativewindow.x11" /> + <target name="c.configure.linux.armv6" if="isLinuxARMv6"> + <echo message="Linux.armv6" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.nativewindow.x11" /> + <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.nativewindow.x11" /> </target> <target name="c.configure.linux.ia64" if="isLinuxIA64"> @@ -535,7 +535,7 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> - <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> + <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> diff --git a/make/build-newt.xml b/make/build-newt.xml index 17f54f988..f38d01c49 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -48,7 +48,7 @@ setup.noNativeDesktop setup.addNativeKD setup.addNativeIntelGDL - setup.addNativeBroadcomEGL + setup.addNativeBroadcom - Internal settings, may not be necessary to set them manually, since all JAR archives are orthogonal. @@ -79,7 +79,7 @@ <isfalse value="${isAndroid}" /> <isfalse value="${setup.addNativeKD}" /> <isfalse value="${setup.addNativeIntelGDL}" /> - <isfalse value="${setup.addNativeBroadcomEGL}" /> + <isfalse value="${setup.addNativeBroadcom}" /> </and> </condition> @@ -90,7 +90,7 @@ <echo message="isAndroid: ${isAndroid}" /> <echo message="setup.addNativeKD: ${setup.addNativeKD}" /> <echo message="setup.addNativeIntelGDL: ${setup.addNativeIntelGDL}" /> - <echo message="setup.addNativeBroadcomEGL: ${setup.addNativeBroadcomEGL}" /> + <echo message="setup.addNativeBroadcom: ${setup.addNativeBroadcom}" /> <echo message="setup.nonatives: ${setup.nonatives}" /> <!-- partitioning --> @@ -125,8 +125,8 @@ <property name="java.part.driver.intelgdl" value="jogamp/newt/driver/intel/gdl/**"/> - <property name="java.part.driver.broadcomegl" - value="jogamp/newt/driver/broadcom/egl/**"/> + <property name="java.part.driver.bcm" + value="jogamp/newt/driver/bcm/**"/> <property name="java.part.driver.android" value="jogamp/newt/driver/android/**"/> @@ -201,7 +201,8 @@ <mkdir dir="${src.generated.c}/Windows" /> <mkdir dir="${src.generated.c}/KD" /> <mkdir dir="${src.generated.c}/IntelGDL" /> - <mkdir dir="${src.generated.c}/BroadcomEGL" /> + <mkdir dir="${src.generated.c}/bcm/egl" /> + <mkdir dir="${src.generated.c}/bcm/vc/iv" /> <mkdir dir="${classes}" /> <mkdir dir="${obj.newt}" /> </target> @@ -254,7 +255,7 @@ <includepath path="/usr/local/include" /> </compiler> - <compiler id="compiler.cfg.linux.armv7.newt.x11" extends="compiler.cfg.linux.armv7"> + <compiler id="compiler.cfg.linux.armv6.newt.x11" extends="compiler.cfg.linux.armv6"> <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> <compilerarg value="-idirafter" /> <compilerarg value="/usr/include" /> @@ -274,7 +275,16 @@ <syslibset libs="Xrandr"/> </linker> - <linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux"> + <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux"> + <syslibset libs="EGL"/> + <syslibset libs="GLES_CM"/> + </linker> + + <linker id="linker.cfg.linux.newt.bcm_vc" extends="linker.cfg.linux"> + <!-- syslibset libs="EGL"/ --> + </linker> + + <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux"> <syslibset libs="EGL"/> <syslibset libs="GLES_CM"/> </linker> @@ -294,7 +304,7 @@ <syslibset libs="Xrandr"/> </linker> - <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7"> + <linker id="linker.cfg.linux.armv6.newt.x11" extends="linker.cfg.linux.armv6"> <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" /> </linker> @@ -384,11 +394,11 @@ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> - <target name="c.configure.linux.armv7" if="isLinuxARMv7"> - <echo message="Linux.armv7" /> - <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7.newt.x11" /> - <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv7.newt.x11" - else="linker.cfg.linux.armv7"> + <target name="c.configure.linux.armv6" if="isLinuxARMv6"> + <echo message="Linux.armv6" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.newt.x11" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.newt.x11" + else="linker.cfg.linux.armv6"> <isset property="isX11" /> </condition> <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> @@ -460,7 +470,7 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" /> </target> - <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> + <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> @@ -564,7 +574,8 @@ <include name="${rootrel.src.c}/X11Window.c" if="isX11"/> <include name="${rootrel.src.c}/KDWindow.c" if="setup.addNativeKD"/> <include name="${rootrel.src.c}/IntelGDL.c" if="setup.addNativeIntelGDL"/> - <include name="${rootrel.src.c}/BroadcomEGL.c" if="setup.addNativeBroadcomEGL"/> + <include name="${rootrel.src.c}/bcm_egl.c" if="setup.addNativeBroadcom"/> + <include name="${rootrel.src.c}/bcm_vc_iv.c" if="setup.addNativeBroadcom"/> </patternset> <echo message="Compiling @{output.lib.name}" /> @@ -609,7 +620,8 @@ <includepath path="${src.generated.c}/KD" if="setup.addNativeKD" /> <includepath path="${src.generated.c}/IntelGDL" if="setup.addNativeIntelGDL" /> <includepath path="stub_includes/embedded/IntelGDL" if="setup.addNativeIntelGDL" /> - <includepath path="${src.generated.c}/BroadcomEGL" if="setup.addNativeBroadcomEGL" /> + <includepath path="${src.generated.c}/bcm/egl" if="setup.addNativeBroadcom" /> + <includepath path="${src.generated.c}/bcm/vc/iv" if="setup.addNativeBroadcom" /> <!-- This must come last to not override real include paths --> <!-- includepath path="stub_includes/macosx" if="isOSX" / --> @@ -654,7 +666,10 @@ <javah destdir="${src.generated.c}/IntelGDL" classpath="${javah.classpath}" class="jogamp.newt.driver.intel.gdl.Screen" /> <javah destdir="${src.generated.c}/IntelGDL" classpath="${javah.classpath}" class="jogamp.newt.driver.intel.gdl.Window" /> - <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${javah.classpath}" class="jogamp.newt.driver.broadcom.egl.Window" /> + <javah destdir="${src.generated.c}/bcm/egl" classpath="${javah.classpath}" class="jogamp.newt.driver.bcm.egl.Window" /> + <javah destdir="${src.generated.c}/bcm/vc/iv" classpath="${javah.classpath}" class="jogamp.newt.driver.bcm.vc.iv.Display" /> + <javah destdir="${src.generated.c}/bcm/vc/iv" classpath="${javah.classpath}" class="jogamp.newt.driver.bcm.vc.iv.Screen" /> + <javah destdir="${src.generated.c}/bcm/vc/iv" classpath="${javah.classpath}" class="jogamp.newt.driver.bcm.vc.iv.Window" /> <javah destdir="${src.generated.c}/Windows" classpath="${javah.classpath}" class="jogamp.newt.driver.windows.WindowsWindow" /> <javah destdir="${src.generated.c}/Windows" classpath="${javah.classpath}" class="jogamp.newt.driver.windows.WindowsScreen" /> @@ -746,9 +761,9 @@ <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-bcm.jar}" filesonly="true"> <fileset dir="${classes}" - includes="${java.part.driver.broadcomegl}"/> + includes="${java.part.driver.bcm}"/> </jar> <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-intelgdl.jar}" filesonly="true"> <fileset dir="${classes}" diff --git a/make/build-test.xml b/make/build-test.xml index f295ae321..d1175f3dd 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -865,7 +865,7 @@ rsync: -rt --> - <target name="junit.run.remote.adb" if="isAndroidARMv7"> + <target name="junit.run.remote.adb" if="isAndroidARMv6"> <echo message="#! /system/bin/sh${line.separator}" append="false" file="${build.test}/targetcommand.sh" /> <echo message="${line.separator} rsync -rtv --delete --delete-after --delete-excluded \${line.separator} diff --git a/make/scripts/adb-install-all-armv6.sh b/make/scripts/adb-install-all-armv6.sh new file mode 100755 index 000000000..0ba9f3ca0 --- /dev/null +++ b/make/scripts/adb-install-all-armv6.sh @@ -0,0 +1,4 @@ +#adb $* install ../../gluegen/build-android-armv6/jogamp-android-launcher.apk +#adb $* install ../../gluegen/build-android-armv6/gluegen-rt-android-armeabi.apk +adb $* install ../build-android-armv6/jar/jogl-all-android-armeabi.apk +adb $* install ../build-android-armv6/jar/jogl-test-android.apk diff --git a/make/scripts/adb-launch-main.sh b/make/scripts/adb-launch-main.sh index ff47a7ab0..6d6719209 100644 --- a/make/scripts/adb-launch-main.sh +++ b/make/scripts/adb-launch-main.sh @@ -12,7 +12,7 @@ export TARGET_IP=jautab01 export TARGET_ADB_PORT=5555 export TARGET_ROOT=/data/projects -export BUILD_DIR=../build-android-armv7 +export BUILD_DIR=../build-android-armv6 if [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then export ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86 @@ -61,9 +61,9 @@ am start -a android.intent.action.MAIN -n jogamp.android.launcher/jogamp.android # \ #dalvikvm \ # -Xjnigreflimit:2000 \ -# -cp ../../gluegen/make/$BUILD_DIR/jogamp.android-launcher.apk:../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt-android-armeabi-v7a.apk:$BUILD_DIR/jar/jogl.all-android-armeabi-v7a.apk:$BUILD_DIR/jar/jogl.test.apk \ +# -cp ../../gluegen/make/$BUILD_DIR/jogamp.android-launcher.apk:../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt-android-armeabi.apk:$BUILD_DIR/jar/jogl.all-android-armeabi.apk:$BUILD_DIR/jar/jogl.test.apk \ # -Dgluegen.root=../../gluegen \ -# -Drootrel.build=build-android-armv7 \ +# -Drootrel.build=build-android-armv6 \ # com.android.internal.util.WithFramework \ # $TSTCLASS \ " >> $BUILD_DIR/jogl-targetcommand.sh diff --git a/make/scripts/adb-reinstall-all-armv6.sh b/make/scripts/adb-reinstall-all-armv6.sh new file mode 100755 index 000000000..0e62c5944 --- /dev/null +++ b/make/scripts/adb-reinstall-all-armv6.sh @@ -0,0 +1,5 @@ +sdir=`dirname $0` + +$sdir/adb-uninstall-all.sh $* +$sdir/adb-install-all-armv6.sh $* + diff --git a/make/scripts/make.jogl.all.android-armv6-cross.sh b/make/scripts/make.jogl.all.android-armv6-cross.sh new file mode 100755 index 000000000..262560090 --- /dev/null +++ b/make/scripts/make.jogl.all.android-armv6-cross.sh @@ -0,0 +1,92 @@ +#! /bin/sh + +export NODE_LABEL=. + +export HOST_UID=jogamp +# jogamp02 - 10.1.0.122 +export HOST_IP=10.1.0.122 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=panda02 +#export TARGET_IP=jautab03 +#export TARGET_IP=jauphone04 +export TARGET_ADB_PORT=5555 +# needs executable bit (probably su) +export TARGET_ROOT=/data/projects +export TARGET_ANT_HOME=/usr/share/ant + +echo ANDROID_SDK_HOME $ANDROID_SDK_HOME +echo NDK_ROOT $NDK_ROOT + +if [ -z "$NDK_ROOT" ] ; then + # + # Generic android-ndk + # + if [ -e /usr/local/android-ndk ] ; then + NDK_ROOT=/usr/local/android-ndk + elif [ -e /opt-linux-x86/android-ndk ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk + elif [ -e /opt/android-ndk ] ; then + NDK_ROOT=/opt/android-ndk + # + # Specific android-ndk-r7b + # + elif [ -e /usr/local/android-ndk-r7b ] ; then + NDK_ROOT=/usr/local/android-ndk-r7b + elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk-r7b + elif [ -e /opt/android-ndk-r7b ] ; then + NDK_ROOT=/opt/android-ndk-r7b + else + echo NDK_ROOT is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $NDK_ROOT ] ; then + echo NDK_ROOT $NDK_ROOT does not exist + exit 1 +fi +export NDK_ROOT + +if [ -z "$ANDROID_SDK_HOME" ] ; then + if [ -e /usr/local/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/usr/local/android-sdk-linux_x86 + elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86 + elif [ -e /opt/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/opt/android-sdk-linux_x86 + else + echo ANDROID_SDK_HOME is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $ANDROID_SDK_HOME ] ; then + echo ANDROID_SDK_HOME $ANDROID_SDK_HOME does not exist + exit 1 +fi +export ANDROID_SDK_HOME + +export ANDROID_VERSION=9 +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +export GCC_VERSION=4.4.3 +HOST_ARCH=linux-x86 +export TARGET_TRIPLE=arm-linux-androideabi + +export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH} +export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm + +# Need to add toolchain bins to the PATH. +export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_SDK_HOME/platform-tools:$PATH" + +export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml + +#export JUNIT_DISABLED="true" +#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" + +# BUILD_ARCHIVE=true \ +ant \ + -Drootrel.build=build-android-armv6 \ + $* 2>&1 | tee -a make.jogl.all.android-armv6-cross.log + diff --git a/make/scripts/make.jogl.all.linux-armv7-cross.sh b/make/scripts/make.jogl.all.linux-armv6-cross.sh index 5bb572858..9f31b798d 100755 --- a/make/scripts/make.jogl.all.linux-armv7-cross.sh +++ b/make/scripts/make.jogl.all.linux-armv6-cross.sh @@ -14,7 +14,7 @@ export PATH # -Dgluegen.cpptasks.detected.os=true \ # -DisUnix=true \ # -DisLinux=true \ -# -DisLinuxARMv7=true \ +# -DisLinuxARMv6=true \ # -DisX11=false \ export NODE_LABEL=. @@ -29,22 +29,22 @@ export TARGET_IP=panda01 export TARGET_ROOT=/home/jogamp/projects-cross export TARGET_ANT_HOME=/usr/share/ant -export TARGET_PLATFORM_ROOT=/opt-linux-armv7-armel +export TARGET_PLATFORM_ROOT=/opt-linux-armv6-armel export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm -export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv4.xml" +export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6.xml" #export JUNIT_DISABLED="true" export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" ant \ - -Drootrel.build=build-linux-armv7 \ + -Drootrel.build=build-linux-armv6 \ \ -Dsetup.addNativeKD=true \ -Dsetup.addNativeOpenMAX=true \ - -Dsetup.addNativeBroadcomEGL=true \ - $* 2>&1 | tee make.jogl.all.linux-armv7-cross.log + -Dsetup.addNativeBroadcom=true \ + $* 2>&1 | tee make.jogl.all.linux-armv6-cross.log diff --git a/make/scripts/make.jogl.all.linux-armv7.sh b/make/scripts/make.jogl.all.linux-armv6.sh index 0fd0b6edd..3d526ea12 100755 --- a/make/scripts/make.jogl.all.linux-armv7.sh +++ b/make/scripts/make.jogl.all.linux-armv6.sh @@ -8,20 +8,20 @@ export PATH # -Dgluegen.cpptasks.detected.os=true \ # -DisUnix=true \ # -DisLinux=true \ -# -DisLinuxARMv7=true \ +# -DisLinuxARMv6=true \ # -DisX11=false \ export TARGET_PLATFORM_ROOT=/ export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabi export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm -export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv4.xml" +export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6.xml" ant \ - -Drootrel.build=build-linux-armv7 \ + -Drootrel.build=build-linux-armv6 \ -Dsetup.addNativeKD=true \ -Dsetup.addNativeOpenMAX=true \ - -Dsetup.addNativeBroadcomEGL=true \ + -Dsetup.addNativeBroadcom=true \ -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \ - $* 2>&1 | tee make.jogl.all.linux-armv7.log + $* 2>&1 | tee make.jogl.all.linux-armv6.log diff --git a/make/scripts/make.jogl.all.linux-armv7hf-cross.sh b/make/scripts/make.jogl.all.linux-armv6hf-cross.sh index b51fe94a9..6295a90f9 100755 --- a/make/scripts/make.jogl.all.linux-armv7hf-cross.sh +++ b/make/scripts/make.jogl.all.linux-armv6hf-cross.sh @@ -14,7 +14,7 @@ export PATH # -Dgluegen.cpptasks.detected.os=true \ # -DisUnix=true \ # -DisLinux=true \ -# -DisLinuxARMv7=true \ +# -DisLinuxARMv6=true \ # -DisX11=false \ export NODE_LABEL=. @@ -24,12 +24,12 @@ export HOST_IP=jogamp02 export HOST_RSYNC_ROOT=PROJECTS/JOGL export TARGET_UID=jogamp -export TARGET_IP=panda01 +export TARGET_IP=panda02 #export TARGET_IP=jautab02 export TARGET_ROOT=/home/jogamp/projects-cross export TARGET_ANT_HOME=/usr/share/ant -export TARGET_PLATFORM_ROOT=/opt-linux-armv7-armhf +export TARGET_PLATFORM_ROOT=/opt-linux-armv6-armhf export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm @@ -39,12 +39,12 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" ant \ - -Drootrel.build=build-linux-armv7hf \ + -Drootrel.build=build-linux-armv6hf \ \ -Dsetup.addNativeKD=true \ -Dsetup.addNativeOpenMAX=true \ - -Dsetup.addNativeBroadcomEGL=true \ - $* 2>&1 | tee make.jogl.all.linux-armv7hf-cross.log + -Dsetup.addNativeBroadcom=true \ + $* 2>&1 | tee make.jogl.all.linux-armv6hf-cross.log diff --git a/make/scripts/make.jogl.all.linux-armv7hf.sh b/make/scripts/make.jogl.all.linux-armv6hf.sh index a94b05824..7d9480f26 100755 --- a/make/scripts/make.jogl.all.linux-armv7hf.sh +++ b/make/scripts/make.jogl.all.linux-armv6hf.sh @@ -8,7 +8,7 @@ export PATH # -Dgluegen.cpptasks.detected.os=true \ # -DisUnix=true \ # -DisLinux=true \ -# -DisLinuxARMv7=true \ +# -DisLinuxARMv6=true \ # -DisX11=false \ export TARGET_PLATFORM_ROOT=/ @@ -18,10 +18,10 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml" ant \ - -Drootrel.build=build-linux-armv7hf \ + -Drootrel.build=build-linux-armv6hf \ -Dsetup.addNativeKD=true \ -Dsetup.addNativeOpenMAX=true \ - -Dsetup.addNativeBroadcomEGL=true \ + -Dsetup.addNativeBroadcom=true \ -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \ - $* 2>&1 | tee make.jogl.all.linux-armv7hf.log + $* 2>&1 | tee make.jogl.all.linux-armv6hf.log diff --git a/make/scripts/targetcommand-awt.sh b/make/scripts/targetcommand-awt.sh index af3b5f775..7f95e33a2 100755 --- a/make/scripts/targetcommand-awt.sh +++ b/make/scripts/targetcommand-awt.sh @@ -2,6 +2,8 @@ THISDIR=`pwd` +ROOT_REL=build-linux-armv6hf + #XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode" XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.EGL -Dnativewindow.debug.GraphicsConfiguration -Djogl.debug.GLDrawable" #XTRA_FLAGS="-Dnewt.debug.Screen" @@ -22,15 +24,15 @@ TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT rsync -av --delete --delete-after --delete-excluded \ --exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \ --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude '*-java-src.zip' \ + --exclude 'make/lib/external/' \ jogamp@jogamp02::PROJECTS/JOGL/gluegen jogamp@jogamp02::PROJECTS/JOGL/jogl $THISDIR/projects-cross cd $THISDIR/projects-cross/jogl/make function junit_run() { java \ - -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/build-linux-armv7/gluegen-rt.jar:../build-linux-armv7/jar/jogl.all.jar:../build-linux-armv7/jar/jogl.test.jar\ + -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/$ROOT_REL/gluegen-rt.jar:../$ROOT_REL/jar/jogl-all.jar:../$ROOT_REL/jar/jogl-test.jar\ $XTRA_FLAGS \ - com.jogamp.newt.util.MainThread\ org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner \ $TSTCLASS \ filtertrace=true \ @@ -46,9 +48,8 @@ function junit_run() { function main_run() { java \ - -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/build-linux-armv7/gluegen-rt.jar:../build-linux-armv7/jar/jogl.all.jar:../build-linux-armv7/jar/jogl.test.jar\ + -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/$ROOT_REL/gluegen-rt.jar:../$ROOT_REL/jar/jogl-all.jar:../$ROOT_REL/jar/jogl-test.jar\ $XTRA_FLAGS \ - com.jogamp.newt.util.MainThread\ $TSTCLASS \ $* } diff --git a/make/scripts/targetcommand-loop.sh b/make/scripts/targetcommand-loop.sh new file mode 100644 index 000000000..fc7baa77d --- /dev/null +++ b/make/scripts/targetcommand-loop.sh @@ -0,0 +1,75 @@ +#! /bin/sh + +THISDIR=`pwd` + +ROOT_REL=build-linux-armv6hf + +# export LD_LIBRARY_PATH=$THISDIR/PVRTrace/:$LD_LIBRARY_PATH + +XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode" +#XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.TraceGL" +#XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.DebugGL -Djogl.debug.TraceGL" +#XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.EGL -Dnativewindow.debug.GraphicsConfiguration -Djogl.debug.GLDrawable" +#XTRA_FLAGS="-Dnewt.debug.Screen" +#XTRA_FLAGS="-Dnativewindow.debug.GraphicsConfiguration -Dnativewindow.debug.NativeWindow" +#XTRA_FLAGS="-Dnewt.debug.Window -Djogl.debug.EGL -Djogl.debug.GLContext -Djogl.debug.GLDrawable" +#XTRA_FLAGS="-Djogl.debug.GLContext -Djogl.debug.GLProfile -Djogl.debug.GLDrawable" +#XTRA_FLAGS="-Djogl.debug.EGL" +#XTRA_FLAGS="-Djogl.debug.GraphicsConfiguration" +#XTRA_FLAGS="-Djogl.debug.GLContext -Djogl.debug.GLDrawable" +#XTRA_FLAGS="-Djogl.debug.TraceGL" +#XTRA_FLAGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL" + +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT +TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT + + mkdir -p $THISDIR/projects-cross + + rsync -av --delete --delete-after --delete-excluded \ + --exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \ + --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude '*-java-src.zip' \ + --exclude 'make/lib/external/' \ + jogamp@jogamp02::PROJECTS/JOGL/gluegen jogamp@jogamp02::PROJECTS/JOGL/jogl $THISDIR/projects-cross + + cd $THISDIR/projects-cross/jogl/make + + cp -a $THISDIR/pvrtrace.cfg . + +function junit_run() { + java \ + -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/$ROOT_REL/gluegen-rt.jar:../$ROOT_REL/jar/jogl-all-noawt.jar:../$ROOT_REL/jar/jogl-test.jar\ + -Djava.awt.headless=true\ + $XTRA_FLAGS \ + org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner \ + $TSTCLASS \ + filtertrace=true \ + haltOnError=false \ + haltOnFailure=false \ + showoutput=true \ + outputtoformatters=true \ + logfailedtests=true \ + logtestlistenerevents=true \ + formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter \ + formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,$THISDIR/targetcommand.xml +} + +function main_run() { + java \ + -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/$ROOT_REL/gluegen-rt.jar:../$ROOT_REL/jar/jogl-all-noawt.jar:../$ROOT_REL/jar/jogl-test.jar\ + -Djava.awt.headless=true\ + $XTRA_FLAGS \ + $TSTCLASS \ + $* +} + + +let i=0 + +while true ; do + let i=$i+1 + echo TEST RUN $i + # junit_run $* + main_run -time 100 $* + cp -a trace-*.pvrt $THISDIR/ +done + diff --git a/make/scripts/targetcommand-newt.sh b/make/scripts/targetcommand-newt.sh index 47b7a0b80..8b3c0945a 100755 --- a/make/scripts/targetcommand-newt.sh +++ b/make/scripts/targetcommand-newt.sh @@ -2,9 +2,11 @@ THISDIR=`pwd` +ROOT_REL=build-linux-armv6hf + export LD_LIBRARY_PATH=$THISDIR/PVRTrace/:$LD_LIBRARY_PATH -XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.DebugGL -Djogl.debug.TraceGL -Djogl.debug.GLContext.TraceSwitch " +#XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.DebugGL -Djogl.debug.TraceGL -Djogl.debug.GLContext.TraceSwitch " #XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.DebugGL -Djogl.debug.TraceGL" #XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.EGL -Dnativewindow.debug.GraphicsConfiguration -Djogl.debug.GLDrawable" #XTRA_FLAGS="-Dnewt.debug.Screen" @@ -26,7 +28,7 @@ XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.DebugGL -Djogl.deb #TSTCLASS=com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 # (Tegra regressions) #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug00NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug01NEWT -TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestInitConcurrentNEWT # Some Regressions (Panda, Omap4) @@ -49,6 +51,7 @@ TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT +TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube #TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.drawable.TestDrawable01NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestFBOMRTNEWT01 @@ -81,6 +84,7 @@ TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT rsync -av --delete --delete-after --delete-excluded \ --exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \ --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude '*-java-src.zip' \ + --exclude 'make/lib/external/' \ jogamp@jogamp02::PROJECTS/JOGL/gluegen jogamp@jogamp02::PROJECTS/JOGL/jogl $THISDIR/projects-cross cd $THISDIR/projects-cross/jogl/make @@ -89,10 +93,9 @@ TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT function junit_run() { java \ - -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/build-linux-armv7/gluegen-rt.jar:../build-linux-armv7/jar/jogl.all-noawt.jar:../build-linux-armv7/jar/jogl.test.jar\ + -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/$ROOT_REL/gluegen-rt.jar:../$ROOT_REL/jar/jogl-all-noawt.jar:../$ROOT_REL/jar/jogl-test.jar\ -Djava.awt.headless=true\ $XTRA_FLAGS \ - com.jogamp.newt.util.MainThread\ org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner \ $TSTCLASS \ filtertrace=true \ @@ -108,10 +111,9 @@ function junit_run() { function main_run() { java \ - -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/build-linux-armv7/gluegen-rt.jar:../build-linux-armv7/jar/jogl.all-noawt.jar:../build-linux-armv7/jar/jogl.test.jar\ + -cp ../../gluegen/make/lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:../../gluegen/$ROOT_REL/gluegen-rt.jar:../$ROOT_REL/jar/jogl-all-noawt.jar:../$ROOT_REL/jar/jogl-test.jar\ -Djava.awt.headless=true\ $XTRA_FLAGS \ - com.jogamp.newt.util.MainThread\ $TSTCLASS \ $* } diff --git a/make/scripts/tests-armv6_armel.sh b/make/scripts/tests-armv6_armel.sh new file mode 100755 index 000000000..8bc3eff65 --- /dev/null +++ b/make/scripts/tests-armv6_armel.sh @@ -0,0 +1,7 @@ +#! /bin/bash + +spath=`dirname $0` + +. $spath/tests.sh `which java` -DummyArg ../build-linux-armv6 $* + + diff --git a/make/scripts/tests-armv6_armhf.sh b/make/scripts/tests-armv6_armhf.sh new file mode 100755 index 000000000..6b66a47de --- /dev/null +++ b/make/scripts/tests-armv6_armhf.sh @@ -0,0 +1,7 @@ +#! /bin/bash + +spath=`dirname $0` + +. $spath/tests.sh `which java` -DummyArg ../build-linux-armv6hf $* + + diff --git a/make/scripts/tests-armv7l_eabi.sh b/make/scripts/tests-armv7l_eabi.sh deleted file mode 100755 index 2ed3070b4..000000000 --- a/make/scripts/tests-armv7l_eabi.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/bash - -spath=`dirname $0` - -. $spath/tests.sh `which java` -DummyArg ../build-armv7l_eabi $* - - diff --git a/make/scripts/tests-linux-armv6.sh b/make/scripts/tests-linux-armv6.sh new file mode 100755 index 000000000..8bc3eff65 --- /dev/null +++ b/make/scripts/tests-linux-armv6.sh @@ -0,0 +1,7 @@ +#! /bin/bash + +spath=`dirname $0` + +. $spath/tests.sh `which java` -DummyArg ../build-linux-armv6 $* + + diff --git a/make/scripts/tests-linux-armv6hf.sh b/make/scripts/tests-linux-armv6hf.sh new file mode 100755 index 000000000..6b66a47de --- /dev/null +++ b/make/scripts/tests-linux-armv6hf.sh @@ -0,0 +1,7 @@ +#! /bin/bash + +spath=`dirname $0` + +. $spath/tests.sh `which java` -DummyArg ../build-linux-armv6hf $* + + diff --git a/make/scripts/tests-linux-armv7.sh b/make/scripts/tests-linux-armv7.sh deleted file mode 100755 index 6ec93db68..000000000 --- a/make/scripts/tests-linux-armv7.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/bash - -spath=`dirname $0` - -. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7 $* - - diff --git a/make/scripts/tests-linux-armv7hf.sh b/make/scripts/tests-linux-armv7hf.sh deleted file mode 100755 index 5526e81c3..000000000 --- a/make/scripts/tests-linux-armv7hf.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/bash - -spath=`dirname $0` - -. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $* - - diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 43d04c6bd..d0a5f64ff 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -53,6 +53,7 @@ function jrun() { swton=$1 shift + #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.GLSLCode -Dnewt.debug.Window.MouseEvent" #D_ARGS="-Djogl.debug.TraceGL -Djogl.debug.DebugGL -Djogl.debug.GLSLCode" #D_ARGS="-Djogl.debug.FBObject" #D_ARGS="-Dnativewindow.debug.GraphicsConfiguration -Djogl.debug.GLDrawable -Djogl.debug.GLContext -Djogl.debug.FBObject" @@ -61,6 +62,7 @@ function jrun() { #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all -Djogamp.debug.Lock" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all" + D_ARGS="-Djogl.debug=all" #D_ARGS="-Dnewt.debug.Window" #D_ARGS="-Djogl.debug.GLDrawable" #D_ARGS="-Djogl.debug.EGLDrawableFactory.DontQuery -Djogl.debug.GLDrawable" @@ -214,10 +216,10 @@ function testawtswt() { #testnoawt com.jogamp.newt.opengl.GLWindow $* #testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestFloatUtil01MatrixMatrixMultNOUI $* -testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestNEWTCloseX11DisplayBug565 $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestNEWTCloseX11DisplayBug565 $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $* |