From c2cfa56b5041844e675c987b3863f2673da88e5b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 16 Aug 2019 21:57:16 +0200 Subject: Nodes Updated: openjdk11 for java8 + android-API-24 baseline --- .../profile.amd64.j2se8 | 16 ++++++++++++++++ .../start-ssh-jenkins-012.sh | 8 ++++---- .../start-ssh-jenkins-013.sh | 8 ++++---- .../win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat | 12 ++++++------ .../win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat | 12 ++++++------ 5 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8 diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8 new file mode 100644 index 0000000..e5c2cd1 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8 @@ -0,0 +1,16 @@ +unset NS_JAVA +unset DYN_JAVA +unset JAVA_ROOT +unset JAVA_BINDIR +unset JDK_HOME +unset JAVA_COMPILER +unset TYA_LOGFILE + +# export LIBXCB_ALLOW_SLOPPY_LOCK=1 + +export CLASSPATH=. + +#export JAVA_HOME=/opt-linux-x86_64/j2se8 +export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 + +export PATH=$JAVA_HOME/bin:$PATH diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh index 1708195..6795cbd 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh @@ -6,12 +6,12 @@ cd /Users/jogamp/jenkins curl -o agent-012.jar https://jogamp.org/chuck/jnlpJars/agent.jar . ./profile.ant -JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version 11` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh index 228531e..a933653 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh @@ -6,12 +6,12 @@ cd /Users/jogamp/jenkins curl -o agent-013.jar https://jogamp.org/chuck/jnlpJars/agent.jar . ./profile.ant -JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version 11` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" 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 4f868fb..386011c 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.8.0_121_x32 -set JAVA_HOME=c:\jdk1.8.0_121_x32 -set ANT_PATH=C:\apache-ant-1.9.4 +set J2RE_HOME=c:\jre-11.0.4+11_x32 +set JAVA_HOME=c:\jdk-11.0.4+11_x32 +set ANT_PATH=C:\apache-ant-1.10.5 set GIT_PATH=C:\cygwin\bin set SEVENZIP=C:\Program Files\7-Zip @@ -9,9 +9,9 @@ set CMAKE_C_COMPILER=c:\mingw\bin\gcc set PATH=%J2RE_HOME%\bin;%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 SOURCE_LEVEL=1.8 +set TARGET_LEVEL=1.8 +set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org 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 77b33a2..db19eca 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.8.0_121_x64 -set JAVA_HOME=c:\jdk1.8.0_121_x64 -set ANT_PATH=C:\apache-ant-1.9.4 +set J2RE_HOME=c:\jre-11.0.4+11_x64 +set JAVA_HOME=c:\jdk-11.0.4+11_x64 +set ANT_PATH=C:\apache-ant-1.10.5 set GIT_PATH=C:\cygwin\bin set SEVENZIP=C:\Program Files\7-Zip @@ -9,9 +9,9 @@ set CMAKE_C_COMPILER=c:\mingw64\bin\gcc set PATH=%J2RE_HOME%\bin;%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 SOURCE_LEVEL=1.8 +set TARGET_LEVEL=1.8 +set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org -- cgit v1.2.3