diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 2 | ||||
| -rw-r--r-- | make/build.xml | 4 | ||||
| -rw-r--r-- | make/scripts/crosstest-java-linux-armv7-rel.sh | 13 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 5 |
4 files changed, 13 insertions, 11 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.xml b/make/build.xml index 72d230942..f66a72d92 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,7 +126,7 @@ <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"/> </zips> diff --git a/make/scripts/crosstest-java-linux-armv7-rel.sh b/make/scripts/crosstest-java-linux-armv7-rel.sh index f89d02144..5a1aeeb82 100644 --- a/make/scripts/crosstest-java-linux-armv7-rel.sh +++ b/make/scripts/crosstest-java-linux-armv7-rel.sh @@ -29,18 +29,19 @@ 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/' \ + --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/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) |