diff options
Diffstat (limited to 'make/scripts')
-rw-r--r-- | make/scripts/adb-launch-junit.sh | 2 | ||||
-rw-r--r-- | make/scripts/adb-launch-main.sh | 2 | ||||
-rwxr-xr-x | make/scripts/adb-uninstall-all.sh | 2 | ||||
-rwxr-xr-x | make/scripts/cmpOld2New.sh | 4 | ||||
-rwxr-xr-x | make/scripts/lsGL23_commons.sh | 2 | ||||
-rwxr-xr-x | make/scripts/lsGL23_unique.sh | 2 | ||||
-rwxr-xr-x | make/scripts/lsGL23toGL2ES1_commons.sh | 2 | ||||
-rwxr-xr-x | make/scripts/lsGL2_GL3_commons.sh | 2 | ||||
-rwxr-xr-x | make/scripts/lsGLES2toGL3_commons.sh | 2 | ||||
-rwxr-xr-x | make/scripts/lsGLtoES1ES2_commons.sh | 2 | ||||
-rwxr-xr-x | make/scripts/lsGLtoES1_commons.sh | 2 | ||||
-rwxr-xr-x | make/scripts/lsGLtoES2_commons.sh | 2 | ||||
-rwxr-xr-x | make/scripts/lsGLtoGL3_commons.sh | 2 | ||||
-rwxr-xr-x | make/scripts/tests-win.bat | 2 | ||||
-rw-r--r-- | make/scripts/tests.sh | 2 |
15 files changed, 16 insertions, 16 deletions
diff --git a/make/scripts/adb-launch-junit.sh b/make/scripts/adb-launch-junit.sh index e53e76456..6780f9fa6 100644 --- a/make/scripts/adb-launch-junit.sh +++ b/make/scripts/adb-launch-junit.sh @@ -60,7 +60,7 @@ LOGFILE=`basename $0 .sh`.log #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jogamp-android-launcher.apk #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/gluegen-rt-android-armeabi.apk -#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall javax.media.opengl +#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.opengl #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jar/jogl-all-android-armeabi.apk #adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.opengl.test diff --git a/make/scripts/adb-launch-main.sh b/make/scripts/adb-launch-main.sh index 12dcab1e4..0068ef7dd 100644 --- a/make/scripts/adb-launch-main.sh +++ b/make/scripts/adb-launch-main.sh @@ -51,7 +51,7 @@ LOGFILE=`basename $0 .sh`.log #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jogamp-android-launcher.apk #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/gluegen-rt-android-armeabi.apk -#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall javax.media.opengl +#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.opengl #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jar/jogl-all-android-armeabi.apk #adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.opengl.test diff --git a/make/scripts/adb-uninstall-all.sh b/make/scripts/adb-uninstall-all.sh index a80c38f61..ba9d603bc 100755 --- a/make/scripts/adb-uninstall-all.sh +++ b/make/scripts/adb-uninstall-all.sh @@ -1,4 +1,4 @@ #adb $* uninstall jogamp.android.launcher #adb $* uninstall com.jogamp.common -adb $* uninstall javax.media.opengl +adb $* uninstall com.jogamp.opengl adb $* uninstall com.jogamp.opengl.test diff --git a/make/scripts/cmpOld2New.sh b/make/scripts/cmpOld2New.sh index 4a121a632..a9475523e 100755 --- a/make/scripts/cmpOld2New.sh +++ b/make/scripts/cmpOld2New.sh @@ -2,8 +2,8 @@ dirscript=`dirname $0` -dirold=../build-old/jogl/gensrc/classes/javax/media/opengl/ -dirnew=../build/jogl/gensrc/classes/javax/media/opengl/ +dirold=../build-old/jogl/gensrc/classes/com/jogamp/opengl/ +dirnew=../build/jogl/gensrc/classes/com/jogamp/opengl/ dircmp=cmp-old2new rm -rf $dircmp diff --git a/make/scripts/lsGL23_commons.sh b/make/scripts/lsGL23_commons.sh index cab55639b..ec16fa209 100755 --- a/make/scripts/lsGL23_commons.sh +++ b/make/scripts/lsGL23_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl SOURCE="$idir/GL.java $idir/GL2ES2.java $idir/GL2GL3.java $idir/GL3.java" diff --git a/make/scripts/lsGL23_unique.sh b/make/scripts/lsGL23_unique.sh index e21112ecc..560a3e4cd 100755 --- a/make/scripts/lsGL23_unique.sh +++ b/make/scripts/lsGL23_unique.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl SOURCE="$idir/GL.java $idir/GLES2.java $idir/GL2ES2.java $idir/GL3.java $idir/GL2.java $idir/GL2GL3.java" diff --git a/make/scripts/lsGL23toGL2ES1_commons.sh b/make/scripts/lsGL23toGL2ES1_commons.sh index 83a543b3c..b5439ac33 100755 --- a/make/scripts/lsGL23toGL2ES1_commons.sh +++ b/make/scripts/lsGL23toGL2ES1_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL2GL3 to GL2ES1 enums # sort $idir/GL2.java $idir/GL3.java $idir/GL2ES1.java $idir/GL2GL3.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGL2_GL3_commons.sh b/make/scripts/lsGL2_GL3_commons.sh index 722ba850d..b0ebbdae3 100755 --- a/make/scripts/lsGL2_GL3_commons.sh +++ b/make/scripts/lsGL2_GL3_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl SOURCE="$idir/GL.java $idir/GL2ES2.java $idir/GL2GL3.java $idir/GL2.java $idir/GL3.java" diff --git a/make/scripts/lsGLES2toGL3_commons.sh b/make/scripts/lsGLES2toGL3_commons.sh index d271b7ea2..aa65c8cfe 100755 --- a/make/scripts/lsGLES2toGL3_commons.sh +++ b/make/scripts/lsGLES2toGL3_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GLES2 to GL3 enums sort $idir/GLES2.java $idir/GL3.java $idir/GL2ES2.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGLtoES1ES2_commons.sh b/make/scripts/lsGLtoES1ES2_commons.sh index 21efb6549..eece3d25a 100755 --- a/make/scripts/lsGLtoES1ES2_commons.sh +++ b/make/scripts/lsGLtoES1ES2_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL to GL2ES1 to GL2ES1 GL2 enums sort $idir/GL.java $idir/GL2ES1.java $idir/GL2ES2.java $idir/GL2.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGLtoES1_commons.sh b/make/scripts/lsGLtoES1_commons.sh index e8a370acb..ba72ecc23 100755 --- a/make/scripts/lsGLtoES1_commons.sh +++ b/make/scripts/lsGLtoES1_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL to GL2ES1 to GLES1 enums sort $idir/GL.java $idir/GLES1.java $idir/GL2ES1.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGLtoES2_commons.sh b/make/scripts/lsGLtoES2_commons.sh index bbd0e239c..ade2ff110 100755 --- a/make/scripts/lsGLtoES2_commons.sh +++ b/make/scripts/lsGLtoES2_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL to GL2ES2 to GLES2 enums sort $idir/GL.java $idir/GLES2.java $idir/GL2ES2.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGLtoGL3_commons.sh b/make/scripts/lsGLtoGL3_commons.sh index 44cc34ccd..a2126ce79 100755 --- a/make/scripts/lsGLtoGL3_commons.sh +++ b/make/scripts/lsGLtoGL3_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL to GL2ES2 to GL3 enums sort $idir/GL.java $idir/GL3.java $idir/GL2ES2.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index 84a937bee..8a94a0fa2 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -1,6 +1,6 @@ REM scripts\java-win.bat jogamp.newt.awt.opengl.VersionApplet REM scripts\java-win.bat com.jogamp.newt.opengl.GLWindow -REM scripts\java-win.bat javax.media.opengl.awt.GLCanvas +REM scripts\java-win.bat com.jogamp.awt.GLCanvas REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT %* REM scripts\java-win.bat com.jogamp.oculusvr.OVRVersion %* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index e73bf53ce..be930d3f6 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -389,7 +389,7 @@ function testawtswt() { # Version # #testawt jogamp.newt.awt.opengl.VersionApplet $* -#testawt javax.media.opengl.awt.GLCanvas $* +#testawt com.jogamp.opengl.awt.GLCanvas $* #testnoawt com.jogamp.nativewindow.NativeWindowVersion $* #testnoawt com.jogamp.opengl.JoglVersion $* #testnoawt com.jogamp.newt.NewtVersion $* |