Merge branch 'master' of ssh://jogamp.org/srv/scm/jogamp-scripting

19 files changed, 343 insertions, 234 deletions

diff --git a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/jenkins.desktop b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/jenkins.desktop
new file mode 100755
index 0000000..fd5f558
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/jenkins.desktop
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Comment[en_US]=
+Comment=
+Exec=/home/jogamp/jenkins/start-ssh-jenkins-linux.sh
+GenericName[en_US]=jenkins KDE autostart
+GenericName=jenkins KDE autostart
+Icon=exec
+MimeType=
+Name[en_US]=jenkins
+Name=jenkins
+Path=/home/jogamp/jenkins
+StartupNotify=false
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=none
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+X-Ubuntu-Gettext-Domain=desktop_kdebase
diff --git a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh
new file mode 100755
index 0000000..110eb28
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh
@@ -0,0 +1,59 @@
+#! /bin/bash
+
+cd ~/jenkins
+
+scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
+
+function connect_3 {
+  . /opt-share/etc/profile.ant
+  . /opt-linux-x86/etc/profile.jre7
+  . /opt-linux-x86/etc/profile.j2se7
+
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
+  java -version
+  sshpid=
+  while true ; do
+    if [ ! -z "$sshpid" ] ; then
+	kill -9 $sshpid
+    fi
+    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 5703:localhost:5555 -N &
+    sshpid=$!
+    java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-NVFX580-ubuntu10-jogamp-x32-c3d-003/slave-agent.jnlp
+  done
+}
+
+function connect_4 {
+  . /opt-share/etc/profile.ant
+  . /opt-linux-x86_64/etc/profile.jre7
+  . /opt-linux-x86_64/etc/profile.j2se7
+
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
+  java -version
+  sshpid=
+  while true ; do
+    if [ ! -z "$sshpid" ] ; then
+	kill -9 $sshpid
+    fi
+    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 5704:localhost:5555 -N &
+    sshpid=$!
+    java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-NVFX580-ubuntu10-jogamp-x64-c3d-004/slave-agent.jnlp
+  done
+}
+
+
+connect_3 > linux64-NVFX580-ubuntu10-jogamp-x32-c3d-003.log 2>&1 &
+disown $!
+
+connect_4 > linux64-NVFX580-ubuntu10-jogamp-x64-c3d-004.log 2>&1 &
+disown $!
+
diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat
new file mode 100755
index 0000000..b6ddb51
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat
@@ -0,0 +1,5 @@
+@echo off

+c:

+chdir c:\cygwin\bin

+bash --login -c /usr/sbin/sshd

+bash --login -c /usr/sbin/sshd

diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh
new file mode 100644
index 0000000..93a10cf
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+for i in `ps ax | grep ssh | awk ' { print $1 } ' `  ; do kill $i ; done
diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh
new file mode 100755
index 0000000..a146299
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+cd ~/hudson
+
+scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
+
+function connect_1 {
+  sshpid=
+  while true ; do
+    if [ ! -z "$sshpid" ] ; then
+	kill -9 $sshpid
+    fi
+    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 5701:localhost:5555 -N &
+    sshpid=$!
+    ./win64-amd58xx-win7-jogamp-x32-c3d-001.bat
+  done
+}
+
+function connect_2 {
+  sshpid=
+  while true ; do
+    if [ ! -z "$sshpid" ] ; then
+	kill -9 $sshpid
+    fi
+    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 5702:localhost:5555 -N &
+    sshpid=$!
+    ./win64-amd58xx-win7-jogamp-x64-c3d-002.bat
+  done
+}
+
+
+connect_1 > win64-amd58xx-win7-jogamp-x32-c3d-001.log 2>&1 &
+disown $!
+
+connect_2 > win64-amd58xx-win7-jogamp-x64-c3d-002.log 2>&1 &
+disown $!
diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat
new file mode 100755
index 0000000..d1d0ac5
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat
@@ -0,0 +1,21 @@
+set J2RE_HOME=c:\jre1.7.0_25_x32
+set JAVA_HOME=c:\jdk1.7.0_25_x32
+set ANT_PATH=C:\apache-ant-1.8.2
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
+
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
+
+REM    -Dc.compiler.debug=true 
+REM    -DuseOpenMAX=true 
+REM    -DuseKD=true
+REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
+REM    -Dbuild.noarchives=true
+
+java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/win64-amd58xx-win7-jogamp-x32-c3d-001/slave-agent.jnlp
diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat
new file mode 100755
index 0000000..8ce890b
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat
@@ -0,0 +1,21 @@
+set J2RE_HOME=c:\jre1.7.0_25_x64
+set JAVA_HOME=c:\jdk1.7.0_25_x64
+set ANT_PATH=C:\apache-ant-1.8.2
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
+
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
+
+REM    -Dc.compiler.debug=true 
+REM    -DuseOpenMAX=true 
+REM    -DuseKD=true
+REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
+REM    -Dbuild.noarchives=true
+
+java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/win64-amd58xx-win7-jogamp-x64-c3d-002/slave-agent.jnlp
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
index 53f5214..d2e56c3 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
@@ -8,8 +8,15 @@ scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
 
 function connect_1 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86/etc/profile.jre6
-  . /opt-linux-x86/etc/profile.j2se6
+  . /opt-linux-x86/etc/profile.jre7
+  . /opt-linux-x86/etc/profile.j2se7
+
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
   java -version
   sshpid=
   while true ; do
@@ -24,8 +31,15 @@ function connect_1 {
 
 function connect_2 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre6
-  . /opt-linux-x86_64/etc/profile.j2se6
+  . /opt-linux-x86_64/etc/profile.jre7
+  . /opt-linux-x86_64/etc/profile.j2se7
+
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
   java -version
   sshpid=
   while true ; do
@@ -40,8 +54,14 @@ function connect_2 {
 
 function connect_30 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre6
-  . /opt-linux-x86_64/etc/profile.j2se6
+  . /opt-linux-x86_64/etc/profile.jre7
+  . /opt-linux-x86_64/etc/profile.j2se7
+
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
     export NODE_LABEL=label/linux-armv7-img
     HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7
@@ -82,8 +102,14 @@ function connect_30 {
 
 function connect_31 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre6
-  . /opt-linux-x86_64/etc/profile.j2se6
+  . /opt-linux-x86_64/etc/profile.jre7
+  . /opt-linux-x86_64/etc/profile.j2se7
+
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
     export NODE_LABEL=label/linux-armv7hf-img
     HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7hf
@@ -124,6 +150,10 @@ function connect_31 {
 
 
 function connect_40 {
+  . /opt-share/etc/profile.ant
+  . /opt-linux-x86_64/etc/profile.jre7
+  . /opt-linux-x86_64/etc/profile.j2se7
+
     export NODE_LABEL=label/android-armv7-img
     HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7_Android
     JENKINS_WS=$HOST_ROOT/workspace
@@ -153,6 +183,8 @@ function connect_40 {
     export TARGET_LEVEL=1.6
     export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
 
+    export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
     #export GCC_VERSION=4.4.3
     export GCC_VERSION=4.7
     HOST_ARCH=linux-x86
@@ -163,7 +195,7 @@ function connect_40 {
 
     # Need to add toolchain bins to the PATH. 
     export PATH_VANILLA=$PATH
-    export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$PATH"
+    export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/17.0.0:$PATH"
 
     export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-armv6.xml
     export GLUEGEN_PROPERTIES_FILE=/home/jogamp/android/gluegen.properties # for key signing props
diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins.sh
index a46ea6b..05c1880 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins.sh
@@ -14,6 +14,9 @@ function connect_12 {
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
   export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+  
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
   java -version
   which git
   sshpid=
@@ -35,6 +38,9 @@ function connect_13 {
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
   export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
   java -version
   which git
   sshpid=
diff --git a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris-1.sh b/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris-1.sh
deleted file mode 100755
index 2a5630a..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris-1.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/bash
-
-cd ~/jenkins
-
-rm -f slave.jar
-# wget --no-check-certificate https://jogamp.org/chuck/jnlpJars/slave.jar
-scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
-
-function connect_1 {
-  # solaris-x86_32-nv
-  . /opt-share/etc/profile.ant
-  . /opt-solaris-x86/etc/profile.jre6
-  . /opt-solaris-x86/etc/profile.j2se6
-  java -d32 -version
-  which java
-  sshpid=
-  while true ; do
-    if [ ! -z "$sshpid" ] ; then
-	kill -9 $sshpid
-    fi
-    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6020:localhost:5555 -N &
-    sshpid=$!
-    java -d32 -server -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/solaris-NVQUADRO-solaris10-jogamp-x32-sgothel-020/slave-agent.jnlp
-  done
-}
-
-function connect_2 {
-  # solaris-x86_64-nv
-  . /opt-share/etc/profile.ant
-  . /opt-solaris-x86_64/etc/profile.jre6
-  . /opt-solaris-x86_64/etc/profile.j2se6
-  java -d64 -version
-  sshpid=
-  while true ; do
-    if [ ! -z "$sshpid" ] ; then
-	kill -9 $sshpid
-    fi
-    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6021:localhost:5555 -N &
-    sshpid=$!
-    java -d64 -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/solaris-NVQUADRO-solaris10-jogamp-x64-sgothel-021/slave-agent.jnlp
-  done
-}
-
-connect_1 > solaris-NVQUADRO-solaris10-jogamp-x32-sgothel-020.log 2>&1 &
-disown $!
-
-connect_2 > solaris-NVQUADRO-solaris10-jogamp-x64-sgothel-021.log 2>&1 &
-disown $!
-
diff --git a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh b/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh
index 8d9425b..9f2d4ec 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh
@@ -12,6 +12,13 @@ function connect_1 {
   export PATH=/usr/java/bin:$PATH
   #. /opt-solaris-x86/etc/profile.jre6
   #. /opt-solaris-x86/etc/profile.j2se6
+
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
   java -d32 -version
   which java
   sshpid=
@@ -31,6 +38,13 @@ function connect_2 {
   export PATH=/usr/java/bin/amd64:$PATH
   #. /opt-solaris-x86_64/etc/profile.jre6
   #. /opt-solaris-x86_64/etc/profile.j2se6
+
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+  export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
   java -d64 -version
   sshpid=
   while true ; do
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat
index 57f02d2..b8caa5b 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat
@@ -1,5 +1,5 @@
-set J2RE_HOME=c:\jre1.6.0_35_x32
-set JAVA_HOME=c:\jdk1.6.0_35_x32
+set J2RE_HOME=c:\jre1.7.0_25_x32
+set JAVA_HOME=c:\jdk1.7.0_25_x32
 set ANT_PATH=C:\apache-ant-1.8.2
 set GIT_PATH=C:\cygwin\bin
 set SEVENZIP=C:\Program Files\7-Zip
@@ -9,6 +9,12 @@ set CMAKE_C_COMPILER=c:\mingw\bin\gcc
 
 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
 
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
+
 REM    -Dc.compiler.debug=true 
 REM    -DuseOpenMAX=true 
 REM    -DuseKD=true
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat
index bd95ebe..8947fba 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat
@@ -1,5 +1,5 @@
-set J2RE_HOME=c:\jre1.6.0_35_x64
-set JAVA_HOME=c:\jdk1.6.0_35_x64
+set J2RE_HOME=c:\jre1.7.0_25_x64
+set JAVA_HOME=c:\jdk1.7.0_25_x64
 set ANT_PATH=C:\apache-ant-1.8.2
 set GIT_PATH=C:\cygwin\bin
 set SEVENZIP=C:\Program Files\7-Zip
@@ -9,6 +9,12 @@ set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
 
 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
 
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
+
 REM    -Dc.compiler.debug=true 
 REM    -DuseOpenMAX=true 
 REM    -DuseKD=true
diff --git a/jenkins-server-slave-setup/scripts/jenkins-initd-debian b/jenkins-server-slave-setup/scripts/jenkins-initd-debian
new file mode 100755
index 0000000..5f66d99
--- /dev/null
+++ b/jenkins-server-slave-setup/scripts/jenkins-initd-debian
@@ -0,0 +1,82 @@
+#! /bin/bash
+### BEGIN INIT INFO
+# Provides:          jenkins
+# Required-Start:    $local_fs $remote_fs $network $syslog $time
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Should-Start:      apache2
+# Should-Stop:       
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Jenkins init script.
+# Description:       Init script for Jenkins, a Continuous Integration server.
+### END INIT INFO
+
+#
+# jenkins    Start/Stop the Jenkins Continuous Integration server.
+#
+# chkconfig: 345 91 10
+# description: Jenkins is a Continuous Integration server. \
+# processname: jenkins
+# pidfile: /var/run/jenkins.pid
+
+
+# Source function library.
+. /lib/lsb/init-functions
+
+# Check that networking is up.
+# [ "${NETWORKING}" = "no" ] && exit 0
+
+JENKINS_USER=jogamp_ci
+JENKINS_HOME=/srv/jenkins
+startup=$JENKINS_HOME/scripts/start.jenkins.sh
+shutdown=$JENKINS_HOME/scripts/stop.jenkins.sh
+
+start(){
+ echo -n $"Starting Jenkins service: "
+ su - $JENKINS_USER -c $startup
+ RETVAL=$?
+ echo
+}
+
+stop(){
+ echo -n $"Stopping Jenkins service: " 
+ su - $JENKINS_USER -c $shutdown 
+ RETVAL=$?
+ echo
+}
+
+status(){
+ numproc=`ps -ef | grep jenkins.war | grep -v "grep jenkins.war" | wc -l`
+ if [ $numproc -gt 0 ]; then
+  echo "Jenkins is running..."
+  else
+  echo "Jenkins is stopped..."
+ fi
+}
+
+restart(){
+  stop
+  start
+}
+
+
+# See how we were called.
+case "$1" in
+start)
+ start
+ ;;
+stop)
+ stop
+ ;;
+status)
+ status
+ ;; 
+restart)
+ restart
+ ;;
+*)
+ echo $"Usage: $0 {start|stop|status|restart}"
+ exit 1
+esac
+
+exit 0
diff --git a/jenkins-server-slave-setup/scripts/jenkins-start-rh b/jenkins-server-slave-setup/scripts/jenkins-initd-redhat
index ddeb1e2..6606e94 100755
--- a/jenkins-server-slave-setup/scripts/jenkins-start-rh
+++ b/jenkins-server-slave-setup/scripts/jenkins-initd-redhat
@@ -17,11 +17,11 @@
 # Check that networking is up.
 [ "${NETWORKING}" = "no" ] && exit 0
 
-JENKINS_USER=jogl
+JENKINS_USER=jogamp_ci
 JENKINS_HOME=/srv/jenkins
 startup=$JENKINS_HOME/scripts/start.jenkins.sh
 shutdown=$JENKINS_HOME/scripts/stop.jenkins.sh
-export JAVA_HOME=/opt-linux-x86_64/j2se6
+export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
 
 start(){
  echo -n $"Starting Jenkins service: "
diff --git a/jenkins-server-slave-setup/scripts/jenkins-initd-ubuntu b/jenkins-server-slave-setup/scripts/jenkins-initd-ubuntu
deleted file mode 100755
index cf0d9f4..0000000
--- a/jenkins-server-slave-setup/scripts/jenkins-initd-ubuntu
+++ /dev/null
@@ -1,167 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          jenkins
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      S 0 1 6
-# Short-Description: Jenkins initscript
-# Description:       Jenkins Continuous Integration System
-### END INIT INFO
-
-# Author: Luis Alves <luis DOT alves AT lafaspot DOT com>
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-JENKINS_HOME=/srv/jenkins
-#LOG="$JENKINS_HOME/log/jenkins.log"
-DESC="Jenkins Continous Build Integration"
-CHUID="jenkins:jenkins"
-NAME=jenkins
-DAEMON="/usr/bin/java"
-DAEMON_ARGS="-jar "$JENKINS_HOME/jenkins.war" --httpPort=8080 --prefix=/chuck"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-export JENKINS_HOME
-
-# Exit if the package is not installed
-# [ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-
-pid_of_jenkins() {
-    cat "$PIDFILE"
-}
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-        #[ -e "$LOG" ] && cnt=`wc -l "$LOG" | awk '{ print $1 }'` || cnt=1
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $DAEMON --chuid $CHUID -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-        #while { pid_of_jenkins > /dev/null ; } &&
-        #        ! { tail +$cnt "$LOG" | grep -q 'Winstone Servlet Engine .* running' ; } ; do
-        #      sleep 1
-        #done
-
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  #reload|force-reload)
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:
-
diff --git a/jenkins-server-slave-setup/scripts/jenkins.logrotate b/jenkins-server-slave-setup/scripts/jenkins.logrotate
new file mode 100644
index 0000000..b648fdf
--- /dev/null
+++ b/jenkins-server-slave-setup/scripts/jenkins.logrotate
@@ -0,0 +1,9 @@
+/var/log/jenkins/jenkins.log {
+        weekly
+        copytruncate
+        missingok
+        rotate 52
+        compress
+        delaycompress
+        notifempty
+}
diff --git a/jenkins-server-slave-setup/scripts/start.jenkins.sh b/jenkins-server-slave-setup/scripts/start.jenkins.sh
index cd5187b..cacc638 100755
--- a/jenkins-server-slave-setup/scripts/start.jenkins.sh
+++ b/jenkins-server-slave-setup/scripts/start.jenkins.sh
@@ -2,6 +2,11 @@
 export JENKINS_HOME=/srv/jenkins
 export JENKINS_WAR=$JENKINS_HOME/jenkins.war
 export JENKINS_LOG=$JENKINS_HOME/jenkins.log
+
+#export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
+export JAVA_HOME=/opt-linux-x86_64/jre7
 JAVA=$JAVA_HOME/bin/java
-nohup nice $JAVA -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &
+
+nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &
+# nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=-1 --httpsPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &
 
diff --git a/jenkins-server-slave-setup/scripts/starthudson.sh b/jenkins-server-slave-setup/scripts/starthudson.sh
index 47fcac9..aea50f3 100755
--- a/jenkins-server-slave-setup/scripts/starthudson.sh
+++ b/jenkins-server-slave-setup/scripts/starthudson.sh
@@ -4,7 +4,7 @@ FLAGS="-server -Xms256m -Xmx512m -XX:MaxPermSize=128m -XX:+UseConcMarkSweepGC -X
 HUDSON_HOME=/srv/hudson/config
 export HUDSON_HOME
 
-. /opt-linux-x86_64/etc/profile.jre6
+. /opt-linux-x86_64/etc/profile.jre7
 . /opt-share/etc/profile.ant
 
-/opt-linux-x86_64/jre6/bin/java ${FLAGS} -jar /srv/hudson/hudson.war 2>&1 | tee hudson.log
+/opt-linux-x86_64/jre7/bin/java ${FLAGS} -jar /srv/hudson/hudson.war 2>&1 | tee hudson.log