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

Jump to bottom

windows: bump JDK11 x86 build to use VS2019 #3144

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

windows: bump JDK11 x86 build to use VS2019 #3144

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
13 changes: 1 addition & 12 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 @@ -139,11 +139,7 @@ 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 ]
elif [ "$JAVA_FEATURE_VERSION" -ge 11 ]
then
TOOLCHAIN_VERSION="2019"
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
Expand All @@ -166,13 +162,6 @@ then
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.9.1"
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" -ge 11 ]
then
TOOLCHAIN_VERSION="2019"
Expand Down