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.

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

build: fix and update autoconfigure mechanism #696

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,15 @@ JVM System Properties
<arg value="openjdk22"/>
</exec>
</target>


<target name="abcl.properties.autoconfigure.openjdk.23">
<exec executable="/usr/bin/env">
<arg value="bash"/>
<arg value="ci/create-abcl-properties.bash"/>
<arg value="openjdk23"/>
</exec>
</target>

<import file="etc/ant/netbeans-build.xml"
optional="true"/>
<import file="etc/ant/build-snapshot.xml"
Expand Down
14 changes: 8 additions & 6 deletions ci/create-abcl-properties.bash
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ echo "Configuring for $jdk from <${prop_in}>."

# Unused
# zgc="-XX:+UnlockExperimentalVMOptions -XX:+UseZGC -Xmx<size> -Xlog:gc"
opens="--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED"
opens="--add-opens java.base/sun.nio.ch=ALL-UNNAMED\
--add-opens java.base/java.io=ALL-UNNAMED\
--add-opens java.base/java.lang=ALL-UNNAMED"

abcl_javac_source=1.8
case $jdk in
Expand Down Expand Up @@ -73,24 +75,24 @@ case $jdk in
ant_build_javac_target=18
ant_build_javac_source=1.8
;;
19:openjdk19)
19|openjdk19)
options="-XX:CompileThreshold=10 ${opens}"
ant_build_javac_target=19
ant_build_javac_source=1.8
;;
21:openjdk21)
21|openjdk21)
options="-XX:CompileThreshold=10 ${opens}"
ant_build_javac_target=21
ant_build_javac_source=1.8
;;
22:openjdk19)
22|openjdk22)
options="-XX:CompileThreshold=10 ${opens}"
ant_build_javac_target=22
ant_build_javac_source=1.8
;;
*)
23|openjdk23|*)
options="-XX:CompileThreshold=10 ${opens}"
ant_build_javac_target=19
ant_build_javac_target=23
ant_build_javac_source=1.8
;;
esac
Expand Down