From 0d2971512de190e6cb81c6568f0e6698a85d5ee7 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 5 Sep 2023 09:35:38 +0100 Subject: [PATCH] Upgrade jdk-21 Windows builds to use MS VS2022 Signed-off-by: Andrew Leonard --- .../platform-specific-configurations/windows.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/build-farm/platform-specific-configurations/windows.sh b/build-farm/platform-specific-configurations/windows.sh index fab90630e..e41514035 100755 --- a/build-farm/platform-specific-configurations/windows.sh +++ b/build-farm/platform-specific-configurations/windows.sh @@ -142,10 +142,14 @@ then then export TOOLCHAIN_VERSION="2017" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache" - elif [ "$JAVA_FEATURE_VERSION" -gt 11 ] + 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 fi @@ -210,9 +214,12 @@ then 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 ] + 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