diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 5 | ||||
| -rw-r--r-- | make/build-test.xml | 103 | ||||
| -rw-r--r-- | make/build.xml | 28 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-common.java | 6 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.android-armv7-cross.sh | 4 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 4 |
6 files changed, 85 insertions, 65 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 6f2a9900a..e560cd8b9 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -387,6 +387,7 @@ <!-- JavaSE combinations --> <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" /> <property name="jogl.test.jar" value="${jar}/jogl.test.jar"/> + <property name="jogl.test.apk" value="${jar}/jogl.test.apk"/> <!-- JavaSE combinations . AWT --> <property name="jogl.all.jar" value="${jar}/jogl.all.jar" /> @@ -395,6 +396,7 @@ <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.apk" /> <path id="swt_gluegen.classpath"> <pathelement location="${gluegen-rt.jar}" /> @@ -464,8 +466,7 @@ <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}"/> - <!--property name="junit.run.remote.apks" value="${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.apk${path.separator}${build_t}/gluegen-test.apk"/--> - + <property name="junit.run.remote.apks" value="${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt.apk${path.separator}${jogl.all-android.apk}${path.separator}${jogl.test.apk}"/> <!-- Test Run w/ SWT .. --> <path id="junit_jogl_swt.run.classpath"> diff --git a/make/build-test.xml b/make/build-test.xml index 0dc5e07d7..8a3bb3d24 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -56,25 +56,22 @@ <!-- - Build/run tests/junit. --> - <target name="test.compile.check" depends="declare.common"> - <!-- Create the required output directories. --> - <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}"/> - <uptodate property="test.compile.skip"> - <srcfiles dir= "." includes="*.xml"/> - <srcfiles dir= "${src.test}" includes="**"/> - <srcfiles file="${gluegen.jar}" /> - <srcfiles dir="${src}/nativewindow" /> - <srcfiles dir="${src}/jogl" /> - <srcfiles dir="${src}/newt" /> - <mapper type="merge" to="${jogl.test.jar.path}"/> - </uptodate> + <target name="android.test.package" if="isAndroid"> + <aapt.signed + jarsrcdir="${src}/test" + jarbuilddir="${jar}" + jarbasename="jogl.test" + nativebuilddir="${lib}" + nativebasename="non-existing" + android.abi="${android.abi}" + androidmanifest.path="resources/android/AndroidManifest-test.xml" + androidresources.path="resources/android/res-jogl" + jarmanifest.path="${build.jogl}/manifest.mf" + version.code="${jogl_int_version}" + version.name="${jogl.version.plus}" /> </target> - <target name="test.compile" depends="test.compile.check" unless="test.compile.skip"> + <target name="test.compile.java"> <!-- Perform the junit pass Java compile --> <javac destdir="${classes}" fork="yes" @@ -103,6 +100,29 @@ </jar> </target> + <target name="test.compile.check" depends="declare.common"> + <!-- Create the required output directories. --> + <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}"/> + <uptodate property="test.compile.skip"> + <srcfiles dir= "." includes="*.xml"/> + <srcfiles dir= "${src.test}" includes="**"/> + <srcfiles file="${gluegen.jar}" /> + <srcfiles dir="${src}/nativewindow" /> + <srcfiles dir="${src}/jogl" /> + <srcfiles dir="${src}/newt" /> + <mapper type="merge" to="${jogl.test.jar.path}"/> + </uptodate> + </target> + + <target name="test.compile" depends="test.compile.check" unless="test.compile.skip"> + <antcall target="test.compile.java" inheritRefs="true" inheritAll="true"/> + <antcall target="android.test.package" inheritRefs="true" inheritAll="true"/> + </target> + <target name="test.manual.run" depends="test.compile"> <for param="test.class.path.m" keepgoing="true"> <!-- results in absolute path --> @@ -756,40 +776,56 @@ ${line.separator} </exec> </target> +<!-- +rsync: + -a == -rlptgoD + -rt +--> + <target name="junit.run.remote.adb" if="isAndroidARMv7"> <echo message="#! /system/bin/sh${line.separator}" append="false" file="${build.test}/targetcommand.sh" /> <echo message="${line.separator} -rsync -av --delete --delete-after --delete-excluded \${line.separator} +rsync -rtv --delete --delete-after --delete-excluded \${line.separator} --exclude 'build-x86*/' --exclude 'build-linux*/' --exclude 'build-win*/' --exclude 'build-mac*/' \${line.separator} --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude '*-java-src.zip' \${line.separator} - ${env.HOST_UID}@${env.HOST_IP}::${env.HOST_RSYNC_ROOT}/${jogl.basename} ${env.TARGET_ROOT} ${line.separator} + --exclude 'gensrc/' --exclude 'doc/' --exclude 'jnlp-files' --exclude 'archive/' \${line.separator} + --exclude 'android-sdk/' --exclude 'resources/' --exclude 'scripts/' \${line.separator} + --exclude 'stub_includes/' --exclude 'nbproject/' --exclude '*.log' --exclude '*.zip' --exclude '*.7z' \${line.separator} + ${env.HOST_UID}@${env.HOST_IP}::${env.HOST_RSYNC_ROOT}/${gluegen.basename} \${line.separator} + ${env.HOST_UID}@${env.HOST_IP}::${env.HOST_RSYNC_ROOT}/${jogl.basename} \${line.separator} + ${env.TARGET_ROOT} ${line.separator} +mkdir ${env.TARGET_ROOT}/tmp ${line.separator} cd ${env.TARGET_ROOT}/${jogl.basename}/${env.NODE_LABEL}/make ${line.separator} -export ${system.env.library.path}=/system/lib:${env.TARGET_ROOT}/${gluegen.basename}/${rootrel.build}/obj:${env.TARGET_ROOT}/${gluegen.basename}/${rootrel.build}/test/build/natives ${line.separator} -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 ${line.separator} +export ${system.env.library.path}=/system/lib:${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/${rootrel.build}/obj:${env.TARGET_ROOT}/${jogl.basename}/${env.NODE_LABEL}/${rootrel.build}/lib ${line.separator} +# 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 ${line.separator} " append="true" file="${build.test}/targetcommand.sh" /> <for param="test.class.path.m" keepgoing="true"> <!-- results in absolute path --> - <fileset dir="${build_t.java}"> - <include name="${test.junit.rel}/**/*Test*"/> + <fileset dir="${classes}"> + <!--include name="${java.dir.junit}/**/Test*NEWT*"/--> + <include name="${java.dir.junit}/**/TestMainVersionGLWindowNEWT*"/> + <!--include name="${java.dir.junit}/**/TestGLProfile01NEWT*"/--> <exclude name="**/*$$*"/> </fileset> <sequential> <var name="test.class.path" unset="true"/> - <property name="test.class.path" basedir="${build_t.java}" relative="true" location="@{test.class.path.m}"/> + <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/> <var name="test.class.fqn" unset="true"/> <pathconvert property="test.class.fqn"> - <fileset file="${build_t.java}${file.separator}${test.class.path}"/> + <fileset file="${classes}${file.separator}${test.class.path}"/> <chainedmapper> - <globmapper from="${build_t.java.path}${file.separator}*" to="*"/> <!-- rel. --> + <globmapper from="${classes.path}${file.separator}*" to="*"/> <!-- rel. --> <packagemapper from="*.class" to="*"/> <!-- FQCN --> </chainedmapper> </pathconvert> - <var name="test.class.result.file" value="${results}/TEST-${test.class.fqn}.xml"/> + <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.xml"/> <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/> <echo message="${line.separator} dalvikvm \${line.separator} -Xjnigreflimit:2000 \${line.separator} +${junit.run.arg0}\${line.separator} +${junit.run.arg1}\${line.separator} -cp ${junit.run.remote.apks} \${line.separator} -Dgluegen.root=${gluegen.root} \${line.separator} -Drootrel.build=${rootrel.build} \${line.separator} @@ -806,19 +842,20 @@ logtestlistenerevents=true \${line.separator} formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter \${line.separator} formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.class.result.file} ${line.separator} ${line.separator} -" append="true" file="${build_t}/targetcommand.sh" /> +" append="true" file="${build.test}/targetcommand.sh" /> </sequential> </for> <exec dir="." executable="sh" logError="true" failonerror="true" failifexecutionfails="true"> <arg line='-x -c " - chmod 0755 ${build_t}/targetcommand.sh ; - adb push ${build_t}/targetcommand.sh ${env.TARGET_ROOT}/jogl-targetcommand.sh ; - adb shell ${env.TARGET_ROOT}/jogl-targetcommand.sh ; - adb pull ${env.TARGET_ROOT}/${jogl.basename}/${env.NODE_LABEL}/make/${results}/ ${results}/ "'/> + chmod 0755 ${build.test}/targetcommand.sh ; + adb connect ${env.TARGET_IP}:${env.TARGET_ADB_PORT} ; + adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} push ${build.test}/targetcommand.sh ${env.TARGET_ROOT}/jogl-targetcommand.sh ; + adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} shell ${env.TARGET_ROOT}/jogl-targetcommand.sh ; + adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} pull ${env.TARGET_ROOT}/${jogl.basename}/${env.NODE_LABEL}/make/${results.test}/ ${results.test}/ "'/> </exec> </target> - <target name="junit.run.tests" depends="junit.run.local.d32, junit.run.local, junit.run.remote.ssh.newt"/> + <target name="junit.run.tests" depends="junit.run.local.d32, junit.run.local, junit.run.remote.ssh.newt, junit.run.remote.adb"/> <target name="junit.run.settings" depends="declare.common"> <delete quiet="true"> diff --git a/make/build.xml b/make/build.xml index a39707769..5a17812e0 100644 --- a/make/build.xml +++ b/make/build.xml @@ -16,12 +16,10 @@ <target name="all.ide" description="Debug IDE build nativewindow, jogl and newt projects, including all junit tests, but don't tag the build or create archives" depends="init.debug,build.nativewindow,build.jogl,build.newt,one.dir,test.compile" /> - <target name="test.compile.1"> + <target name="test.compile"> <ant antfile="build-test.xml" target="test.compile" inheritRefs="true" inheritAll="true"/> </target> - <target name="test.compile" depends="test.compile.1,android.test.package"/> - <target name="test.auto.run" description="Run automated tests (junit and others) in nativewindow, jogl and newt projects"> <ant antfile="build-test.xml" target="test.auto.run" inheritRefs="true" inheritAll="true"/> </target> @@ -149,7 +147,7 @@ </target> <target name="android.package.jogl.skip.check" depends="init,gluegen.cpptasks.detect.os"> - <uptodate property="android.package.jogl.skip" targetfile="${jar}/jogl.all-android.apk"> + <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> @@ -170,28 +168,6 @@ version.name="${jogl.version.plus}" /> </target> - <target name="android.package.test.skip.check" depends="init,gluegen.cpptasks.detect.os"> - <uptodate property="android.package.test.skip" targetfile="${jar}/jogl.test.apk"> - <srcfiles dir="${jar}" includes="jogl.test.jar" /> - <srcfiles dir="resources/android" includes="**" /> - </uptodate> - </target> - - <target name="android.test.package" depends="init,gluegen.cpptasks.detect.os,android.package.test.skip.check" if="isAndroid" unless="android.package.test.skip"> - <aapt.signed - jarsrcdir="${src}/test" - jarbuilddir="${jar}" - jarbasename="jogl.test" - nativebuilddir="${lib}" - nativebasename="non-existing" - android.abi="${android.abi}" - androidmanifest.path="resources/android/AndroidManifest-test.xml" - androidresources.path="resources/android/res-jogl" - jarmanifest.path="${build.jogl}/manifest.mf" - version.code="${jogl_int_version}" - version.name="${jogl.version.plus}" /> - </target> - <target name="android.launcher.package" depends="init,gluegen.cpptasks.detect.os" if="isAndroid"> <mkdir dir="${build}/android/classes" /> <mkdir dir="${build}/android/lib" /> diff --git a/make/config/jogl/gl-impl-CustomJavaCode-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java index 0a8e90171..2c3227ee5 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-common.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java @@ -48,10 +48,16 @@ private GLContextImpl _context; + /** + * @see javax.media.opengl.GLContext#setSwapInterval(int) + */ public void setSwapInterval(int interval) { _context.setSwapInterval(interval); } + /** + * @see javax.media.opengl.GLContext#getSwapInterval() + */ public int getSwapInterval() { return _context.getSwapInterval(); } diff --git a/make/scripts/make.jogl.all.android-armv7-cross.sh b/make/scripts/make.jogl.all.android-armv7-cross.sh index 25ff05a22..4f302355e 100755 --- a/make/scripts/make.jogl.all.android-armv7-cross.sh +++ b/make/scripts/make.jogl.all.android-armv7-cross.sh @@ -8,9 +8,9 @@ export HOST_IP=10.1.0.122 export HOST_RSYNC_ROOT=PROJECTS/JOGL export TARGET_UID=jogamp -#export TARGET_IP=panda02 +export TARGET_IP=panda02 #export TARGET_IP=jautab03 -export TARGET_IP=jauphone04 +#export TARGET_IP=jauphone04 export TARGET_ADB_PORT=5555 # needs executable bit (probably su) export TARGET_ROOT=/data/projects diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 6e8627813..c61b03fab 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -205,7 +205,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestGearsES1NEWT $* #testawt 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.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestRedSquareES1NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $* @@ -261,7 +261,7 @@ function testawtswt() { #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $* #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn $* #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTGLCanvas01GLn $* -testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor02GLn $* +#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor02GLn $* # # awtswt (testawtswt) |