From aa8a6481d77ef9076a153f461c73d493fd25da33 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Tue, 23 Jun 2026 23:25:22 +0100 Subject: [PATCH] Use bundled jdk to compile --- build/build.bat | 6 ++++-- build/build_script_generator.bat | 4 +++- build/jenkins_build.bat | 3 --- build/jenkins_build_script_generator.bat | 3 --- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/build/build.bat b/build/build.bat index 7dd4f5f6a1..16240c273d 100644 --- a/build/build.bat +++ b/build/build.bat @@ -23,9 +23,11 @@ if %errcode% GEQ 4 ( call copy_in_maven.bat if %errorlevel% neq 0 exit /b %errorlevel% -set "PATH=%PATH%;%~dp0maven\bin" +set "M2=%~dp0maven\bin" +set "PATH=%M2%;%PATH%" -SET "JAVA_HOME=%~dp0jdk" +SET "JAVA_HOME=%LOCAL_JRE_LOCATION%" +set "PATH=%JAVA_HOME%\bin;%PATH%" REM temporarily disable checks as workaround for JDK CEN header issue set "JAVA_TOOL_OPTIONS=-Djdk.util.zip.disableZip64ExtraFieldValidation=true" diff --git a/build/build_script_generator.bat b/build/build_script_generator.bat index a735c08d53..642862b28c 100644 --- a/build/build_script_generator.bat +++ b/build/build_script_generator.bat @@ -19,9 +19,11 @@ if %errcode% GEQ 4 ( call copy_in_maven.bat if %errorlevel% neq 0 exit /b %errorlevel% -set "PATH=%PATH%;%~dp0maven\bin" +set "M2=%~dp0maven\bin" +set "PATH=%M2%;%PATH%" SET "JAVA_HOME=%LOCAL_JRE_LOCATION%" +set "PATH=%JAVA_HOME%\bin;%PATH%" REM temporarily disable checks as workaround for JDK CEN header issue set "JAVA_TOOL_OPTIONS=-Djdk.util.zip.disableZip64ExtraFieldValidation=true" diff --git a/build/jenkins_build.bat b/build/jenkins_build.bat index c5fb4b1ba0..c25c2176b9 100644 --- a/build/jenkins_build.bat +++ b/build/jenkins_build.bat @@ -3,12 +3,9 @@ setlocal enabledelayedexpansion set BASEDIR=%~dp0 -set M2=%MAVEN%bin set PYTHON3=%WORKSPACE%\Python3\python.exe set PYTHON_HOME=%WORKSPACE%\Python3 -set PATH=%M2%;%JAVA_HOME%;%PATH% - if "%IS_E4%" == "YES" ( set BUILT_CLIENT_DIR=base\uk.ac.stfc.isis.ibex.e4.client.product\target\products\ibex.product\win32\win32\x86_64 ) else ( diff --git a/build/jenkins_build_script_generator.bat b/build/jenkins_build_script_generator.bat index adfc84b7e7..7f8e3b03ce 100644 --- a/build/jenkins_build_script_generator.bat +++ b/build/jenkins_build_script_generator.bat @@ -3,12 +3,9 @@ setlocal enabledelayedexpansion set BASEDIR=%~dp0 -set M2=%MAVEN%bin set PYTHON3=%WORKSPACE%\Python3\python.exe set PYTHON_HOME=%WORKSPACE%\Python3 -set PATH=%M2%;%PATH% - set TARGET_DIR=script_generator set MSINAME=ibex_script_generator