Skip to content

Use bundled jdk to compile #1856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FreddieAkeroyd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use bundled jdk to compile #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions build/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
Comment thread
FreddieAkeroyd marked this conversation as resolved.

REM temporarily disable checks as workaround for JDK CEN header issue
set "JAVA_TOOL_OPTIONS=-Djdk.util.zip.disableZip64ExtraFieldValidation=true"
Expand Down
4 changes: 3 additions & 1 deletion build/build_script_generator.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions build/jenkins_build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
3 changes: 0 additions & 3 deletions build/jenkins_build_script_generator.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down