Skip to content

Commit ead463b

Browse files
SehrishHussainSehrishHussain
authored
Merge branch 'adoptium:master' into master
2 parents 6fdc0f5 + ac72d43 commit ead463b

File tree

17 files changed

+669
-714
lines changed

17 files changed

+669
-714
lines changed

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,20 @@ disable the default fB--depth=1 shallow cloning of git repo(s).
160160

161161
-f, --freetype-dir
162162
specify the location of an existing FreeType library.
163-
This is typically used in conjunction with -F.
163+
Do not use with -F, as it would invalidate this switch.
164+
DEPRECATED: Only makes sense for JDKs without a bundled freetype
164165

165166
--freetype-build-param <parameter>
166167
specify any special freetype build parameters (required for some Operating Systems).
168+
DEPRECATED: Only makes sense for JDKs without a bundled freetype
167169

168170
--freetype-version <version>
169171
specify the version of freetype you are building.
172+
DEPRECATED: Only makes sense for JDKs without a bundled freetype
170173

171174
-F, --skip-freetype
172-
skip building Freetype automatically.
173-
This is typically used in conjunction with -f.
175+
set JDK to link against system freetype,
176+
instead of building bundled version
174177

175178
-h, --help
176179
print the man page.

‎build-farm/platform-specific-configurations/aix.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ then
5757
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-extra-ldflags=-lpthread --with-extra-cflags=-lpthread --with-extra-cxxflags=-lpthread"
5858
fi
5959

60-
if [[ "$JAVA_FEATURE_VERSION" -ge 21 ]]; then
61-
# jdk-21+ uses "bundled" FreeType
62-
export BUILD_ARGS="${BUILD_ARGS} --freetype-dir bundled"
63-
else
64-
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
65-
fi
66-
6760
if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then
6861
export LDR_CNTRL=MAXDATA=0x80000000
6962
fi

‎build-farm/platform-specific-configurations/alpine-linux.sh‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@ fi
2626
# ccache seems flaky on alpine
2727
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
2828

29-
if [[ "$JAVA_FEATURE_VERSION" -ge 21 ]]; then
30-
# jdk-21+ uses "bundled" FreeType
31-
export BUILD_ARGS="${BUILD_ARGS} --freetype-dir bundled"
32-
else
33-
# We don't bundle freetype on alpine anymore, and expect the user to have it.
34-
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
35-
fi
36-
3729
## This affects Alpine docker images and also evaluation pipelines
3830
if [ "$(pwd | wc -c)" -gt 83 ]; then
3931
# Use /tmp for alpine in preference to $HOME as Alpine fails gpg operation if PWD > 83 characters

‎build-farm/platform-specific-configurations/linux.sh‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1818
source "$SCRIPT_DIR/../../sbin/common/constants.sh"
1919
source "$SCRIPT_DIR/../../sbin/common/downloaders.sh"
2020

21-
if [[ "$JAVA_FEATURE_VERSION" -ge 21 ]]; then
22-
# jdk-21+ uses "bundled" FreeType
23-
export BUILD_ARGS="${BUILD_ARGS} --freetype-dir bundled"
24-
else
25-
# Bundling our own freetype can cause problems, so we skip that on linux.
26-
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
27-
fi
28-
2921
## This affects Alpine docker images and also evaluation pipelines
3022
if [ "$(pwd | wc -c)" -gt 83 ]; then
3123
# Use /tmp for alpine in preference to $HOME as Alpine fails gpg operation if PWD > 83 characters

‎build-farm/platform-specific-configurations/mac.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ then
4545
fi
4646
if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then
4747
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling"
48-
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
4948
fi
5049
else
5150
if [[ "$JAVA_FEATURE_VERSION" -ge 11 ]]; then
@@ -76,10 +75,6 @@ else
7675
fi
7776
fi
7877

79-
if [[ "$JAVA_FEATURE_VERSION" -ge 21 ]]; then
80-
# jdk-21+ uses "bundled" FreeType
81-
export BUILD_ARGS="${BUILD_ARGS} --freetype-dir bundled"
82-
fi
8378

8479
# The configure option '--with-macosx-codesign-identity' is supported in JDK8 OpenJ9 and JDK11 and JDK14+
8580
if [[ ( "$JAVA_FEATURE_VERSION" -eq 11 ) || ( "$JAVA_FEATURE_VERSION" -ge 14 ) ]]

‎build-farm/platform-specific-configurations/solaris.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1717
# shellcheck source=sbin/common/constants.sh
1818
source "$SCRIPT_DIR/../../sbin/common/constants.sh"
1919

20-
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype --make-args SHELL=/bin/bash"
20+
export BUILD_ARGS="${BUILD_ARGS} --make-args SHELL=/bin/bash"
2121

2222
if [ "${ARCHITECTURE}" == "x64" ]; then
2323
export CUPS="--with-cups=/opt/sfw/cups"

‎build-farm/platform-specific-configurations/windows.sh‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ then
6868
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling"
6969
if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ]
7070
then
71-
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
7271
# https://github.com/adoptium/temurin-build/issues/243
7372
export INCLUDE="C:\Program Files\Debugging Tools for Windows (x64)\sdk\inc;$INCLUDE"
7473
export PATH="/c/cygwin64/bin:/usr/bin:$PATH"
@@ -85,7 +84,6 @@ then
8584
else
8685
if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ]
8786
then
88-
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
8987
export PATH="/cygdrive/c/openjdk/make-3.82/:$PATH"
9088
elif [ "${JAVA_TO_BUILD}" == "${JDK11_VERSION}" ]
9189
then
@@ -112,19 +110,6 @@ then
112110
then
113111
export INCLUDE="C:\Program Files\Debugging Tools for Windows (x64)\sdk\inc;$INCLUDE"
114112
export PATH="$PATH:/c/cygwin64/bin"
115-
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
116-
elif [ "${JAVA_TO_BUILD}" == "${JDK9_VERSION}" ]
117-
then
118-
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
119-
elif [ "${JAVA_TO_BUILD}" == "${JDK10_VERSION}" ]
120-
then
121-
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
122-
elif [ "$JAVA_FEATURE_VERSION" -lt 19 ]
123-
then
124-
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
125-
elif [ "$JAVA_FEATURE_VERSION" -ge 19 ]
126-
then
127-
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
128113
fi
129114

130115
CUDA_VERSION=9.1

‎cyclonedx-lib/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
<arg value="--name"/>
381381
<arg value="makejdk_any_platform_args"/>
382382
<arg value="--value"/>
383-
<arg value="--clean-git-repo --jdk-boot-dir /usr/lib/jvm/jdk-16 --configure-args --disable-warnings-as-errors --enable-ccache --enable-dtrace --target-file-name OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz --release --clean-libs --tag jdk-17+35_adopt --skip-freetype --use-jep319-certs --create-debug-image --build-variant hotspot jdk17"/>
383+
<arg value="--clean-git-repo --jdk-boot-dir /usr/lib/jvm/jdk-16 --configure-args --disable-warnings-as-errors --enable-ccache --enable-dtrace --target-file-name OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz --release --clean-libs --tag jdk-17+35_adopt --use-jep319-certs --create-debug-image --build-variant hotspot jdk17"/>
384384
<arg value="--jsonFile"/>
385385
<arg value="${testSBOMFile}"/>
386386
</java>
@@ -768,7 +768,7 @@
768768
<arg value="--name"/>
769769
<arg value="makejdk_any_platform_args"/>
770770
<arg value="--value"/>
771-
<arg value="--clean-git-repo --jdk-boot-dir /usr/lib/jvm/jdk-16 --configure-args --disable-warnings-as-errors --enable-ccache --enable-dtrace --target-file-name OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz --release --clean-libs --tag jdk-17+35_adopt --skip-freetype --use-jep319-certs --create-debug-image --build-variant hotspot jdk17"/>
771+
<arg value="--clean-git-repo --jdk-boot-dir /usr/lib/jvm/jdk-16 --configure-args --disable-warnings-as-errors --enable-ccache --enable-dtrace --target-file-name OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz --release --clean-libs --tag jdk-17+35_adopt --use-jep319-certs --create-debug-image --build-variant hotspot jdk17"/>
772772
<arg value="--xmlFile"/>
773773
<arg value="${testSBOMFile_xml}"/>
774774
</java>

‎makejdk-any-platform.1‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,20 @@ disable the default \fB--depth=1\fR shallow cloning of git repo(s).
115115
.TP
116116
.BR \-f ", " \-\-freetype-dir " " \fI<path>\fR
117117
specify the location of an existing FreeType library.
118-
This is typically used in conjunction with \fB<-F>\fR.
118+
Do not use with \fB<-F>\fR, as it would invalidate this switch.
119+
DEPRECATED: Only makes sense for JDKs without a bundled freetype
119120
.TP
120121
.BR \-\-freetype-build-param " " \fI<parameter>\fR
121122
specify any special freetype build parameters (required for some OS's).
123+
DEPRECATED: Only makes sense for JDKs without a bundled freetype
122124
.TP
123125
.BR \-\-freetype-version " " \fI<version>\fR
124126
specify the version of freetype you are building.
127+
DEPRECATED: Only makes sense for JDKs without a bundled freetype
125128
.TP
126129
.BR \-F ", " \-\-skip-freetype
127-
skip building Freetype automatically.
128-
This is typically used in conjunction with \fB<-f>\fR.
130+
set JDK to link against system freetype,
131+
instead of building the bundled version
129132
.TP
130133
.BR \-h ", " \-\-help
131134
print this help.

‎sbin/build.sh‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -640,22 +640,34 @@ configureAlsaLocation() {
640640
fi
641641
}
642642

643+
setBundledFreeType() {
644+
echo "Freetype set from bundled in jdk"
645+
freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-bundled}
646+
}
647+
648+
setFreeTypeFromExternalSrcs() {
649+
echo "Freetype set from local sources"
650+
addConfigureArg "--with-freetype-src=" "${BUILD_CONFIG[WORKSPACE_DIR]}/libs/freetype"
651+
}
652+
653+
setFreeTypeFromInstalled() {
654+
echo "Freetype set from installed binary"
655+
freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-"${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/installedfreetype"}
656+
}
657+
643658
configureFreetypeLocation() {
644659
if [[ ! "${CONFIGURE_ARGS}" =~ "--with-freetype" ]]; then
645660
if [[ "${BUILD_CONFIG[FREETYPE]}" == "true" ]]; then
646661
local freetypeDir="${BUILD_CONFIG[FREETYPE_DIRECTORY]}"
647-
if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
648-
case "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" in
649-
jdk8* | jdk9* | jdk10*) addConfigureArg "--with-freetype-src=" "${BUILD_CONFIG[WORKSPACE_DIR]}/libs/freetype" ;;
650-
*) freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-bundled} ;;
651-
esac
662+
if isFreeTypeInSources ; then
663+
setBundledFreeType
652664
else
653-
case "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" in
654-
jdk8* | jdk9* | jdk10*) freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-"${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/installedfreetype"} ;;
655-
*) freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-bundled} ;;
656-
esac
665+
if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
666+
setFreeTypeFromExternalSrcs
667+
else
668+
setFreeTypeFromInstalled
669+
fi
657670
fi
658-
659671
if [[ -n "$freetypeDir" ]]; then
660672
echo "setting freetype dir to ${freetypeDir}"
661673
addConfigureArg "--with-freetype=" "${freetypeDir}"

0 commit comments

Comments
 (0)