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.280 by jsr166, Sun Oct 7 03:43:04 2018 UTC vs.
Revision 1.286 by jsr166, Wed Nov 21 21:05:59 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if"
2 >  xmlns:if="ant:if"
3    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
# Line 55 | Line 55
55  
56  
57    <!-- Compilation options -->
58  <property name="build.sourcelevel"    value="6"/>
58    <property name="build.debug"          value="true"/>
59    <property name="build.debuglevel"     value="source,lines,vars"/>
60    <property name="build.deprecation"    value="false"/>
# Line 391 | Line 390
390  
391    <!-- Main targets -->
392  
393 +  <!-- Default values: may seem strange ... -->
394 +  <!-- At runtime, target latest LTS, i.e. jdk11 -->
395 +  <!-- But at build time, target jdk9, for maximal binary portability -->
396 +  <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
397    <property name="build.main.java.version" value="11"/>
398 <  <!-- Workaround "no nested properties in ant" -->
399 <  <macrodef name="define-build-main-properties">
400 <    <attribute name="v"/>
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, 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="${javadoc12}"
405 <                 else="${javadoc@{v}}">
406 <        <matches pattern="^(9|10|11)$" string="@{v}"/>
407 <      </condition>
408 <      <property name="build.main.javadoc"   value="${javadoc12}"/>
409 <    </sequential>
410 <  </macrodef>
411 <  <define-build-main-properties v="${build.main.java.version}"/>
398 >  <property name="build.main.java" value="${java11}"/>
399 >  <property name="build.main.javac" value="${javac9}"/>
400 >  <property name="build.main.javadoc" value="${javadoc12}"/>
401  
402    <target name="dists"
403            depends="dist, 4jdk8dist"
404            description="Builds all public jars and docs"/>
405 <          <!--
417 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
418 <          -->
405 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
406  
407    <target name="compile"
408            depends="configure-compiler"
# Line 442 | Line 429
429        <compilerarg value="--patch-module=java.base=${src.dir}"/>
430        <compilerarg value="-Xprefer:source"/>
431        <compilerarg value="-XDignore.symbol.file=true"/>
432 <      <compilerarg value="-Xlint:all"/>
432 >      <compilerarg value="-Xlint:all,-removal"/>
433        <compilerarg line="--doclint-format html5"/>
434        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
435        <compilerarg value="-Werror"/>
# Line 499 | Line 486
486        <arg value="-XDignore.symbol.file=true"/>
487        <arg value="-html5"/>
488        <arg value="--patch-module=java.base=${src.dir}"/>
489 +      <arg value="--frames"/>
490        <arg value="--override-methods=summary"/>
491        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
492        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 516 | Line 504
504            description="Puts all distributable products in single hierarchy"/>
505  
506  
519  <target name="release"
520          depends="dist"
521          description="Puts entire CVS tree, plus distribution productions, in a jar">
522
523    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
524
525    <jar basedir="${basedir}" destfile="${release.jar}">
526      <!-- <exclude name="build/**"/> -->
527      <exclude name="${release.jar}"/>
528      <exclude name="user.properties"/>
529      <exclude name="etc/notes/**"/>
530      <exclude name="src/emulation/**"/>
531      <exclude name="**/SyntaxTest.java"/>
532      <exclude name="**/SuperfluousAbstract.java"/>
533      <manifest>
534        <attribute name="Built-By" value="${user.name}"/>
535        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
536      </manifest>
537    </jar>
538  </target>
539
540
507    <target name="clean"
508            description="Removes all build products">
509      <delete dir="${build.dir}"/>
# Line 609 | Line 575
575            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
576            description="Runs tck and jtreg tests for src/main"/>
577  
578 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
579 <
580 < <!--     <antcall target="jtreg"> -->
615 < <!--       <param name="build.main.java.version" value="8"/> -->
616 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
617 < <!--     </antcall> -->
618 <
619 < <!--   </target> -->
620 <
621 <  <target name="test9101112"
622 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
578 >  <target name="test-version-permutations"
579 >          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
580 >  </target>
581  
582 +  <target name="test9">
583      <antcall target="clean"/>
584 <    <antcall target="test">
584 >    <antcall>
585        <param name="build.main.java.version" value="9"/>
586        <param name="build.main.java" value="${java9}"/>
587        <param name="build.main.javac" value="${javac9}"/>
588 +      <target name="test"/>
589      </antcall>
590 +  </target>
591  
592 +  <target name="test10">
593      <antcall target="clean"/>
594 <    <antcall target="test">
594 >    <antcall>
595        <param name="build.main.java.version" value="10"/>
596        <param name="build.main.java" value="${java10}"/>
597        <param name="build.main.javac" value="${javac10}"/>
598 +      <param name="build.main.javadoc" value="${javadoc10}"/>
599 +      <target name="test"/>
600 +      <target name="docs"/>
601      </antcall>
602 +  </target>
603  
604 +  <target name="test11">
605      <antcall target="clean"/>
606 <    <antcall target="test">
606 >    <antcall>
607        <param name="build.main.java.version" value="11"/>
608        <param name="build.main.java" value="${java11}"/>
609        <param name="build.main.javac" value="${javac11}"/>
610 +      <param name="build.main.javadoc" value="${javadoc11}"/>
611 +      <target name="test"/>
612 +      <target name="docs"/>
613      </antcall>
614 +  </target>
615  
616 +  <target name="test12">
617      <antcall target="clean"/>
618 <    <antcall target="test">
647 <      <param name="build.main.java.version" value="12"/>
648 <      <param name="build.main.java" value="${java12}"/>
649 <      <param name="build.main.javac" value="${javac12}"/>
650 <    </antcall>
651 <    <antcall target="docs">
618 >    <antcall>
619        <param name="build.main.java.version" value="12"/>
620        <param name="build.main.java" value="${java12}"/>
621        <param name="build.main.javac" value="${javac12}"/>
622        <param name="build.main.javadoc" value="${javadoc12}"/>
623 +      <target name="test"/>
624 +      <target name="docs"/>
625      </antcall>
626 +  </target>
627  
628 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
628 >  <target name="test9-11">
629      <antcall target="clean"/>
630 <
630 >    <antcall>
631 >      <param name="build.main.java.version" value="11"/>
632 >      <param name="build.main.java" value="${java11}"/>
633 >      <param name="build.main.javac" value="${javac9}"/>
634 >      <param name="build.main.javadoc" value="${javadoc11}"/>
635 >      <target name="test"/>
636 >      <target name="docs"/>
637 >    </antcall>
638    </target>
639  
640 +  <target name="test9-12">
641 +    <antcall target="clean"/>
642 +    <antcall>
643 +      <param name="build.main.java.version" value="12"/>
644 +      <param name="build.main.java" value="${java12}"/>
645 +      <param name="build.main.javac" value="${javac9}"/>
646 +      <param name="build.main.javadoc" value="${javadoc12}"/>
647 +      <target name="test"/>
648 +      <target name="docs"/>
649 +    </antcall>
650 +  </target>
651  
652  
653    <target name="configure-compiler">
# Line 682 | Line 670
670    </target>
671  
672  
685
686  <!-- Various demos and test programs -->
687
688
689  <!-- description="Benchmark from Doug Lea's AQS paper" -->
690  <target name="loops" depends="configure-compiler">
691
692    <mkdir dir="${build.loops.dir}"/>
693
694    <javac srcdir="${loops.src.dir}"
695          destdir="${build.loops.dir}"
696            debug="${build.debug}"
697       debuglevel="${build.debuglevel}"
698      deprecation="${build.deprecation}"
699           source="${build.sourcelevel}"
700           target="${build.sourcelevel}"
701         encoding="ASCII"
702             fork="true">
703
704      <compilerarg line="${build.args}"/>
705      <classpath refid="loops.classpath"/>
706      <compilerarg value="-XDignore.symbol.file=true"/>
707
708    </javac>
709
710    <java classname="ALoops" fork="true">
711      <classpath refid="loops.classpath"/>
712    </java>
713  </target>
714
715
673    <target name="compile-test-loops" depends="jar"
674            description="Compiles all the perf tests in src/test/loops">
675  
# Line 1419 | Line 1376
1376    Experimental errorprone support - https://errorprone.info
1377   =================================================================== -->
1378    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1379 +  <property name="errorprone.processorpath" value="${errorprone.jar}"/>
1380    <property name="errorprone.jsr166.user.flags" value=""/>
1381    <property name="errorprone.jsr166.flags"
1382              value="-Xep:HashtableContains:OFF
# Line 1465 | Line 1423
1423        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1424        <compilerarg value="-J--illegal-access=permit"/>
1425        <compilerarg value="-XDcompilePolicy=simple"/>
1426 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1426 >      <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1427        <compilerarg value="-Xplugin:ErrorProne
1428                            ${errorprone.jsr166.flags}"/>
1429        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1489 | Line 1447
1447          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1448          <compilerarg value="-J--illegal-access=permit"/>
1449          <compilerarg value="-XDcompilePolicy=simple"/>
1450 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1450 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1451          <compilerarg value="-Xplugin:ErrorProne
1452                              ${errorprone.jsr166.flags}
1453                              ${errorprone.jsr166.test.flags}"/>
# Line 1512 | Line 1470
1470        <jtreg-elements>
1471          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1472          <arg value="-javacoption:-processorpath"/>
1473 <        <arg value="-javacoption:${errorprone.jar}"/>
1473 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1474          <arg value="-javacoption:-Xplugin:ErrorProne
1475                              ${errorprone.jsr166.flags}
1476                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines