diff options
| author | Sven Gothel <[email protected]> | 2014-08-28 19:00:42 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-08-28 19:00:42 +0200 |
| commit | 262592bc9d692fb4fa5f79eab7994998151b3ed1 (patch) | |
| tree | d5c85d4b85c4a7a85f5b760797f5b0830203261c /make | |
| parent | 8ca6a47b5cff613a40e6fb3dfef48f16b4b6995d (diff) | |
TestVersionSemantics: BACKWARD_COMPATIBLE_USER current vs 2.2.0
Diffstat (limited to 'make')
| -rw-r--r-- | make/lib/v2.2.0/jogl-all.jar | bin | 0 -> 3173337 bytes | |||
| -rwxr-xr-x | make/scripts/make.jogl.all.linux-x86_64.sh | 6 | ||||
| -rwxr-xr-x | make/scripts/tests-x64.sh | 6 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 8 |
4 files changed, 17 insertions, 3 deletions
diff --git a/make/lib/v2.2.0/jogl-all.jar b/make/lib/v2.2.0/jogl-all.jar Binary files differnew file mode 100644 index 000000000..994bdde5a --- /dev/null +++ b/make/lib/v2.2.0/jogl-all.jar diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh index 9e8d52980..bb6bdf047 100755 --- a/make/scripts/make.jogl.all.linux-x86_64.sh +++ b/make/scripts/make.jogl.all.linux-x86_64.sh @@ -2,6 +2,12 @@ SDIR=`dirname $0` +#J2RE_HOME=/opt-linux-x86_64/jre1.7.0_45 +#JAVA_HOME=/opt-linux-x86_64/jdk1.7.0_45 +#J2RE_HOME=/opt-linux-x86_64/jre7 +#JAVA_HOME=/opt-linux-x86_64/j2se7 +#export J2RE_HOME JAVA_HOME + if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index 421b912fb..30b0aaf8a 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -12,6 +12,12 @@ SDIR=`dirname $0` #export LD_LIBRARY_PATH=$HOME/ffmpeg-2.2.2/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$LD_LIBRARY_PATH +#J2RE_HOME=/opt-linux-x86_64/jre1.7.0_45 +#JAVA_HOME=/opt-linux-x86_64/jdk1.7.0_45 +#J2RE_HOME=/opt-linux-x86_64/jre7 +#JAVA_HOME=/opt-linux-x86_64/j2se7 +#export J2RE_HOME JAVA_HOME + if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 1e229ec2f..06eb92c45 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -284,7 +284,7 @@ function jrun() { #D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer.Native" #D_ARGS="-Djogl.debug.StereoDevice -Djogl.debug.StereoDevice.DumpData" - D_ARGS="-Djogl.debug.StereoDevice" + #D_ARGS="-Djogl.debug.StereoDevice" if [ $awton -eq 1 ] ; then export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH @@ -377,12 +377,12 @@ function testawtswt() { #testawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLCanvasAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $* +testawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $* # # Stereo # -testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* +#testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* # # HiDPI @@ -800,6 +800,8 @@ testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT00 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $* +#testnoawt com.jogamp.opengl.test.junit.graph.TestFontsNEWT00 $* +#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWTBugXXXX $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.ui.UINewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo $* |