diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 2 | ||||
| -rw-r--r-- | make/build-jogl.xml | 8 | ||||
| -rw-r--r-- | make/build-newt.xml | 82 | ||||
| -rw-r--r-- | make/build.xml | 21 | ||||
| -rw-r--r-- | make/scripts/crosstest-java-android-armv7-rel.sh | 69 | ||||
| -rw-r--r-- | make/scripts/crosstest-java-linux-armv7-rel.sh | 17 | ||||
| -rw-r--r-- | make/scripts/crosstest-launch-android-activity.sh | 17 | ||||
| -rw-r--r-- | make/scripts/eglestest-java-linux.sh | 10 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.android-armv7-cross.sh | 1 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 5 |
10 files changed, 161 insertions, 71 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 040e9e5e7..b52b636ca 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -256,7 +256,7 @@ <pathelement location="${nativewindow.os.x11.jar}" /> <pathelement location="${nativewindow.os.win.jar}" /> </path> - <path id="nativewindow_all-mobile_atoms.classpath"> + <path id="nativewindow_core_atoms.classpath"> <pathelement location="${nativewindow.core.jar}" /> </path> diff --git a/make/build-jogl.xml b/make/build-jogl.xml index a6aa04e5a..765c76809 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1095,6 +1095,10 @@ <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" /> </linker> + <linker id="linker.cfg.android.jogl" extends="linker.cfg.android"> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="EGL" /> + </linker> + <linker id="linker.cfg.solaris.jogl.x11" extends="linker.cfg.solaris"> <syslibset libs="X11"/> </linker> @@ -1190,7 +1194,7 @@ <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> <property name="compiler.cfg.id" value="compiler.cfg.android" /> - <property name="linker.cfg.id.os" value="linker.cfg.android" /> + <property name="linker.cfg.id.os" value="linker.cfg.android.jogl" /> </target> <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit"> @@ -1410,7 +1414,7 @@ <c.build c.compiler.src.files="c.src.files.jogl.mobile" output.lib.name="jogl_mobile" compiler.cfg.id="${compiler.cfg.id}" - linker.cfg.id="${linker.cfg.id.base}"/> + linker.cfg.id="${linker.cfg.id.os}"/> </target> <target name="c.build.jogl.cg" if="setup.addNativeNVidiaCG"> diff --git a/make/build-newt.xml b/make/build-newt.xml index c5c05386a..3be6115a6 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -185,6 +185,7 @@ --> <target name="init" depends="declare.common"> <mkdir dir="${src.generated.c}" /> + <mkdir dir="${src.generated.c}/Android" /> <mkdir dir="${src.generated.c}/X11" /> <mkdir dir="${src.generated.c}/MacOSX" /> <mkdir dir="${src.generated.c}/Windows" /> @@ -276,6 +277,11 @@ <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" /> </linker> + <linker id="linker.cfg.android.newt" extends="linker.cfg.android"> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="android" /> + <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="EGL" /> + </linker> + <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris"> <syslibset libs="X11"/> </linker> @@ -315,28 +321,24 @@ <target name="c.configure.win32.vc" if="isVCFamily"> <echo message="Win32.VC" /> <property name="compiler.cfg.id" value="compiler.cfg.win32.msvc" /> - <property name="linker.cfg.id.core" value="linker.cfg.win32.msvc" /> <property name="linker.cfg.id.oswin" value="linker.cfg.win32.msvc.newt" /> </target> <target name="c.configure.win32.mingw" if="isMingW32"> <echo message="Win32.MingW" /> <property name="compiler.cfg.id" value="compiler.cfg.win32.mingw" /> - <property name="linker.cfg.id.core" value="linker.cfg.win32.mingw" /> <property name="linker.cfg.id.oswin" value="linker.cfg.win32.mingw.newt" /> </target> <target name="c.configure.win64.mingw" if="isMingW64"> <echo message="Win64.MingW" /> <property name="compiler.cfg.id" value="compiler.cfg.win64.mingw" /> - <property name="linker.cfg.id.core" value="linker.cfg.win64.mingw" /> <property name="linker.cfg.id.oswin" value="linker.cfg.win64.mingw.newt" /> </target> <target name="c.configure.linux.x86" if="isLinuxX86"> <echo message="Linux.x86" /> <property name="compiler.cfg.id" value="compiler.cfg.linux.x86" /> - <property name="linker.cfg.id.core" value="linker.cfg.linux.x86" /> <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.x86.newt.x11" else="linker.cfg.linux.x86"> <isset property="isX11" /> @@ -347,7 +349,6 @@ <target name="c.configure.linux.amd64" if="isLinuxAMD64"> <echo message="Linux.AMD64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" /> - <property name="linker.cfg.id.core" value="linker.cfg.linux.amd64" /> <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.newt.x11" else="linker.cfg.linux.amd64"> <isset property="isX11" /> @@ -358,7 +359,6 @@ <target name="c.configure.linux.armv7" if="isLinuxARMv7"> <echo message="Linux.armv7" /> <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7.newt.x11" /> - <property name="linker.cfg.id.core" value="linker.cfg.linux.armv7" /> <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv7.newt.x11" else="linker.cfg.linux.armv7"> <isset property="isX11" /> @@ -369,7 +369,6 @@ <target name="c.configure.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> - <property name="linker.cfg.id.core" value="linker.cfg.linux" /> <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" /> </target> @@ -378,14 +377,12 @@ <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> <property name="compiler.cfg.id" value="compiler.cfg.android" /> - <property name="linker.cfg.id.core" value="linker.cfg.android" /> - <property name="linker.cfg.id.oswin" value="linker.cfg.android" /> + <property name="linker.cfg.id.oswin" value="linker.cfg.android.newt" /> </target> <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit"> <echo message="Solaris" /> <property name="compiler.cfg.id" value="compiler.cfg.solaris" /> - <property name="linker.cfg.id.core" value="linker.cfg.solaris" /> <property name="linker.cfg.id.oswin" value="linker.cfg.solaris.newt.x11" /> </target> @@ -393,7 +390,6 @@ <target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9"> <echo message="SolarisSparcv9" /> <property name="compiler.cfg.id" value="compiler.cfg.solaris.sparcv9" /> - <property name="linker.cfg.id.core" value="linker.cfg.solaris.sparcv9" /> <property name="linker.cfg.id.oswin" value="linker.cfg.solaris.sparcv9.newt.x11" /> </target> @@ -401,14 +397,12 @@ <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64"> <echo message="SolarisAMD64" /> <property name="compiler.cfg.id" value="compiler.cfg.solaris.amd64" /> - <property name="linker.cfg.id.core" value="linker.cfg.solaris.amd64" /> <property name="linker.cfg.id.oswin" value="linker.cfg.solaris.amd64.newt.x11" /> </target> <target name="c.configure.freebsd.x86" if="isFreeBSDX86"> <echo message="FreeBSD.x86" /> <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> - <property name="linker.cfg.id.core" value="linker.cfg.freebsd" /> <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.newt.x11" else="linker.cfg.freebsd"> <isset property="isX11" /> @@ -419,7 +413,6 @@ <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64"> <echo message="FreeBSD.AMD64" /> <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> - <property name="linker.cfg.id.core" value="linker.cfg.freebsd.amd64" /> <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.newt.x11" else="linker.cfg.freebsd.amd64"> <isset property="isX11" /> @@ -432,7 +425,6 @@ <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> <echo message="HP-UX" /> <property name="compiler.cfg.id" value="compiler.cfg.hpux" /> - <property name="linker.cfg.id.core" value="linker.cfg.hpux" /> <property name="linker.cfg.id.oswin" value="linker.cfg.hpux.newt.x11" /> </target> @@ -442,7 +434,6 @@ <target name="c.configure.macosx" if="isOSX"> <property name="compiler.cfg.id" value="compiler.cfg.macosx" /> - <property name="linker.cfg.id.core" value="linker.cfg.macosx" /> <property name="linker.cfg.id.oswin" value="linker.cfg.macosx.newt" /> </target> @@ -477,11 +468,12 @@ <patternset id="c.src.files.newt"> <include name="${rootrel.src.c}/NewtCommon.c" /> <include name="${rootrel.src.c}/WindowsWindow.c" if="isWindows"/> - <include name="${rootrel.src.c}/*.m" if="isOSX"/> - <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}/*.m" if="isOSX"/> + <include name="${rootrel.src.c}/AndroidWindow.c" if="isAndroid"/> + <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"/> </patternset> <echo message="Compiling @{output.lib.name}" /> @@ -519,13 +511,14 @@ <includepath path="/usr/X11/include" /> <!-- This is for the generated headers for handwritten C code --> <includepath path="${src.generated.c}" /> - <includepath path="${src.generated.c}/X11" if="isX11"/> - <includepath path="${src.generated.c}/MacOSX" if="isOSX"/> - <includepath path="${src.generated.c}/Windows" if="isWindows"/> - <includepath path="${src.generated.c}/KD" if="setup.addNativeKD" /> - <includepath path="${src.generated.c}/IntelGDL" if="setup.addNativeIntelGDL" /> + <includepath path="${src.generated.c}/Android" if="isAndroid"/> + <includepath path="${src.generated.c}/X11" if="isX11"/> + <includepath path="${src.generated.c}/MacOSX" if="isOSX"/> + <includepath path="${src.generated.c}/Windows" if="isWindows"/> + <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}/BroadcomEGL" if="setup.addNativeBroadcomEGL" /> <!-- This must come last to not override real include paths --> <!-- includepath path="stub_includes/macosx" if="isOSX" / --> @@ -564,23 +557,24 @@ </macrodef> <target name="c.build.newt.prepare"> - <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="jogamp.newt.driver.kd.KDWindow" /> - - <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="jogamp.newt.driver.intel.gdl.Display" /> - <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="jogamp.newt.driver.intel.gdl.Screen" /> - <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="jogamp.newt.driver.intel.gdl.Window" /> - - <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="jogamp.newt.driver.broadcom.egl.Window" /> - - <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.newt.driver.windows.WindowsWindow" /> - <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.newt.driver.windows.WindowsScreen" /> - <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.newt.driver.windows.WindowsDisplay" /> - <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="jogamp.newt.driver.macosx.MacWindow" /> - <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="jogamp.newt.driver.macosx.MacScreen" /> - <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="jogamp.newt.driver.macosx.MacDisplay" /> - <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="jogamp.newt.driver.x11.X11Window" /> - <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="jogamp.newt.driver.x11.X11Screen" /> - <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="jogamp.newt.driver.x11.X11Display" /> + <javah destdir="${src.generated.c}/KD" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.kd.KDWindow" /> + + <javah destdir="${src.generated.c}/IntelGDL" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.intel.gdl.Display" /> + <javah destdir="${src.generated.c}/IntelGDL" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.intel.gdl.Screen" /> + <javah destdir="${src.generated.c}/IntelGDL" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.intel.gdl.Window" /> + + <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.broadcom.egl.Window" /> + + <javah destdir="${src.generated.c}/Windows" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.windows.WindowsWindow" /> + <javah destdir="${src.generated.c}/Windows" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.windows.WindowsScreen" /> + <javah destdir="${src.generated.c}/Windows" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.windows.WindowsDisplay" /> + <javah destdir="${src.generated.c}/MacOSX" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.macosx.MacWindow" /> + <javah destdir="${src.generated.c}/MacOSX" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.macosx.MacScreen" /> + <javah destdir="${src.generated.c}/MacOSX" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.macosx.MacDisplay" /> + <javah destdir="${src.generated.c}/X11" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.x11.X11Window" /> + <javah destdir="${src.generated.c}/X11" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.x11.X11Screen" /> + <javah destdir="${src.generated.c}/X11" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.x11.X11Display" /> + <javah destdir="${src.generated.c}/Android" classpath="${gluegen-rt.jar}:${classes}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" /> </target> <target name="c.build.newt.windowlib" unless="setup.nonatives"> diff --git a/make/build.xml b/make/build.xml index 72d230942..971406f06 100644 --- a/make/build.xml +++ b/make/build.xml @@ -117,7 +117,7 @@ <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-mobile.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> - <path refid="nativewindow_all-mobile_atoms.classpath"/> + <path refid="nativewindow_all-noawt_atoms.classpath"/> <path refid="jogl_all-mobile_atoms.classpath"/> <path refid="newt_all-mobile_atoms.classpath"/> </zips> @@ -126,9 +126,10 @@ <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-android.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> - <path refid="nativewindow_all-mobile_atoms.classpath"/> + <path refid="nativewindow_core_atoms.classpath"/> <path refid="jogl_all-mobile_atoms.classpath"/> <path refid="newt_all-android_atoms.classpath"/> + <fileset dir="${build.gluegen}" includes="gluegen-rt.jar"/> <!-- JAU hack in gluegen --> </zips> </archives> </jar> @@ -147,6 +148,9 @@ </target> <target name="android.package" depends="init,gluegen.cpptasks.detect.os,android.package.skip.check" if="isAndroid" unless="android.package.skip"> + <copy todir="${lib}"> + <fileset dir="${build.gluegen}/obj" includes="libgluegen-rt.so"/> <!-- JAU hack in gluegen --> + </copy> <aapt.signed jarbuilddir="${jar}" jarbasename="jogl.all-android" @@ -157,6 +161,9 @@ jarmanifest.path="${build.jogl}/manifest.mf" version.code="${jogl_int_version}" version.name="${jogl.version.plus}" /> + <delete includeEmptyDirs="true" quiet="true" failonerror="false"> + <fileset dir="${lib}" includes="libgluegen-rt.so" /> + </delete> </target> <target name="android.launcher" depends="init,gluegen.cpptasks.detect.os" if="isAndroid"> @@ -238,19 +245,13 @@ <target name="developer-src-zip" depends="init"> <!--delete includeEmptyDirs="true" quiet="true" failonerror="false"> - <fileset dir="${build}" includes="nativewindow-java-src.zip" /> <fileset dir="${build}" includes="jogl-java-src.zip" /> - <fileset dir="${build}" includes="newt-java-src.zip" /> </delete--> - <zip destfile="${build}/nativewindow-java-src.zip" level="0"> + <zip destfile="${build}/jogl-java-src.zip" level="0"> <fileset dir="${src}/nativewindow/classes"/> <fileset dir="${build}/nativewindow/gensrc/classes"/> - </zip> - <zip destfile="${build}/jogl-java-src.zip" level="0"> <fileset dir="${src}/jogl/classes"/> <fileset dir="${build}/jogl/gensrc/classes"/> - </zip> - <zip destfile="${build}/newt-java-src.zip" level="0"> <fileset dir="${src}/newt/classes"/> </zip> </target> @@ -290,9 +291,7 @@ </copy> <copy todir="${archive}"> <fileset dir="${build}"> - <include name="nativewindow-java-src.zip"/> <include name="jogl-java-src.zip"/> - <include name="newt-java-src.zip"/> </fileset> </copy> <archive.7z destfile="${build}/${archive.name}.7z" diff --git a/make/scripts/crosstest-java-android-armv7-rel.sh b/make/scripts/crosstest-java-android-armv7-rel.sh new file mode 100644 index 000000000..d4c93d7c8 --- /dev/null +++ b/make/scripts/crosstest-java-android-armv7-rel.sh @@ -0,0 +1,69 @@ +#! /bin/bash + +export HOST_UID=sven +export HOST_IP=192.168.0.52 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=beagle02 +export TARGET_ROOT=/projects + +export BUILD_DIR=../build-android-armv7 + +if [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then + export ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86 + export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH +fi + +# +# orig android: +# export LD_LIBRARY_PATH /system/lib +# export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar +# + +#TSTCLASS=com.jogamp.nativewindow.NativeWindowVersion +#TSTCLASS=com.jogamp.opengl.JoglVersion +#TSTCLASS=com.jogamp.newt.NewtVersion +TSTCLASS=com.jogamp.newt.opengl.GLWindow +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState01NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 +#TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 +#TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT + + +LOGFILE=`basename $0 .sh`.log + +# -Djava.class.path=lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \ +# -Djava.class.path=lib/ant-junit-all.apk:$BUILD_DIR/gluegen-rt.apk \ +# -Djava.library.path=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \ + +RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux*/' --exclude 'build-win*/' --exclude 'build-mac*/' \ + --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'jogl-java-src.zip' \ + --delete-excluded" + +echo "#! /system/bin/sh" > $BUILD_DIR/targetcommand.sh + +echo "\ +rsync -av --delete --delete-after $RSYNC_EXCLUDES $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/gluegen $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/jogl $TARGET_ROOT ; \ +cd $TARGET_ROOT/jogl/make ; +export LD_LIBRARY_PATH=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$TARGET_ROOT/jogl/make/$BUILD_DIR/lib ; \ +export BOOTCLASSPATH=/system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar ; \ +dalvikvm \ + -Xjnigreflimit:2000 \ + -cp ../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt.apk:$BUILD_DIR/jar/jogl.all-android.apk:$BUILD_DIR/test/build/jogl.test.jar \ + -Djogamp.debug.JNILibLoader=true \ + -Djogamp.debug.NativeLibrary=true \ + -Djogamp.debug.NativeLibrary.Lookup=true \ + -Djogl.debug=all \ + com.android.internal.util.WithFramework \ + $TSTCLASS \ +" >> $BUILD_DIR/targetcommand.sh + +chmod ugo+x $BUILD_DIR/targetcommand.sh +adb push $BUILD_DIR/targetcommand.sh $TARGET_ROOT/targetcommand.sh +adb shell $TARGET_ROOT/targetcommand.sh 2>&1 | tee $LOGFILE + diff --git a/make/scripts/crosstest-java-linux-armv7-rel.sh b/make/scripts/crosstest-java-linux-armv7-rel.sh index f89d02144..c274dab18 100644 --- a/make/scripts/crosstest-java-linux-armv7-rel.sh +++ b/make/scripts/crosstest-java-linux-armv7-rel.sh @@ -13,7 +13,7 @@ export ANT_PATH=/usr/share/ant #TSTCLASS=com.jogamp.nativewindow.NativeWindowVersion #TSTCLASS=com.jogamp.opengl.JoglVersion -#TSTCLASS=com.jogamp.newt.NewtVersion +TSTCLASS=com.jogamp.newt.NewtVersion #TSTCLASS=com.jogamp.newt.opengl.GLWindow #TSTCLASS=com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT @@ -22,25 +22,26 @@ export ANT_PATH=/usr/share/ant #TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 #TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 #TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 -TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT LOGFILE=`basename $0 .sh`.log # -Djogamp.debug.NativeLibrary.Lookup=true \ # -Djogamp.debug.ProcAddressHelper=true \ +RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \ + --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'jogl-java-src.zip' \ + --delete-excluded" + CP_BASE=../../gluegen/make/lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:../../gluegen/make/$BUILD_DIR/gluegen.jar -CP_JOGL_ALL=$BUILD_DIR/jar/nativewindow.all.jar:$BUILD_DIR/jar/jogl.all.jar:$BUILD_DIR/jar/newt.all.jar:$BUILD_DIR/jar/jogl.test.jar -CP_JOGL_EGLES12=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles1.jar:$BUILD_DIR/jar/jogl.gles1.dbg.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar -CP_JOGL_EGLES1=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles1.jar:$BUILD_DIR/jar/jogl.gles1.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar -CP_JOGL_EGLES2=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar +CP_JOGL_MOBILE=$BUILD_DIR/jar/jogl.all-mobile.jar:$BUILD_DIR/test/build/jogl.test.jar # -Djogl.debug=all \ # -Dnewt.debug=all \ # -Djogl.debug.DebugGL \ ssh $TARGET_UID@$TARGET_IP "\ -rsync -aAv --delete --delete-after --exclude 'build-x86*/' $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/gluegen $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/jogl $TARGET_ROOT ; \ +rsync -aAv --delete --delete-after $RSYNC_EXCLUDES $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/gluegen $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/jogl $TARGET_ROOT ; \ cd $TARGET_ROOT/jogl/make ; export DISPLAY=:0.0 ; LD_LIBRARY_PATH=../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \ @@ -48,7 +49,7 @@ $TARGET_JAVA \ -server \ -Xmx256m \ -Djava.library.path=../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \ - -Djava.class.path=$CP_BASE:$CP_JOGL_EGLES12 \ + -Djava.class.path=$CP_BASE:$CP_JOGL_MOBILE \ -Dnativewindow.x11.mt-bug=true \ $TSTCLASS $* \ 2>&1 | tee $LOGFILE \ diff --git a/make/scripts/crosstest-launch-android-activity.sh b/make/scripts/crosstest-launch-android-activity.sh new file mode 100644 index 000000000..c67cbfa11 --- /dev/null +++ b/make/scripts/crosstest-launch-android-activity.sh @@ -0,0 +1,17 @@ +#! /bin/sh + +#adb uninstall com.jogamp.common +#adb install ../../gluegen/build-android-armv7/gluegen-rt.apk + +adb uninstall javax.media.opengl +adb install ../build-android-armv7/jar/jogl.all-android.apk + +adb shell "setprop log.redirect-stdio true ; setprop log.redirect-stderr true ; \ + am start -a android.intent.action.MAIN -n javax.media.opengl/jogamp.newt.driver.android.NewtVersionActivity" + +#adb uninstall com.jogamp.android.launcher +#adb install ../build-android-armv7/android/jar/jogllauncher.apk + +#adb shell "setprop log.redirect-stdio true ; setprop log.redirect-stderr true ; \ +# am start -a android.intent.action.MAIN -n com.jogamp.android.launcher/com.jogamp.android.launcher.NEWTLauncherVersionActivity" + diff --git a/make/scripts/eglestest-java-linux.sh b/make/scripts/eglestest-java-linux.sh index 399da11b5..3151d9d1e 100644 --- a/make/scripts/eglestest-java-linux.sh +++ b/make/scripts/eglestest-java-linux.sh @@ -20,6 +20,7 @@ TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2E LOGFILE=`basename $0 .sh`.log +# -Djogamp.debug.NativeLibrary=true \ # -Djogamp.debug.NativeLibrary.Lookup=true \ # -Djogamp.debug.ProcAddressHelper=true \ # -Djogamp.debug=all \ @@ -28,13 +29,16 @@ LOGFILE=`basename $0 .sh`.log # -Dnewt.debug=all \ CP_BASE=../../gluegen/make/lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:../../gluegen/make/$BUILD_DIR/gluegen.jar -CP_JOGL_ALL=$BUILD_DIR/jar/nativewindow.all.jar:$BUILD_DIR/jar/jogl.all.jar:$BUILD_DIR/jar/newt.all.jar:$BUILD_DIR/jar/jogl.test.jar -CP_JOGL_EGLES=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles1.jar:$BUILD_DIR/jar/jogl.gles1.dbg.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar +CP_JOGL_ALL=$BUILD_DIR/jar/jogl.all.jar:$BUILD_DIR/test/build/jogl.test.jar +CP_JOGL_MOBILE=$BUILD_DIR/jar/jogl.all-mobile.jar:$BUILD_DIR/test/build/jogl.test.jar export DISPLAY=:0.0 ; java \ -Djava.library.path=../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \ - -Djava.class.path=$CP_BASE:$CP_JOGL_EGLES \ + -Djava.class.path=$CP_BASE:$CP_JOGL_MOBILE \ + -Djogamp.debug.NativeLibrary=true \ + -Dnativewindow.debug=all \ + -Djogl.debug=all \ $TSTCLASS $* \ 2>&1 | tee $LOGFILE \ diff --git a/make/scripts/make.jogl.all.android-armv7-cross.sh b/make/scripts/make.jogl.all.android-armv7-cross.sh index cbc5bda29..37a5c4c35 100755 --- a/make/scripts/make.jogl.all.android-armv7-cross.sh +++ b/make/scripts/make.jogl.all.android-armv7-cross.sh @@ -64,6 +64,7 @@ TARGET_FPU_ABI=softfp export TARGET_TOOL_PATH=${NDK_ROOT}/toolchains/${TARGET_ARCH}-${GCC_VERSION}/prebuilt/${HOST_ARCH} export TARGET_OS_PATH=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm/usr +export TARGET_PLATFORM_LIBS=${TARGET_OS_PATH}/lib export HOST_OS_PATH=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-x86/usr export NDK_XBIN_PATH=${TARGET_TOOL_PATH}/bin diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index b4f635cd5..678b48b24 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -142,7 +142,7 @@ function testawtmt() { #testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteGLWindows01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $* #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT @@ -174,7 +174,8 @@ testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2 #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT #testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT #testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417 -#testawtmt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $* +#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $* +testawt com.jogamp.opengl.test.junit.jogl.glu.TestBug463ScaleImageMemoryAWT $* # # newt.awt (testawt) |