Skip to content
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

Use VS 2022 by default for all JDK versions + skip freetype patching #3907

Merged
merged 3 commits into from
Aug 13, 2024
Merged

Use VS 2022 by default for all JDK versions + skip freetype patching #3907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
275de87
Use Visual Studio 2022 by default for all JDK versions and skip freet…
sxa Aug 7, 2024
02c3bd9
Default to VS2022 for OpenJ9 too
sxa Aug 8, 2024
2a9d044
Remove jdk8u on windows for now
sxa Aug 9, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-2022]
version: [jdk8u, jdk11u, jdk17u, jdk]
version: [jdk11u, jdk17u, jdk]
variant: [temurin]

env:
Expand Down
18 changes: 1 addition & 17 deletions build-farm/platform-specific-configurations/windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export ALLOW_DOWNLOADS=true
export LANG=C
export OPENJ9_NASM_VERSION=2.13.03

TOOLCHAIN_VERSION=""
TOOLCHAIN_VERSION="2022"

if [ "$ARCHITECTURE" == "aarch64" ]; then
# Windows aarch64 cross compiles requires same version boot jdk
Expand Down Expand Up @@ -72,7 +72,6 @@ then
# https://github.com/adoptium/temurin-build/issues/243
export INCLUDE="C:\Program Files\Debugging Tools for Windows (x64)\sdk\inc;$INCLUDE"
export PATH="/c/cygwin64/bin:/usr/bin:$PATH"
TOOLCHAIN_VERSION="2017"
elif [ "${JAVA_TO_BUILD}" == "${JDK11_VERSION}" ]
then
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-freemarker-jar=/cygdrive/c/openjdk/freemarker.jar"
Expand All @@ -86,20 +85,16 @@ then
else
if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ]
then
TOOLCHAIN_VERSION="2013"
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
export PATH="/cygdrive/c/openjdk/make-3.82/:$PATH"
elif [ "${JAVA_TO_BUILD}" == "${JDK11_VERSION}" ]
then
export TOOLCHAIN_VERSION="2017"
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
elif [ "$JAVA_FEATURE_VERSION" -gt 11 ] && [ "$JAVA_FEATURE_VERSION" -lt 21 ]
then
TOOLCHAIN_VERSION="2019"
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
elif [ "$JAVA_FEATURE_VERSION" -ge 21 ]
then
TOOLCHAIN_VERSION="2022"
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
fi
fi
Expand All @@ -118,21 +113,17 @@ then
export INCLUDE="C:\Program Files\Debugging Tools for Windows (x64)\sdk\inc;$INCLUDE"
export PATH="$PATH:/c/cygwin64/bin"
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
TOOLCHAIN_VERSION="2017"
elif [ "${JAVA_TO_BUILD}" == "${JDK9_VERSION}" ]
then
TOOLCHAIN_VERSION="2013"
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
elif [ "${JAVA_TO_BUILD}" == "${JDK10_VERSION}" ]
then
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
elif [ "$JAVA_FEATURE_VERSION" -lt 19 ]
then
TOOLCHAIN_VERSION="2019"
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
elif [ "$JAVA_FEATURE_VERSION" -ge 19 ]
then
TOOLCHAIN_VERSION="2022"
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
fi

Expand All @@ -159,18 +150,11 @@ then
# NASM required for OpenSSL support as per #604
export PATH="/cygdrive/c/Program Files/LLVM/bin:/usr/bin:/cygdrive/c/openjdk/nasm-$OPENJ9_NASM_VERSION:$PATH"
else
TOOLCHAIN_VERSION="2017"
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ]
then
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 39ce3ac499d4cd7371031a062f410953c8ecce29" # 2.8.1
export PATH="/cygdrive/c/openjdk/make-3.82/:$PATH"
elif [ "$JAVA_FEATURE_VERSION" -ge 11 ] && [ "$JAVA_FEATURE_VERSION" -lt 21 ]
then
TOOLCHAIN_VERSION="2019"
elif [ "$JAVA_FEATURE_VERSION" -ge 21 ]
then
TOOLCHAIN_VERSION="2022"
fi
fi

Expand Down
5 changes: 4 additions & 1 deletion sbin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2421,7 +2421,10 @@ configureWorkspace
echo "build.sh : $(date +%T) : Initiating build ..."
getOpenJDKUpdateAndBuildVersion
if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
patchFreetypeWindows
# Not required for VS2022 and later which we are defaulting to
if [[ "${CONFIGURE_ARGS}" =~ "--with-toolchain-version=201" ]]; then
patchFreetypeWindows
fi
fi
configureCommandParameters
buildTemplatedFile
Expand Down
Loading