Merge branch 'master' of https://github.com/JogAmp/jogamp-scripting

9 files changed, 184 insertions, 22 deletions

diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh
index a592c6d..519ef82 100755
--- a/jenkins-builds/promote-latest-builds.sh
+++ b/jenkins-builds/promote-latest-builds.sh
@@ -34,7 +34,7 @@ logfile=$thisdir/`basename $0 .sh`.log
 archivedir=/srv/www/jogamp.org/deployment/archive/$branch
 rootdir=/srv/www/jogamp.org/deployment/autobuilds/$branch
 
-os_and_archs_minus_one="linux-i586 linux-armv6 linux-armv6hf android-armv6 macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64"
+os_and_archs_minus_one="linux-i586 linux-armv6 linux-armv6hf android-armv6 android-aarch64 macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64"
 masterpick="linux-amd64"
 os_and_archs="$masterpick $os_and_archs_minus_one"
 
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 d2e56c3..769afda 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,8 @@ scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
 
 function connect_1 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86/etc/profile.jre7
-  . /opt-linux-x86/etc/profile.j2se7
+  . /opt-linux-x86/etc/profile.jre8
+  . /opt-linux-x86/etc/profile.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -31,8 +31,8 @@ function connect_1 {
 
 function connect_2 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre7
-  . /opt-linux-x86_64/etc/profile.j2se7
+  . /opt-linux-x86_64/etc/profile.jre8
+  . /opt-linux-x86_64/etc/profile.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -54,8 +54,8 @@ function connect_2 {
 
 function connect_30 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre7
-  . /opt-linux-x86_64/etc/profile.j2se7
+  . /opt-linux-x86_64/etc/profile.jre8
+  . /opt-linux-x86_64/etc/profile.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -102,8 +102,8 @@ function connect_30 {
 
 function connect_31 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre7
-  . /opt-linux-x86_64/etc/profile.j2se7
+  . /opt-linux-x86_64/etc/profile.jre8
+  . /opt-linux-x86_64/etc/profile.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -151,8 +151,8 @@ 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
+  . /opt-linux-x86_64/etc/profile.jre8
+  . /opt-linux-x86_64/etc/profile.j2se8
 
     export NODE_LABEL=label/android-armv7-img
     HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7_Android
@@ -172,11 +172,13 @@ function connect_40 {
     export TARGET_ROOT=/data/projects
     export TARGET_ANT_HOME=/usr/share/ant
 
-    export NDK_ROOT=/opt-linux-x86/android-ndk
+    export NDK_ROOT=/opt-linux-x86_64/android-ndk
     export ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
+    export ANDROID_BUILD_TOOLS_VERSION=21.1.2
 
     echo NDK_ROOT $NDK_ROOT
     echo ANDROID_HOME $ANDROID_HOME
+    echo ANDROID_BUILD_TOOLS_VERSION $ANDROID_BUILD_TOOLS_VERSION
 
     export ANDROID_VERSION=9
     export SOURCE_LEVEL=1.6
@@ -186,16 +188,17 @@ function connect_40 {
     export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
     #export GCC_VERSION=4.4.3
-    export GCC_VERSION=4.7
-    HOST_ARCH=linux-x86
+    #export GCC_VERSION=4.7
+    export GCC_VERSION=4.8
+    HOST_ARCH=linux-x86_64
     export TARGET_TRIPLE=arm-linux-androideabi
 
     export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
     export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm
 
     # Need to add toolchain bins to the PATH. 
+    export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
     export PATH_VANILLA=$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
@@ -216,6 +219,73 @@ function connect_40 {
 
 }
 
+function connect_41 {
+  . /opt-share/etc/profile.ant
+  . /opt-linux-x86_64/etc/profile.jre8
+  . /opt-linux-x86_64/etc/profile.j2se8
+
+    export NODE_LABEL=label/android-aarch64
+    HOST_ROOT=/home/jogamp/JogAmpSlaveArm64_Android
+    JENKINS_WS=$HOST_ROOT/workspace
+
+    export HOST_UID=jogamp
+    # jogamp02 - 10.1.0.122
+    export HOST_IP=10.1.0.122
+    export HOST_RSYNC_ROOT=ROOTDIR/$JENKINS_WS
+
+    export TARGET_UID=jogamp
+    export TARGET_IP=panda02
+    #export TARGET_IP=jautab03
+    #export TARGET_IP=jauphone04
+    export TARGET_ADB_PORT=5555
+    # needs executable bit (probably su)
+    export TARGET_ROOT=/data/projects
+    export TARGET_ANT_HOME=/usr/share/ant
+
+    export NDK_ROOT=/opt-linux-x86_64/android-ndk
+    export ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
+    export ANDROID_BUILD_TOOLS_VERSION=21.1.2
+
+    echo NDK_ROOT $NDK_ROOT
+    echo ANDROID_HOME $ANDROID_HOME
+    echo ANDROID_BUILD_TOOLS_VERSION $ANDROID_BUILD_TOOLS_VERSION
+
+    export ANDROID_VERSION=21
+    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 GCC_VERSION=4.9
+    HOST_ARCH=linux-x86_64
+    export TARGET_TRIPLE=aarch64-linux-android
+
+    export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
+    export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm64
+
+    # Need to add toolchain bins to the PATH. 
+    export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
+    export PATH_VANILLA=$PATH
+
+    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-aarch64.xml
+    export GLUEGEN_PROPERTIES_FILE=/home/jogamp/android/gluegen.properties # for key signing props
+
+    #export JUNIT_DISABLED="true"
+    #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
+
+  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 6041:localhost:5555 -N &
+    sshpid=$!
+    java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/androidArm64-jogamp-aarch64-sgothel-041/slave-agent.jnlp
+  done
+}
+
 connect_1 > linux64-AMD58xx-debian7-jogamp-x32-sgothel-001.log 2>&1 &
 disown $!
 
@@ -231,3 +301,6 @@ disown $!
 connect_40 > androidARMv7-jogamp-arm32-sgothel-040.log 2>&1 &
 disown $!
 
+connect_41 > androidArm64-jogamp-aarch64-sgothel-041.log 2>&1 &
+disown $!
+
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 05c1880..3434d8c 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
@@ -32,7 +32,7 @@ function connect_12 {
 
 function connect_13 {
   . /opt-share/etc/profile.ant
-  JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+  JAVA_HOME=`/usr/libexec/java_home -version 1.8`
   PATH=$JAVA_HOME/bin:$PATH
   export JAVA_HOME PATH
   export SOURCE_LEVEL=1.6
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/Cygwin-sshd-jenkins.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/Cygwin-sshd-jenkins.bat
new file mode 100755
index 0000000..dc406e2
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/Cygwin-sshd-jenkins.bat
@@ -0,0 +1,4 @@
+@echo off

+c:

+chdir c:\cygwin\bin

+bash --login -c "/usr/sbin/sshd ; /home/jogamp/jenkins/start-ssh-jenkins.sh"
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/start-ssh-jenkins.sh
new file mode 100755
index 0000000..45b34ee
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/start-ssh-jenkins.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+cd ~/jenkins
+
+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 6014:localhost:5555 -N &
+    sshpid=$!
+    ./win64-intelhd-win8-jogamp-x32-sgothel-014.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 6015:localhost:5555 -N &
+    sshpid=$!
+    ./win64-intelhd-win8-jogamp-x64-sgothel-015.bat
+  done
+}
+
+
+connect_1 > win64-intelhd-win8-jogamp-x32-sgothel-014.log 2>&1 &
+disown $!
+
+connect_2 > win64-intelhd-win8-jogamp-x64-sgothel-015.log 2>&1 &
+disown $!
+
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x32-sgothel-014.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x32-sgothel-014.bat
new file mode 100755
index 0000000..df33bb5
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x32-sgothel-014.bat
@@ -0,0 +1,24 @@
+set J2RE_HOME=c:\jre1.8.0_20_x32
+set JAVA_HOME=c:\jdk1.8.0_20_x32
+set ANT_PATH=C:\apache-ant-1.9.4
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
+
+set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+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
+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-intelhd-win8-jogamp-x32-sgothel-014/slave-agent.jnlp
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x64-sgothel-015.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x64-sgothel-015.bat
new file mode 100755
index 0000000..dd6abb9
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x64-sgothel-015.bat
@@ -0,0 +1,24 @@
+set J2RE_HOME=c:\jre1.8.0_20_x64
+set JAVA_HOME=c:\jdk1.8.0_20_x64
+set ANT_PATH=C:\apache-ant-1.9.4
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
+
+set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+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
+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-intelhd-win8-jogamp-x64-sgothel-015/slave-agent.jnlp
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 2e1e938..c243b5a 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,6 +1,6 @@
-set J2RE_HOME=c:\jre1.7.0_45_x32
-set JAVA_HOME=c:\jdk1.7.0_45_x32
-set ANT_PATH=C:\apache-ant-1.8.2
+set J2RE_HOME=c:\jre1.8.0_20_x32
+set JAVA_HOME=c:\jdk1.8.0_20_x32
+set ANT_PATH=C:\apache-ant-1.9.4
 set GIT_PATH=C:\cygwin\bin
 set SEVENZIP=C:\Program Files\7-Zip
 
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 671a310..b111b52 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,6 +1,6 @@
-set J2RE_HOME=c:\jre1.7.0_45_x64
-set JAVA_HOME=c:\jdk1.7.0_45_x64
-set ANT_PATH=C:\apache-ant-1.8.2
+set J2RE_HOME=c:\jre1.8.0_20_x64
+set JAVA_HOME=c:\jdk1.8.0_20_x64
+set ANT_PATH=C:\apache-ant-1.9.4
 set GIT_PATH=C:\cygwin\bin
 set SEVENZIP=C:\Program Files\7-Zip