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

Diff of /jsr166/build.xml

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

revision 1.127 by jsr166, Wed Jan 23 06:57:08 2013 UTC revision 1.135 by jsr166, Mon Feb 4 19:37:52 2013 UTC
# Line 22  Line 22 
22    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
23    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
24    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
25    As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
27    </description>    </description>
28    
29    <target name="usage" description="Advises user to run with -projecthelp">    <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30      <echo>Run "ant -projecthelp" for full usage information.</echo>      <java classname="org.apache.tools.ant.Main">
31          <arg value="-projecthelp" />
32        </java>
33    </target>    </target>
34    
35    
# Line 39  Line 42 
42    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
45      <property name="build.javadoc.access" value="protected"/>
46    
47    <!-- Build locations -->    <!-- Build locations -->
48    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 171  Line 175 
175      <attribute name="workdir"/>      <attribute name="workdir"/>
176      <attribute name="classes"/>      <attribute name="classes"/>
177      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
178        <element name="javac-elements" optional="true"/>
179      <sequential>      <sequential>
180    
181      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 192  Line 197 
197        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
200          <javac-elements/>
201    
202      </javac>      </javac>
203    
# Line 210  Line 216 
216      </sequential>      </sequential>
217    </macrodef>    </macrodef>
218    
219      <macrodef name="run-jtreg-tests">
220        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
221        <attribute name="source" default="7"/>
222        <attribute name="target"/>
223        <attribute name="workdir"/>
224        <attribute name="classes"/>
225        <attribute name="jtregflags" default=""/>
226        <sequential>
227        <delete dir="@{workdir}/JTwork"   quiet="true"/>
228        <delete dir="@{workdir}/JTreport" quiet="true"/>
229        <mkdir dir="@{workdir}/JTwork/scratch"/>
230        <mkdir dir="@{workdir}/JTreport"/>
231        <jtreg dir="@{jtreg.src.dir}"
232               jdk="${jdk@{target}.home}"
233               workDir="@{workdir}/JTwork"
234               reportDir="@{workdir}/JTreport">
235    
236          <arg value="-Xbootclasspath/p:@{classes}"/>
237          <arg value="-agentvm"/>
238          <arg value="-v:nopass,fail"/>
239          <arg value="-vmoptions:-esa -ea"/>
240          <arg value="-automatic"/>
241          <arg value="-k:!ignore"/>
242          <arg line="@{jtregflags}"/>
243        </jtreg>
244        </sequential>
245      </macrodef>
246    
247    <!-- ALoops classpath -->    <!-- ALoops classpath -->
248    <path id="loops.classpath">    <path id="loops.classpath">
249      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 243  Line 277 
277             fork="true">             fork="true">
278    
279        <include name="**/*.java"/>        <include name="**/*.java"/>
280          <compilerarg value="-Xprefer:source"/>
281        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
282        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
283        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 279  Line 314 
314               packagenames="none"               packagenames="none"
315               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
316               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
317                 access="${build.javadoc.access}"
318               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
319               classpath=""               classpath=""
320               executable="${javadoc8}">               executable="${javadoc8}">
# Line 408  Line 444 
444    
445    </target>    </target>
446    
447      <target name="test-tck"
448              depends="jar"
449              description="Runs tck tests for main directly">
450    
451        <run-tck-tests
452          target="8"
453          workdir="${build.dir}"
454          classes="${product.jar}"/>
455      </target>
456    
457      <target name="test-jtreg"
458              depends="jar"
459              description="Runs jtreg tests for main using the jtreg ant task">
460        <run-jtreg-tests
461           target="8"
462           workdir="${build.dir}"
463           classes="${product.jar}"/>
464      </target>
465    
466      <target name="test-ng"
467              depends="test-tck, test-jtreg"
468              description="Runs tck and jtreg tests for main">
469      </target>
470    
471    <target name="run-tests"    <target name="run-tests"
472            depends="compile-tests">            depends="compile-tests">
# Line 574  Line 633 
633             fork="true">             fork="true">
634    
635        <include name="**/*.java"/>        <include name="**/*.java"/>
636          <compilerarg value="-Xprefer:source"/>
637        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
638        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
639        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 582  Line 642 
642    </target>    </target>
643    
644    
645    <target name="4jdk7-jar"    <target name="4jdk7jar"
646            depends="4jdk7compile"            depends="4jdk7compile"
647            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
648    
# Line 594  Line 654 
654    
655    
656    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
657            depends="4jdk7-jar"            depends="4jdk7jar"
658            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
659    
660      <run-tck-tests      <run-tck-tests
661        target="7"        target="7"
662        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
663        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
664          <javac-elements>
665            <!-- JDK8+ test classes -->
666            <exclude name="StampedLockTest.java"/>
667          </javac-elements>
668        </run-tck-tests>
669    </target>    </target>
670    
671    
# Line 633  Line 698 
698    </target>    </target>
699    
700    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
701            depends="4jdk7compile"            depends="4jdk7jar"
702            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
703      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
704      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
705      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
706      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"/>
     <jtreg dir="${jtreg.src.dir}"  
            jdk="${jdk7.home}"  
            workDir="${build.4jdk7.dir}/JTwork"  
            reportDir="${build.4jdk7.dir}/JTreport">  
   
       <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>  
       <arg value="-agentvm"/>  
       <arg value="-v:nopass,fail"/>  
       <arg value="-vmoptions:-esa -ea"/>  
       <arg value="-automatic"/>  
       <arg value="-k:!ignore"/>  
     </jtreg>  
707    </target>    </target>
708    
709    
# Line 670  Line 723 
723               packagenames="none"               packagenames="none"
724               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
725               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
726                 access="${build.javadoc.access}"
727               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
728               classpath=""               classpath=""
729               executable="${javadoc7}">               executable="${javadoc7}">
# Line 700  Line 754 
754    </target>    </target>
755    
756    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
757            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
758      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
759    </target>    </target>
760    
# Line 741  Line 795 
795    </target>    </target>
796    
797    
798    <target name="jsr166x-jar"    <target name="jsr166xjar"
799            depends="jsr166xcompile"            depends="jsr166xcompile"
800            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
801    
# Line 761  Line 815 
815      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
816               packagenames="jsr166x.*"               packagenames="jsr166x.*"
817               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
818                 access="${build.javadoc.access}"
819               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
820               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
821               source="5"               source="5"
# Line 791  Line 846 
846    
847    
848    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
849            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
850      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
851    </target>    </target>
852    
# Line 831  Line 886 
886    </target>    </target>
887    
888    
889    <target name="jsr166y-jar"    <target name="jsr166yjar"
890            depends="jsr166ycompile"            depends="jsr166ycompile"
891            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
892    
# Line 851  Line 906 
906      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
907               packagenames="jsr166y.*"               packagenames="jsr166y.*"
908               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
909                 access="${build.javadoc.access}"
910               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
911               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
912               source="6"               source="6"
# Line 880  Line 936 
936    </target>    </target>
937    
938    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
939            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
940      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
941    </target>    </target>
942    
# Line 894  Line 950 
950    
951    
952    <target name="extra166ycompile"    <target name="extra166ycompile"
953            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
954            description="Compiles extra166y sources">            description="Compiles extra166y sources">
955    
956      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 921  Line 977 
977    </target>    </target>
978    
979    
980    <target name="extra166y-jar"    <target name="extra166yjar"
981            depends="extra166ycompile"            depends="extra166ycompile"
982            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
983    
# Line 941  Line 997 
997      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
998               packagenames="extra166y.*"               packagenames="extra166y.*"
999               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1000                 access="${build.javadoc.access}"
1001               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1002               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1003               source="6"               source="6"
# Line 970  Line 1027 
1027    </target>    </target>
1028    
1029    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1030            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
1031      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1032    </target>    </target>
1033    
# Line 1008  Line 1065 
1065    </target>    </target>
1066    
1067    
1068    <target name="jsr166e-jar"    <target name="jsr166ejar"
1069            depends="jsr166ecompile"            depends="jsr166ecompile"
1070            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1071    
# Line 1028  Line 1085 
1085      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1086               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1087               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1088                 access="${build.javadoc.access}"
1089               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1090               source="7"               source="7"
1091               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1038  Line 1096 
1096    
1097    
1098    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck"
1099            depends="jsr166e-jar"            depends="jsr166ejar"
1100            description="Runs tck tests for jsr166e">            description="Runs tck tests for jsr166e">
1101    
1102      <run-tck-tests      <run-tck-tests
# Line 1067  Line 1125 
1125    </target>    </target>
1126    
1127    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1128            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
1129      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1130    </target>    </target>
1131    
# Line 1076  Line 1134 
1134      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1135    </target>    </target>
1136    
1137    
1138    <!-- Find buglets that can be detected by static build tools -->
1139    
1140      <target name="lint">
1141        <antcall target="dists">
1142          <param name="build.javadoc.access" value="private"/>
1143        </antcall>
1144      </target>
1145    
1146    
1147  </project>  </project>

Legend:
Removed from v.1.127  
changed lines
  Added in v.1.135

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