ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.279 by jsr166, Mon Oct 1 03:04:48 2018 UTC vs.
Revision 1.283 by jsr166, Wed Oct 24 22:31:14 2018 UTC

# Line 398 | Line 398
398      <sequential>
399        <property name="build.main.java"    value="${java@{v}}"/>
400        <property name="build.main.javac"   value="${javac@{v}}"/>
401 <      <!-- Force javadoc version to be at least 10,
402 <           so we can use override-methods=summary -->
401 >      <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402 >      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403        <condition property="build.main.javadoc"
404 <                 value="${javadoc11}"
404 >                 value="${javadoc12}"
405                   else="${javadoc@{v}}">
406 <        <equals arg1="@{v}" arg2="9"/>
406 >        <matches pattern="^(9|10|11)$" string="@{v}"/>
407        </condition>
408      </sequential>
409    </macrodef>
# Line 412 | Line 412
412    <target name="dists"
413            depends="dist, 4jdk8dist"
414            description="Builds all public jars and docs"/>
415 <          <!--
416 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
417 <          -->
415 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
416  
417    <target name="compile"
418            depends="configure-compiler"
# Line 483 | Line 481
481   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482      <javadoc destdir="${docs.dir}"
483               packagenames="none"
484 <             link="${java10.api.url}"
484 >             link="${java11.api.url}"
485               overview="${src.dir}/intro.html"
486               access="${build.javadoc.access}"
487               sourcepath="${src.dir}"
# Line 498 | Line 496
496        <arg value="-XDignore.symbol.file=true"/>
497        <arg value="-html5"/>
498        <arg value="--patch-module=java.base=${src.dir}"/>
499 +      <arg value="--frames"/>
500        <arg value="--override-methods=summary"/>
501        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
502        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 515 | Line 514
514            description="Puts all distributable products in single hierarchy"/>
515  
516  
518  <target name="release"
519          depends="dist"
520          description="Puts entire CVS tree, plus distribution productions, in a jar">
521
522    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
523
524    <jar basedir="${basedir}" destfile="${release.jar}">
525      <!-- <exclude name="build/**"/> -->
526      <exclude name="${release.jar}"/>
527      <exclude name="user.properties"/>
528      <exclude name="etc/notes/**"/>
529      <exclude name="src/emulation/**"/>
530      <exclude name="**/SyntaxTest.java"/>
531      <exclude name="**/SuperfluousAbstract.java"/>
532      <manifest>
533        <attribute name="Built-By" value="${user.name}"/>
534        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
535      </manifest>
536    </jar>
537  </target>
538
539
517    <target name="clean"
518            description="Removes all build products">
519      <delete dir="${build.dir}"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines