diff options
| author | Sven Gothel <[email protected]> | 2019-04-03 10:38:13 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-03 10:38:13 +0200 |
| commit | 9011a5d528d4b6dc09fd8cc6d92ff8dd582be197 (patch) | |
| tree | 9d265c686395f5fd3e179a9dc8142d0a55a2c326 | |
| parent | f8e7115322ac11784cf4457240c63c677348a70e (diff) | |
Windows note 10/11: Revert AdoptOpenJDK usage for now
Was commit f8e7115322ac11784cf4457240c63c677348a70e
(OpenJFX build injection didn't work)
2 files changed, 6 insertions, 6 deletions
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 13655e6..4f868fb 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:\jre8u202-b08_x32 -set JAVA_HOME=c:\jdk8u202-b08_x32 +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 GIT_PATH=C:\cygwin\bin set SEVENZIP=C:\Program Files\7-Zip @@ -7,7 +7,7 @@ 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 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 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 67e01f8..77b33a2 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:\jre8u202-b08_x64 -set JAVA_HOME=c:\jdk8u202-b08_x64 +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 GIT_PATH=C:\cygwin\bin set SEVENZIP=C:\Program Files\7-Zip @@ -7,7 +7,7 @@ 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 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 |