Changeset 15281


Ignore:
Timestamp:
05/16/20 06:29:26 (6 months ago)
Author:
Mark Evenson
Message:

build: fix autoconfiguration script

Running the autoconfiguration script now sets both the target and
source options for the java compilation, selecting the maximum target
for compilation platform.

Location:
trunk/abcl/ci
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/ci/create-abcl-properties.bash

    r15259 r15281  
    1919    6|openjdk6)
    2020        options="-d64 -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=1g -XX:+UseConcMarkSweepGC"
    21         abcl_javac_source=1.6
     21        abcl_javac_target=1.6
     22  abcl_javac_source=1.6
    2223        ;;
    2324    7|openjdk7)
    2425  options="-d64 -XX:+UseG1GC"
    25         abcl_javac_source=1.7
     26        abcl_javac_target=1.7
     27  abcl_javac_source=1.7
    2628  ;;
    2729    8|openjdk8)
    2830        options="-XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10"
     31  abcl_javac_target=1.8
     32  abcl_javac_source=1.8
    2933        ;;
    3034    11|openjdk11)
    3135        options="-XX:CompileThreshold=10"
     36  abcl_javac_target=11
     37  abcl_javac_source=1.8
    3238        ;;
    3339    # untested: weakly unsupported
    3440    12|openjdk12)
    3541        options="-XX:CompileThreshold=10"
     42  abcl_javac_target=12
     43  abcl_javac_source=1.8
    3644        ;;
    3745    13|openjdk13)
    3846        options="-XX:CompileThreshold=10"
     47  abcl_javac_target=13
     48  abcl_javac_source=1.8
    3949        ;;
    4050    14|openjdk14)
    4151        options="-XX:CompileThreshold=10 ${zgc}"
     52  abcl_javac_target=14
     53  abcl_javac_source=1.8
    4254        ;;
    4355esac
    4456
    45 cat ${root}/abcl.properties.in | awk -F = -v options="$options" -v source="$abcl_javac_source" '/^java.options/ {print $0 " " options; next}; /^abcl.javac.source/ {print "abcl.javac.source=" source; next}; {print $0}' > ${root}/abcl.properties
     57cat ${root}/abcl.properties.in \
     58    | awk -F = \
     59    -v options="$options" \
     60    -v target="$abcl_javac_target" \
     61    -v source="$abcl_javac_source" \
     62       -f ${DIR}/create-abcl-properties.awk \
     63  > ${root}/abcl.properties
    4664
    4765echo "Finished configuring for $jdk into <${prop_out}>."
Note: See TracChangeset for help on using the changeset viewer.