cleanup scripts ; updated win32 and win64 scripts with my environment

18 files changed, 110 insertions, 8 deletions

diff --git a/make/java-win32-dbg.bat b/make/java-win32-dbg.bat
index 69287f8e9..9d9af8262 100644
--- a/make/java-win32-dbg.bat
+++ b/make/java-win32-dbg.bat
@@ -1,7 +1,7 @@
 

 set BLD_SUB=build-win32

-set J2RE_HOME=c:\jre1.6.0_19

-set JAVA_HOME=c:\jdk1.6.0_19

+set J2RE_HOME=c:\jre1.6.0_20_x32

+set JAVA_HOME=c:\jdk1.6.0_20_x32

 set ANT_PATH=C:\apache-ant-1.8.0

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

diff --git a/make/java-win32.bat b/make/java-win32.bat
index 5f731a14d..dade13565 100644
--- a/make/java-win32.bat
+++ b/make/java-win32.bat
@@ -1,7 +1,7 @@
 

 set BLD_SUB=build-win32

-set J2RE_HOME=c:\jre1.6.0_19

-set JAVA_HOME=c:\jdk1.6.0_19

+set J2RE_HOME=c:\jre1.6.0_20_x32

+set JAVA_HOME=c:\jdk1.6.0_20_x32

 set ANT_PATH=C:\apache-ant-1.8.0

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

diff --git a/make/java-win64-dbg.bat b/make/java-win64-dbg.bat
new file mode 100644
index 000000000..b5ce58fa3
--- /dev/null
+++ b/make/java-win64-dbg.bat
@@ -0,0 +1,16 @@
+

+set BLD_SUB=build-win32

+set J2RE_HOME=c:\jre1.6.0_20_x64

+set JAVA_HOME=c:\jdk1.6.0_20_x64

+set ANT_PATH=C:\apache-ant-1.8.0

+

+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

+

+set BLD_DIR=..\%BLD_SUB%

+set LIB_DIR=%BLD_DIR%\lib;..\..\gluegen\%BLD_SUB%\obj

+

+set CP_ALL=.;%BLD_DIR%\jogl\jogl.all.jar;%BLD_DIR%\nativewindow\nativewindow.all.jar;%BLD_DIR%\newt\newt.all.jar;%BLD_DIR%\jogl\jogl.test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\make\lib\junit-4.5.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar

+

+echo CP_ALL %CP_ALL%

+

+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32-dbg.log 2>&1

diff --git a/make/java-win64.bat b/make/java-win64.bat
new file mode 100644
index 000000000..d0b8536f7
--- /dev/null
+++ b/make/java-win64.bat
@@ -0,0 +1,16 @@
+

+set BLD_SUB=build-win32

+set J2RE_HOME=c:\jre1.6.0_20_x64

+set JAVA_HOME=c:\jdk1.6.0_20_x64

+set ANT_PATH=C:\apache-ant-1.8.0

+

+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

+

+set BLD_DIR=..\%BLD_SUB%

+set LIB_DIR=%BLD_DIR%\lib;..\..\gluegen\%BLD_SUB%\obj

+

+set CP_ALL=.;%BLD_DIR%\jogl\jogl.all.jar;%BLD_DIR%\nativewindow\nativewindow.all.jar;%BLD_DIR%\newt\newt.all.jar;%BLD_DIR%\jogl\jogl.test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\make\lib\junit-4.5.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar

+

+echo CP_ALL %CP_ALL%

+

+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1

diff --git a/make/make.jogl.all.win32.bat b/make/make.jogl.all.win32.bat
index fe6a8aff0..2638ffbac 100644
--- a/make/make.jogl.all.win32.bat
+++ b/make/make.jogl.all.win32.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.6.0_19

-set JAVA_HOME=c:\jdk1.6.0_19

+set J2RE_HOME=c:\jre1.6.0_20_x32

+set JAVA_HOME=c:\jdk1.6.0_20_x32

 set ANT_PATH=C:\apache-ant-1.8.0

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

diff --git a/make/make.jogl.all.win64.bat b/make/make.jogl.all.win64.bat
index 508067d57..d549866ab 100644
--- a/make/make.jogl.all.win64.bat
+++ b/make/make.jogl.all.win64.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.6.0_19

-set JAVA_HOME=c:\jdk1.6.0_19

+set J2RE_HOME=c:\jre1.6.0_20_x64

+set JAVA_HOME=c:\jdk1.6.0_20_x64

 set ANT_PATH=C:\apache-ant-1.8.0

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw-w64\bin;c:\mingw\bin;%PATH%

diff --git a/make/scripts/jogl-cp-dll.sh b/make/scripts/jogl-cp-dll.sh
new file mode 100755
index 000000000..a9285b9e7
--- /dev/null
+++ b/make/scripts/jogl-cp-dll.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+jogamproot=$1
+shift
+
+builddir=$1
+shift
+
+destination=$1
+shift
+
+
+if [ -z "$jogamproot" -o -z "$builddir" -o -z "$destination" ] ; then
+    echo Usage $0 jogamp_root builddir destination
+    echo e.g. $0 JOGL build-win32 /cygdrive/y/jogl/lib-jogl-win32/
+    exit
+fi
+
+cp -v \
+  $jogamproot/jogl/$builddir/jar/*natives* \
+  $jogamproot/gluegen/$builddir/obj/*.dll \
+  $jogamproot/jogl/$builddir/nativewindow/obj/*.dll \
+  $jogamproot/jogl/$builddir/jogl/obj/*.dll \
+  $jogamproot/jogl/$builddir/newt/obj/*.dll \
+    $destination
+
diff --git a/make/scripts/jogl-rm-builds.sh b/make/scripts/jogl-rm-builds.sh
new file mode 100755
index 000000000..f014a3e9c
--- /dev/null
+++ b/make/scripts/jogl-rm-builds.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+jogamproot=$1
+shift
+
+builddir=$1
+shift
+
+if [ -z "$jogamproot" -o -z "$builddir" ] ; then
+    echo Usage $0 jogamp_root builddir
+    echo e.g. $0 JOGL build-win32
+fi
+
+
+rm -rf $jogamproot/gluegen/$builddir
+rm -rf $jogamproot/jogl/$builddir
diff --git a/make/lsGL23_commons.sh b/make/scripts/lsGL23_commons.sh
index 7c7161717..7c7161717 100644
--- a/make/lsGL23_commons.sh
+++ b/make/scripts/lsGL23_commons.sh
diff --git a/make/lsGL23_unique.sh b/make/scripts/lsGL23_unique.sh
index e21112ecc..e21112ecc 100644
--- a/make/lsGL23_unique.sh
+++ b/make/scripts/lsGL23_unique.sh
diff --git a/make/lsGL23toGL2ES1_commons.sh b/make/scripts/lsGL23toGL2ES1_commons.sh
index 83a543b3c..83a543b3c 100644
--- a/make/lsGL23toGL2ES1_commons.sh
+++ b/make/scripts/lsGL23toGL2ES1_commons.sh
diff --git a/make/lsGLES2toGL3_commons.sh b/make/scripts/lsGLES2toGL3_commons.sh
index d271b7ea2..d271b7ea2 100644
--- a/make/lsGLES2toGL3_commons.sh
+++ b/make/scripts/lsGLES2toGL3_commons.sh
diff --git a/make/lsGLtoES1ES2_commons.sh b/make/scripts/lsGLtoES1ES2_commons.sh
index 21efb6549..21efb6549 100644
--- a/make/lsGLtoES1ES2_commons.sh
+++ b/make/scripts/lsGLtoES1ES2_commons.sh
diff --git a/make/lsGLtoES1_commons.sh b/make/scripts/lsGLtoES1_commons.sh
index e8a370acb..e8a370acb 100644
--- a/make/lsGLtoES1_commons.sh
+++ b/make/scripts/lsGLtoES1_commons.sh
diff --git a/make/lsGLtoES2_commons.sh b/make/scripts/lsGLtoES2_commons.sh
index bbd0e239c..bbd0e239c 100644
--- a/make/lsGLtoES2_commons.sh
+++ b/make/scripts/lsGLtoES2_commons.sh
diff --git a/make/lsGLtoGL3_commons.sh b/make/scripts/lsGLtoGL3_commons.sh
index 44cc34ccd..44cc34ccd 100644
--- a/make/lsGLtoGL3_commons.sh
+++ b/make/scripts/lsGLtoGL3_commons.sh
diff --git a/make/lstjars.sh b/make/scripts/lstjars.sh
index 3837be5e3..3837be5e3 100644
--- a/make/lstjars.sh
+++ b/make/scripts/lstjars.sh
diff --git a/make/scripts/rsync2here.sh b/make/scripts/rsync2here.sh
new file mode 100755
index 000000000..958fccf7f
--- /dev/null
+++ b/make/scripts/rsync2here.sh
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+# USESSH="-e ssh"
+
[email protected]::PROJECTS
+#DEST=/usr/local/projects/JOGL
+DEST=/cygdrive/c/JOGL
+
+function my_rsync()
+{
+    # rsync $USESSH -av --perms --delete-after --exclude 'build*/' $SOURCE/JOGL/$1 $2
+    rsync $USESSH -av --perms --delete-after --exclude 'build*/' $SOURCE/JOGL/$1 $2
+}
+
+function do_rsync()
+{
+    my_rsync gluegen            $DEST/
+    my_rsync jogl               $DEST/
+    my_rsync jogl-demos         $DEST/
+    my_rsync lib                $DEST/
+    my_rsync lib-windows-x86    $DEST/
+    my_rsync lib-linux-x86      $DEST/
+    my_rsync lib-linux-x86_64   $DEST/
+    my_rsync setenv*            $DEST/
+}
+
+do_rsync 2>&1 | tee -a rsync.log
+