diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 1 | ||||
| -rw-r--r-- | make/scripts/adb-launch-main.sh | 32 |
2 files changed, 21 insertions, 12 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 96b3f08a4..3b7aaccf1 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -557,6 +557,7 @@ rsync -av --delete --delete-after --delete-excluded \${line.separator} --exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \${line.separator} --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude '*-java-src.zip' \${line.separator} + --exclude 'make/lib/external/' \${line.separator} ${env.HOST_UID}@${env.HOST_IP}::${env.HOST_RSYNC_ROOT}/${jogl.basename} ${env.TARGET_ROOT} ${line.separator} cd ${env.TARGET_ROOT}/${jogl.basename}/${env.NODE_LABEL}/make ${line.separator} " append="true" file="${build.test}/targetcommand.sh" /> diff --git a/make/scripts/adb-launch-main.sh b/make/scripts/adb-launch-main.sh index 7e32165d2..0887c107f 100644 --- a/make/scripts/adb-launch-main.sh +++ b/make/scripts/adb-launch-main.sh @@ -2,11 +2,13 @@ export HOST_UID=jogamp # jogamp02 - 10.1.0.122 -export HOST_IP=10.1.0.122 +#export HOST_IP=10.1.0.122 +export HOST_IP=10.1.0.52 export HOST_RSYNC_ROOT=PROJECTS/JOGL export TARGET_UID=jogamp -export TARGET_IP=panda02 +#export TARGET_IP=panda02 +export TARGET_IP=jautab01 export TARGET_ADB_PORT=5555 export TARGET_ROOT=/data/projects @@ -17,7 +19,7 @@ if [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH fi -TSTCLASS=jogamp.android.launcher.LauncherUtil +#TSTCLASS=jogamp.android.launcher.LauncherUtil #TSTCLASS=com.jogamp.opengl.test.android.LauncherUtil #TSTCLASS=com.jogamp.android.launcher.NEWTLauncherMain #TSTCLASS=com.jogamp.nativewindow.NativeWindowVersion @@ -32,6 +34,7 @@ TSTCLASS=jogamp.android.launcher.LauncherUtil #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.es2.newt.TestGearsES2NEWT LOGFILE=`basename $0 .sh`.log @@ -40,7 +43,8 @@ RSYNC_EXCLUDES="--delete-excluded \ --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude '*-java-src.zip' \ --exclude 'gensrc/' --exclude 'doc/' --exclude 'jnlp-files' --exclude 'archive/' \ --exclude 'android-sdk/' --exclude 'resources/' --exclude 'scripts/' \ - --exclude 'stub_includes/' --exclude 'nbproject/' --exclude '*.log' --exclude '*.zip' --exclude '*.7z'" + --exclude 'stub_includes/' --exclude 'nbproject/' --exclude '*.log' --exclude '*.zip' --exclude '*.7z' \ + --exclude 'make/lib/external/'" echo "#! /system/bin/sh" > $BUILD_DIR/jogl-targetcommand.sh @@ -51,16 +55,20 @@ rsync -av --delete --delete-after $RSYNC_EXCLUDES \ $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/$BUILD_DIR/jogamp.android-launcher.apk:../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt.apk:$BUILD_DIR/jar/jogl.all-android.apk:$BUILD_DIR/jar/jogl.test.apk:$BUILD_DIR/jar/jogl.android-launcher.apk \ - -Dgluegen.root=../../gluegen \ - -Drootrel.build=build-android-armv7 \ - com.android.internal.util.WithFramework \ - $TSTCLASS \ +# 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 ; +setprop log.redirect-stdio true ; setprop log.redirect-stderr true ; \ +am start -a android.intent.action.MAIN -n jogamp.android.launcher/jogamp.android.launcher.MainLauncher -d launch://jogamp.org/$TSTCLASS/?pkg=com.jogamp.opengl.test\&newt.debug=all\&jogl.debug=all\&nativewindow.debug=all \ +# \ +#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.apk:$BUILD_DIR/jar/jogl.all-android.apk:$BUILD_DIR/jar/jogl.test.apk:$BUILD_DIR/jar/jogl.android-launcher.apk \ +# -Dgluegen.root=../../gluegen \ +# -Drootrel.build=build-android-armv7 \ +# com.android.internal.util.WithFramework \ +# $TSTCLASS \ " >> $BUILD_DIR/jogl-targetcommand.sh + chmod ugo+x $BUILD_DIR/jogl-targetcommand.sh adb connect $TARGET_IP:$TARGET_ADB_PORT adb -s $TARGET_IP:$TARGET_ADB_PORT push $BUILD_DIR/jogl-targetcommand.sh $TARGET_ROOT/jogl-targetcommand.sh |