Changeset 15407 for trunk/abcl/build.xml


Ignore:
Timestamp:
10/14/20 07:07:13 (2 years ago)
Author:
Mark Evenson
Message:

build: make building and running a local ABCL easier

(From a suggestion by Slyrus)

Replace use of abcl.javac.{source,target} with the "magic"
ant.build.javac,{source,target} properties.

Explicitly configure 'abcl.release' target to use openjdk8 compilation.

The Java compilation options are perhaps underspecified in terms of
the target JVM in order to support a developer who simply wants to
compile and run locally with least hassles.

When preparing ABCL binaries for wider distribution, the values of the
abcl.build.target.javac and abcl.build.source.java become more
important.

The 'abcl.properties.autoconfigure.*' targets use the
ci/create-build-properties.bash script to set these options for
various openjdk platforms.

  • * *

build: build the wrapper with the release

N.b. the wrapper is a local artifact, not supposed to be shipped with
the release.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.xml

    r15378 r15407  
    194194    </target>
    195195
    196     <!-- For compiling beyond openjdk11, one needs to increment these values in <file:abcl.properties> -->
    197     <property name="abcl.javac.target"
    198               value="1.6"/>
    199     <property name="abcl.javac.source"
    200               value="1.6"/>
     196    <!-- The Java compilation options are perhaps underspecified in
     197         terms of the target JVM in order to support a developer who
     198         simply wants to compile and run locally with least hassles.
     199   
     200   When preparing ABCL binaries for wider distribution, the
     201   values of the abcl.build.target.javac and
     202   abcl.build.source.java become more important. 
     203
     204         The 'abcl.properties.autoconfigure.*' targets use the
     205         ci/create-build-properties.bash script to set these options
     206         for various openjdk platforms.
     207    -->
    201208
    202209    <target name="abcl.compile.java"
     
    206213      <javac destdir="${build.classes.dir}"
    207214             debug="true"
    208              target="${abcl.javac.target}"
    209              source="${abcl.javac.source}"
    210215             includeantruntime="false"
    211216             encoding="UTF-8"
     
    12191224
    12201225    <target name="abcl.release"
    1221             depends="abcl.clean,abcl.binary.tar,abcl.source.tar,abcl.binary.zip,abcl.source.zip">
     1226            depends="abcl.clean,abcl.properties.autoconfigure.openjdk.8,abcl.binary.tar,abcl.source.tar,abcl.binary.zip,abcl.source.zip,abcl.wrapper">
    12221227      <copy file="${abcl.jar.path}"
    12231228            tofile="${dist.dir}/abcl-${abcl.version}.jar"/>
Note: See TracChangeset for help on using the changeset viewer.