/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.235 by jsr166, Sun Mar 19 01:37:51 2017 UTC revision 1.243 by jsr166, Sat May 13 20:16:55 2017 UTC
# Line 18  Line 18 
18    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
19    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
20    hierarchy containing:    hierarchy containing:
   $HOME/jdk/jdk7  
21    $HOME/jdk/jdk8    $HOME/jdk/jdk8
22    $HOME/jdk/jdk9    $HOME/jdk/jdk9
23    $HOME/jdk/jdk10    $HOME/jdk/jdk10
24    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk7  
25    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
26    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
27    $HOME/jdk/src/jdk10    $HOME/jdk/src/jdk10
# Line 32  Line 30 
30    
31    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
32    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
33    for $N in 7 8 9 10 ...    for $N in 8 9 10 ...
34    
35    As of 2016-03, the sources in src/main are for jdk9+ only.    As of 2016-03, the sources in src/main are for jdk9+ only.
36  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 234  Line 232 
232        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233      </condition>      </condition>
234    
235        <local name="use-doclint"/>
236        <condition property="use-doclint">
237          <not> <equals arg1="@{target}" arg2="7"/> </not>
238        </condition>
239    
240      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
241    
242      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 253  Line 256 
256        <include name="*.java"/>        <include name="*.java"/>
257        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
258        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
259        <compilerarg value="-Xdoclint:reference/private"/>        <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
260        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
262        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 367  Line 370 
370    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
371    
372    <target name="dists"    <target name="dists"
373            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist"
374            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
375              <!--
376                  depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
377              -->
378    
379    <target name="compile"    <target name="compile"
380            depends="configure-compiler"            depends="configure-compiler"
# Line 405  Line 411 
411        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
412        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
413        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
414        <compilerarg value="-Werror"/>        <compilerarg line="--doclint-format html5"/>
415        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
416          <compilerarg value="-Werror"/>
417        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
418        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
419    
# Line 457  Line 464 
464        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
465        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
466        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
467          <arg value="-html5"/>
468        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
469        <arg value="-tag"/>        <arg value="-tag"/>
470        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
# Line 505  Line 513 
513    
514    <target name="clean"    <target name="clean"
515            description="Removes all build products">            description="Removes all build products">
   
516      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
   
517    </target>    </target>
518    
519    
520    <target name="dist-clean"    <target name="dist-clean"
521            description="Removes all build and distribution products">            description="Removes all build and distribution products">
   
522      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
523      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
   
524    </target>    </target>
525    
526    
# Line 537  Line 541 
541      <run-tck-tests      <run-tck-tests
542        target="${build.main.java.version}"        target="${build.main.java.version}"
543        workdir="${build.dir}"        workdir="${build.dir}"
544        classes="${product.jar}"/>        classes="${product.jar}">
545          <javac-elements>
546            <compilerarg value="-Werror"/>
547          </javac-elements>
548        </run-tck-tests>
549    </target>    </target>
550    
551    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
# Line 572  Line 580 
580    
581    <target name="test"    <target name="test"
582            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
583            description="Runs tck and jtreg tests for src/main">            description="Runs tck and jtreg tests for src/main"/>
   </target>  
584    
585  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
586    
# Line 605  Line 612 
612    
613    <target name="configure-compiler">    <target name="configure-compiler">
614      <fail message="ant version too old">      <fail message="ant version too old">
615        <condition>        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
         <not> <antversion atleast="1.9.1"/> </not>  
       </condition>  
616      </fail>      </fail>
617    
618      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 653  Line 658 
658      <java classname="ALoops" fork="true">      <java classname="ALoops" fork="true">
659        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
660      </java>      </java>
   
661    </target>    </target>
662    
663    
664    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
665            description="compile all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
666    
667      <mkdir dir="${build.dir}/test/loops"/>      <mkdir dir="${build.dir}/test/loops"/>
668    
# Line 678  Line 682 
682        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
683        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
684        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
685      </javac>      </javac>
   
686    </target>    </target>
687    
688    
# Line 706  Line 708 
708             encoding="ASCII"             encoding="ASCII"
709             executable="${javac8}"             executable="${javac8}"
710             fork="true">             fork="true">
   
711        <include name="**/*.java"/>        <include name="**/*.java"/>
712        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
713        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
714        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
715        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
716        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
717      </javac>      </javac>
718    </target>    </target>
719    
# Line 737  Line 737 
737             encoding="ASCII"             encoding="ASCII"
738             executable="${javac8}"             executable="${javac8}"
739             fork="true">             fork="true">
   
740        <include name="**/*.java"/>        <include name="**/*.java"/>
741        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
742        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
743        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
744        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
745        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
746      </javac>      </javac>
747    </target>    </target>
748    
# Line 760  Line 758 
758          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
759        </manifest>        </manifest>
760      </jar>      </jar>
   
761    </target>    </target>
762    
763    
# Line 776  Line 773 
773          <!-- JDK9+ test classes -->          <!-- JDK9+ test classes -->
774          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
775          <exclude name="*10Test.java"/>          <exclude name="*10Test.java"/>
776            <compilerarg value="-Werror"/>
777        </javac-elements>        </javac-elements>
778      </run-tck-tests>      </run-tck-tests>
779    </target>    </target>
# Line 793  Line 791 
791    
792    <target name="4jdk8-test"    <target name="4jdk8-test"
793            depends="4jdk8-tck, 4jdk8-jtreg"            depends="4jdk8-tck, 4jdk8-jtreg"
794            description="Runs tck and jtreg tests for jsr166-4jdk8">            description="Runs tck and jtreg tests for jsr166-4jdk8"/>
   </target>  
795    
796    
797    <target name="4jdk8docs"    <target name="4jdk8docs"
# Line 837  Line 834 
834    
835    <target name="4jdk8clean"    <target name="4jdk8clean"
836            description="Removes all 4jdk8 build products">            description="Removes all 4jdk8 build products">
   
837      <delete dir="${build.4jdk8.dir}"/>      <delete dir="${build.4jdk8.dir}"/>
   
838    </target>    </target>
839    
840    
# Line 855  Line 850 
850    </target>    </target>
851    
852    
853      <!-- jsr166 4jdk7 (no longer maintained) -->
854    
855    <!-- jsr166 4jdk7 -->    <target name="4jdk7compile" depends="configure-compiler">
   
   <target name="4jdk7compile"  
           depends="configure-compiler"  
           description="Compiles src/jdk7 sources, targeting jdk7">  
   
856      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
857    
858      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 885  Line 876 
876        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
877        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
878        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
879      </javac>      </javac>
880    </target>    </target>
881    
882    <target name="4jdk7doclint"    <target name="4jdk7doclint" depends="configure-compiler">
           depends="configure-compiler"  
           description="Finds doclint warnings">  
   
883      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
884    
885      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 916  Line 903 
903        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
904        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
905        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
906      </javac>      </javac>
907    </target>    </target>
908    
909      <target name="4jdk7jar" depends="4jdk7compile">
   <target name="4jdk7jar"  
           depends="4jdk7compile"  
           description="Builds library jar from compiled sources">  
   
910      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
911        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
912        <manifest>        <manifest>
# Line 932  Line 914 
914          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
915        </manifest>        </manifest>
916      </jar>      </jar>
   
917    </target>    </target>
918    
919      <target name="4jdk7-tck" depends="4jdk7jar">
   <target name="4jdk7-tck"  
           depends="4jdk7jar"  
           description="Runs tck tests for jsr166-4jdk7 directly">  
   
920      <run-tck-tests      <run-tck-tests
921        target="7"        target="7"
922        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
# Line 957  Line 934 
934          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
935          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
936          <exclude name="SubmissionPublisherTest.java"/>          <exclude name="SubmissionPublisherTest.java"/>
937            <compilerarg value="-Werror"/>
938        </javac-elements>        </javac-elements>
939      </run-tck-tests>      </run-tck-tests>
940    </target>    </target>
941    
   
942    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
943    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit" depends="4jdk7compile">
           depends="4jdk7compile">  
944    
945      <junit printsummary="true"      <junit printsummary="true"
946             showoutput="true"             showoutput="true"
# Line 986  Line 962 
962    
963        <test name="${jsr166.tckTestClass}" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
964        </test>        </test>
   
965      </junit>      </junit>
966    </target>    </target>
967    
968    <target name="4jdk7-jtreg"    <target name="4jdk7-jtreg" depends="4jdk7jar">
           depends="4jdk7jar"  
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">  
969      <run-jtreg-tests      <run-jtreg-tests
970         target="7"         target="7"
971         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
972         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"/>
973    </target>    </target>
974    
975      <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
976    
977    <target name="4jdk7-test"    <target name="4jdk7docs">
           depends="4jdk7-tck, 4jdk7-jtreg"  
           description="Runs tck and jtreg tests for jsr166-4jdk7">  
   </target>  
   
   
   <target name="4jdk7docs"  
           description="Builds javadocs for src/jdk7 to dist dir">  
   
978      <delete dir="${4jdk7docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
979      <mkdir dir="${4jdk7docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
980    
# Line 1029  Line 995 
995      </javadoc>      </javadoc>
996    </target>    </target>
997    
998      <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
999    
1000    <target name="4jdk7dist"    <target name="4jdk7clean">
           depends="4jdk7dist-jar, 4jdk7dist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="4jdk7clean"  
           description="Removes all 4jdk7 build products">  
   
1001      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
   
1002    </target>    </target>
1003    
1004      <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
   <target name="4jdk7dist-jar"  
           depends="4jdk7clean, 4jdk7jar">  
1005      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1006    </target>    </target>
1007    
1008      <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
   <target name="4jdk7dist-docs"  
           depends="4jdk7clean, 4jdk7docs">  
1009      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1010    </target>    </target>
1011    
1012    
1013    <!-- jsr166x -->    <!-- jsr166x (no longer maintained) -->
   
   <target name="jsr166xcompile"  
           depends="configure-compiler"  
           description="Compiles jsr166x sources to build dir">  
1014    
1015      <target name="jsr166xcompile" depends="configure-compiler">
1016      <mkdir dir="${build.jsr166x.classes.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
1017    
1018      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1077  Line 1029 
1029             encoding="ASCII"             encoding="ASCII"
1030             executable="${javac7}"             executable="${javac7}"
1031             fork="true">             fork="true">
   
1032        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
1033        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1034        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1035        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1036        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1037      </javac>      </javac>
1038    </target>    </target>
1039    
1040      <target name="jsr166xjar" depends="jsr166xcompile">
   <target name="jsr166xjar"  
           depends="jsr166xcompile"  
           description="Builds library jar from compiled sources">  
   
1041      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1042        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1043        <manifest>        <manifest>
# Line 1099  Line 1045 
1045          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1046        </manifest>        </manifest>
1047      </jar>      </jar>
   
1048    </target>    </target>
1049    
1050      <target name="jsr166xdocs">
   <target name="jsr166xdocs"  
           description="Builds javadocs to dist dir">  
   
1051      <delete dir="${jsr166xdocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
1052      <mkdir dir="${jsr166xdocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
1053    
# Line 1120  Line 1062 
1062               failonerror = "true">               failonerror = "true">
1063        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1064        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1065      </javadoc>      </javadoc>
1066    </target>    </target>
1067    
1068      <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1069    
1070    <target name="jsr166xdist"    <target name="jsr166xclean">
           depends="jsr166xdist-jar, jsr166xdist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166xclean"  
           description="Removes all jsr166x build products">  
   
1071      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
   
1072    </target>    </target>
1073    
1074      <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
   <target name="jsr166xdist-jar"  
           depends="jsr166xclean, jsr166xjar">  
1075      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1076    </target>    </target>
1077    
1078    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
           depends="jsr166xclean, jsr166xdocs">  
1079      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1080    </target>    </target>
1081    
   <!-- jsr166y -->  
1082    
1083      <!-- jsr166y (no longer maintained) -->
1084    
1085    <target name="jsr166ycompile"    <target name="jsr166ycompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166y sources">  
   
1086      <mkdir dir="${build.jsr166y.classes.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
1087    
1088      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1177  Line 1105 
1105        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1106        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1107        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1108      </javac>      </javac>
1109    </target>    </target>
1110    
1111      <target name="jsr166yjar" depends="jsr166ycompile">
   <target name="jsr166yjar"  
           depends="jsr166ycompile"  
           description="Builds library jar from compiled sources">  
   
1112      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1113        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1114        <manifest>        <manifest>
# Line 1193  Line 1116 
1116          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1117        </manifest>        </manifest>
1118      </jar>      </jar>
   
1119    </target>    </target>
1120    
1121      <target name="jsr166ydocs">
   <target name="jsr166ydocs"  
           description="Builds javadocs to dist dir">  
   
1122      <delete dir="${jsr166ydocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
1123      <mkdir dir="${jsr166ydocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
1124    
# Line 1214  Line 1133 
1133               failonerror = "true">               failonerror = "true">
1134        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1135        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1136      </javadoc>      </javadoc>
1137    </target>    </target>
1138    
1139      <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1140    
1141    <target name="jsr166ydist"    <target name="jsr166yclean">
           depends="jsr166ydist-jar, jsr166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166yclean"  
           description="Removes all jsr166y build products">  
   
1142      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
   
1143    </target>    </target>
1144    
1145      <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
   <target name="jsr166ydist-jar"  
           depends="jsr166yclean, jsr166yjar">  
1146      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1147    </target>    </target>
1148    
1149    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
           depends="jsr166yclean, jsr166ydocs">  
1150      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1151    </target>    </target>
1152    
1153    
1154    <!-- extra166y -->    <!-- extra166y (no longer maintained) -->
   
   
   <target name="extra166ycompile"  
           depends="configure-compiler, jsr166yjar"  
           description="Compiles extra166y sources">  
1155    
1156      <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1157      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
1158    
1159      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1272  Line 1176 
1176        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1177        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1178        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1179      </javac>      </javac>
1180    </target>    </target>
1181    
1182      <target name="extra166yjar" depends="extra166ycompile">
   <target name="extra166yjar"  
           depends="extra166ycompile"  
           description="Builds library jar from compiled sources">  
   
1183      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1184        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1185        <manifest>        <manifest>
# Line 1288  Line 1187 
1187          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1188        </manifest>        </manifest>
1189      </jar>      </jar>
   
1190    </target>    </target>
1191    
1192      <target name="extra166ydocs">
   <target name="extra166ydocs"  
           description="Builds javadocs to build dir">  
   
1193      <delete dir="${extra166ydocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1194      <mkdir dir="${extra166ydocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1195    
# Line 1308  Line 1203 
1203               executable="${javadoc7}">               executable="${javadoc7}">
1204        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1205        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1206      </javadoc>      </javadoc>
1207    </target>    </target>
1208    
1209      <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1210    
1211    <target name="extra166ydist"    <target name="extra166yclean">
           depends="extra166ydist-jar, extra166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="extra166yclean"  
           description="Removes all extra166y build products">  
   
1212      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
   
1213    </target>    </target>
1214    
1215      <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
   <target name="extra166ydist-jar"  
           depends="extra166yclean, extra166yjar">  
1216      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1217    </target>    </target>
1218    
1219    <target name="extra166ydist-docs"    <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
           depends="extra166yclean, extra166ydocs">  
1220      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1221    </target>    </target>
1222    
1223    <!-- jsr166e -->  
1224      <!-- jsr166e (no longer maintained) -->
1225    
1226    <property name="build.jsr166e.java.version" value="6"/>    <property name="build.jsr166e.java.version" value="6"/>
1227    <property name="build.jsr166e.javac" value="${javac6}"/>    <property name="build.jsr166e.javac" value="${javac6}"/>
1228    
1229    <target name="jsr166ecompile"    <target name="jsr166ecompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166e sources">  
   
1230      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1231    
1232      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1365  Line 1247 
1247        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1248        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1249        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1250      </javac>      </javac>
1251    </target>    </target>
1252    
   <!-- jsr166e: find doclint errors -->  
1253    <target name="jsr166edoclint">    <target name="jsr166edoclint">
   
1254      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1255    
1256      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1393  Line 1272 
1272        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1273        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1274        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
   
1275      </javac>      </javac>
1276    </target>    </target>
1277    
1278      <target name="jsr166ejar" depends="jsr166ecompile">
   <target name="jsr166ejar"  
           depends="jsr166ecompile"  
           description="Builds library jar from compiled sources">  
   
1279      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1280        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1281        <manifest>        <manifest>
# Line 1409  Line 1283 
1283          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1284        </manifest>        </manifest>
1285      </jar>      </jar>
   
1286    </target>    </target>
1287    
1288      <target name="jsr166edocs">
   <target name="jsr166edocs"  
           description="Builds javadocs to build dir">  
   
1289      <delete dir="${jsr166edocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1290      <mkdir dir="${jsr166edocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1291    
# Line 1429  Line 1299 
1299               failonerror = "true">               failonerror = "true">
1300        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1301        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1302      </javadoc>      </javadoc>
1303    </target>    </target>
1304    
1305      <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
   <target name="jsr166e-tck-one-java-version"  
           depends="jsr166ejar">  
   
1306      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
   
1307      <run-tck-tests      <run-tck-tests
1308        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1309        target="${build.jsr166e.java.version}"        target="${build.jsr166e.java.version}"
# Line 1446  Line 1311 
1311        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1312    </target>    </target>
1313    
1314    <target name="jsr166e-tck"    <target name="jsr166e-tck">
           description="Runs tck tests for jsr166e for multiple java versions">  
1315    
1316  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1317  <!--     <antcall target="jsr166e-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1468  Line 1332 
1332      </antcall>      </antcall>
1333    </target>    </target>
1334    
1335      <target name="jsr166e-test" depends="jsr166e-tck"/>
1336    
1337    <target name="jsr166e-test"    <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
           depends="jsr166e-tck"  
           description="Runs all tests for jsr166e">  
   </target>  
   
   <target name="jsr166edist"  
           depends="jsr166edist-jar, jsr166edist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
1338    
1339      <target name="jsr166eclean">
   <target name="jsr166eclean"  
           description="Removes all jsr166e build products">  
1340      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
1341    </target>    </target>
1342    
   
1343    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1344            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1345      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1346    </target>    </target>
1347    
1348    <target name="jsr166edist-docs"    <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
           depends="jsr166eclean, jsr166edocs">  
1349      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1350    </target>    </target>
1351    
# Line 1511  Line 1365 
1365      </antcall>      </antcall>
1366    </target>    </target>
1367    
1368    
1369    <!-- ==============================================================
1370      Experimental errorprone support - http://errorprone.info
1371      You may need to bring your own errorprone jar.
1372    =================================================================== -->
1373      <target name="errorprone"
1374              depends="clean, configure-compiler"
1375              description="Run errorprone over jsr166 source code (experimental)">
1376    
1377        <local name="destdir"/>
1378        <property name="destdir" value="${build.classes.dir}/java.base"/>
1379        <mkdir dir="${destdir}"/>
1380    
1381        <javac srcdir="${src.dir}"
1382               destdir="${destdir}"
1383               debug="${build.debug}"
1384               debuglevel="${build.debuglevel}"
1385               deprecation="${build.deprecation}"
1386               classpath=""
1387               includeAntRuntime="false"
1388               includeJavaRuntime="false"
1389               encoding="ASCII"
1390               executable="${build.main.javac}"
1391               fork="true">
1392    
1393          <include name="**/*.java"/>
1394          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1395          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1396          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1397          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1398          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1399          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1400          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1401          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1402          <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1403          <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1404          <compilerarg value="-Xplugin:ErrorProne
1405                              -Xep:IdentityBinaryExpression:WARN
1406                              -Xep:MissingOverride:OFF
1407                              -Xep:MixedArrayDimensions:WARN
1408                              -Xep:RemoveUnusedImports:ERROR
1409                              -Xep:ClassName:ERROR
1410                              -Xep:MultipleTopLevelClasses:ERROR
1411                              -Xep:EmptyIf:ERROR
1412                              -Xep:LongLiteralLowerCaseSuffix:ERROR
1413                              -Xep:ArgumentParameterSwap:ERROR
1414                              -Xep:RedundantThrows:ERROR
1415                              -Xep:MethodCanBeStatic:WARN"/>
1416          <compilerarg value="--patch-module=java.base=${src.dir}"/>
1417          <compilerarg value="-Xprefer:source"/>
1418          <compilerarg value="-XDignore.symbol.file=true"/>
1419          <compilerarg value="-Xlint:all"/>
1420          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1421          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1422          <compilerarg line="${build.args}"/>
1423        </javac>
1424    
1425        <jar destfile="${product.jar}">
1426          <fileset dir="${destdir}"/>
1427        </jar>
1428    
1429        <run-tck-tests
1430          target="${build.main.java.version}"
1431          workdir="${build.dir}"
1432          classes="${product.jar}">
1433          <javac-elements>
1434            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1435            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1436            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1437            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1438            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1439            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1440            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1441            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1442            <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1443            <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1444            <compilerarg value="-Xplugin:ErrorProne
1445                                -Xep:IdentityBinaryExpression:WARN
1446                                -Xep:BoxedPrimitiveConstructor:OFF
1447                                -Xep:HashtableContains:OFF
1448                                -Xep:ModifyingCollectionWithItself:OFF
1449                                -Xep:MissingOverride:OFF
1450                                -Xep:MixedArrayDimensions:WARN
1451                                -Xep:RemoveUnusedImports:ERROR
1452                                -Xep:ClassName:ERROR
1453                                -Xep:MultipleTopLevelClasses:ERROR
1454                                -Xep:EmptyIf:ERROR
1455                                -Xep:LongLiteralLowerCaseSuffix:ERROR
1456                                -Xep:ArgumentParameterSwap:ERROR
1457                                -Xep:RedundantThrows:ERROR
1458                                -Xep:MethodCanBeStatic:WARN"/>
1459            <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1460          </javac-elements>
1461        </run-tck-tests>
1462      </target>
1463    
1464    
1465  <!-- ==============================================================  <!-- ==============================================================
1466    Running guava tests against jsr166 code    Running guava tests against jsr166 code
1467  =================================================================== -->  =================================================================== -->

Legend:
Removed from v.1.235  
changed lines
  Added in v.1.243

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27