Bug 1362: build/test: Use new SWT 4.10 swt.jar (instead of swt-debug.jar)

12 files changed, 34 insertions, 25 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 0205e1e99..4a04fda1e 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -124,31 +124,31 @@
 
         <!-- Set swt.jar to the correct file for this platform. We point to the debug JARs to allow
              stepping into SWT calls using the accompanying source code zip archives. -->
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86_64/swt-debug.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86_64/swt.jar">
           <istrue value="${isWindowsAMD64}" />
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
-          <istrue value="${isWindowsX86}" />
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt.jar">
+          <istrue value="${isWindowsX86}" /> <!-- no more supported since SWT 4.10 -->
         </condition>
         <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar">
           <istrue value="${isFreeBSDAMD64}" />
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt.jar">
           <istrue value="${isLinuxAMD64}" />
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
-          <istrue value="${isLinuxX86}" />
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt.jar">
+          <istrue value="${isLinuxX86}" /> <!-- no more supported since SWT 4.10 -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt.jar">
           <istrue value="${isLinuxARM64}" /> <!-- FIXME JAU .. hack -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt.jar">
           <istrue value="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt.jar">
           <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
         </condition>
-        <property name="swt-cocoa-macosx-x86_64.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar"/>
+        <property name="swt-cocoa-macosx-x86_64.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt.jar"/>
         <condition property="swt.jar" value="${swt-cocoa-macosx-x86_64.jar}">
           <and>
             <istrue value="${isOSX}" />
@@ -158,8 +158,8 @@
             </or>                
           </and>
         </condition>
-        <property name="swt-cocoa-macosx-x86_32.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar"/>
-        <condition property="swt.jar" value="${swt-cocoa-macosx-x86_32.jar}">
+        <property name="swt-cocoa-macosx-x86_32.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt.jar"/>
+        <condition property="swt.jar" value="${swt-cocoa-macosx-x86_32.jar}"> <!-- no more supported since SWT 4.10 -->
           <and>
             <istrue value="${isOSX}" />
             <or>
@@ -168,16 +168,16 @@
             </or>
           </and>
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
-          <istrue value="${isSolarisX86}" />
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt.jar">
+          <istrue value="${isSolarisX86}" /> <!-- no more supported since SWT 4.10 -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt.jar">
           <istrue value="${isSolarisAMD64}" /> <!-- FIXME JAU .. hack -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt.jar">
           <istrue value="${isSolarisSparc}" />
         </condition>
-		<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
+		<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt.jar">
           <istrue value="${isSolarisSparcv9}" /> <!-- FIXME JAU .. hack -->
         </condition>
         <echo message="swt.jar=${swt.jar}" />
diff --git a/make/scripts/test-win32-smb_share.bat b/make/scripts/test-win32-smb_share.bat
index 8940a1560..58f37e243 100755
--- a/make/scripts/test-win32-smb_share.bat
+++ b/make/scripts/test-win32-smb_share.bat
@@ -24,7 +24,7 @@ set D_ARGS="-Djogamp.debug=all"
 REM set LIB_DIR=..\..\gluegen\%BLD_SUB%\obj;%BLD_DIR%\lib

 set LIB_DIR=

 

-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\jogl-test.jar;%SMB_ROOT%\gluegen\%BLD_SUB%\gluegen-rt.jar;%SMB_ROOT%\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt-debug.jar

+set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\jogl-test.jar;%SMB_ROOT%\gluegen\%BLD_SUB%\gluegen-rt.jar;%SMB_ROOT%\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt.jar

 

 echo CP_ALL %CP_ALL%

 

diff --git a/make/scripts/tests-osx-x64-custom.sh b/make/scripts/tests-osx-x64-custom.sh
index 16a56285b..201c36f41 100755
--- a/make/scripts/tests-osx-x64-custom.sh
+++ b/make/scripts/tests-osx-x64-custom.sh
@@ -2,6 +2,8 @@
 
 export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH
 
+export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar
+
 spath=`dirname $0`
 
 . $spath/tests.sh  "`which java`" -d64 ../build-macosx $*
diff --git a/make/scripts/tests-osx-x64-mainthread.sh b/make/scripts/tests-osx-x64-mainthread.sh
index bf95a9b67..e21449887 100644
--- a/make/scripts/tests-osx-x64-mainthread.sh
+++ b/make/scripts/tests-osx-x64-mainthread.sh
@@ -1,5 +1,5 @@
 
-export CLASSPATH=.:../../gluegen/make/../build-macosx/gluegen-rt.jar:../build-macosx/jar/jogl-all-noawt.jar:../build-macosx/jar/jogl-test.jar:../build-macosx/../make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar:../../gluegen/make/../make/lib/junit.jar:/opt-share/apache-ant/lib/ant.jar:/opt-share/apache-ant/lib/ant-junit.jar:../build-macosx/jar/atomic/jogl-swt.jar:../build-macosx/jar/jogl-test.jar
+export CLASSPATH=.:../../gluegen/make/../build-macosx/gluegen-rt.jar:../build-macosx/jar/jogl-all-noawt.jar:../build-macosx/jar/jogl-test.jar:../build-macosx/../make/lib/swt/cocoa-macosx-x86_64/swt.jar:../../gluegen/make/../make/lib/junit.jar:/opt-share/apache-ant/lib/ant.jar:/opt-share/apache-ant/lib/ant-junit.jar:../build-macosx/jar/atomic/jogl-swt.jar:../build-macosx/jar/jogl-test.jar
 
 /usr/bin/java -d64 -XstartOnFirstThread -Djava.awt.headless=true  com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn
 #/usr/bin/java -d64 -XstartOnFirstThread -Djava.awt.headless=false com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh
index 020ea34d1..f0d8ffacf 100755
--- a/make/scripts/tests-osx-x64.sh
+++ b/make/scripts/tests-osx-x64.sh
@@ -12,6 +12,8 @@ JAVA_HOME=`/usr/libexec/java_home`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
+export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar
+
 spath=`dirname $0`
 
 . $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx $*
diff --git a/make/scripts/tests-x32-dbg.bat b/make/scripts/tests-x32-dbg.bat
index bd5383a7b..2b3e851b1 100755
--- a/make/scripts/tests-x32-dbg.bat
+++ b/make/scripts/tests-x32-dbg.bat
@@ -25,7 +25,7 @@ set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH%
 REM set LIB_DIR=%BLD_DIR%\lib;..\..\gluegen\%BLD_SUB%\obj

 set LIB_DIR=

 

-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt-debug.jar

+set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt.jar

 

 echo CP_ALL %CP_ALL%

 

diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat
index 54b085fad..900c27ba1 100755
--- a/make/scripts/tests-x32.bat
+++ b/make/scripts/tests-x32.bat
@@ -26,7 +26,7 @@ set BLD_DIR=..\%BLD_SUB%
 REM set LIB_DIR=..\..\gluegen\%BLD_SUB%\obj;%BLD_DIR%\lib

 set LIB_DIR=

 

-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt-debug.jar

+set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt.jar

 

 echo CP_ALL %CP_ALL%

 

diff --git a/make/scripts/tests-x32.sh b/make/scripts/tests-x32.sh
index 858ed5fd8..0d4644f4f 100755
--- a/make/scripts/tests-x32.sh
+++ b/make/scripts/tests-x32.sh
@@ -6,7 +6,7 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
 fi
 
-export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86/swt-debug.jar
+export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86/swt.jar
 
 . $SDIR/tests.sh  `which java` -d32 ../build-x86 $*
 
diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat
index ce0754cfa..438b1ae07 100755
--- a/make/scripts/tests-x64-dbg.bat
+++ b/make/scripts/tests-x64-dbg.bat
@@ -21,7 +21,7 @@ REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
 REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\PVRVFrame\OGLES-2.0\Windows_x86_64;%PATH%

 set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH%

 

-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\joal\%BLD_SUB%\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt-debug.jar

+set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\joal\%BLD_SUB%\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt.jar

 

 echo CP_ALL %CP_ALL%

 

diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index 1b01a3748..7404529df 100755
--- a/make/scripts/tests-x64.bat
+++ b/make/scripts/tests-x64.bat
@@ -21,7 +21,7 @@ set BLD_DIR=..\%BLD_SUB%
 REM set LIB_DIR=%BLD_DIR%\lib;..\..\gluegen\%BLD_SUB%\obj

 set LIB_DIR=

 

-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\joal\%BLD_SUB%\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt-debug.jar

+set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\joal\%BLD_SUB%\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt.jar

 echo CP_ALL %CP_ALL%

 

 set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"

diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh
index 722e37f34..c12be29df 100755
--- a/make/scripts/tests-x64.sh
+++ b/make/scripts/tests-x64.sh
@@ -27,5 +27,7 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
+export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86_64/swt.jar
+
 . $SDIR/tests.sh  `which java` -d64 ../build-x86_64 $*
 
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 81ef5d592..98326eace 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -760,6 +760,9 @@ function testawtswt() {
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $*
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestBug672NewtCanvasSWTSashForm $*
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestBug672NewtCanvasSWTSashFormComposite $*
+#testswt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2SWT3 $*
+testswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $*
+#testswt com.jogamp.opengl.test.junit.jogl.demos.es2.swt.TestGearsES2SWT $*
 
 #
 # awtswt (testawtswt) 
@@ -781,7 +784,7 @@ function testawtswt() {
 #testawt com.jogamp.opengl.test.junit.newt.event.TestNewtKeyEventOrderAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.event.TestNewtKeyEventAutoRepeatAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.event.TestNewtKeyPressReleaseUnmaskRepeatAWT $*
-testawt com.jogamp.opengl.test.junit.newt.event.TestNewtKeyCodesAWT $*
+#testawt com.jogamp.opengl.test.junit.newt.event.TestNewtKeyCodesAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.event.TestNewtKeyCodeModifiersAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.event.TestNewtEventModifiersNEWTWindowAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.event.TestNewtEventModifiersAWTCanvas $*