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

Diff of /jsr166/build.xml

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

revision 1.202 by jsr166, Sat Mar 26 15:10:14 2016 UTC revision 1.222 by jsr166, Mon Oct 10 04:51:19 2016 UTC
# Line 38  Line 38 
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
41    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />        <arg value="-projecthelp" />
# Line 186  Line 186 
186    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189    <!-- The expected canonical location does not yet exist as of 2016-03 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
190    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
193    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194    
# Line 245  Line 245 
245             classpath="${junit.jar}"             classpath="${junit.jar}"
246             includeAntRuntime="false"             includeAntRuntime="false"
247             includeJavaRuntime="false"             includeJavaRuntime="false"
248               encoding="ASCII"
249             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
250             fork="true">             fork="true">
251    
# Line 252  Line 253 
253        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
254        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256        <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
257        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
258        <javac-elements/>        <javac-elements/>
259    
# Line 263  Line 264 
264            jvm="${java@{target}}"            jvm="${java@{target}}"
265            fork="true">            fork="true">
266          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267          <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>          <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
268          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
269            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
270            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
271    
272          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
274            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
275            <propertyref prefix="jsr166."/>            <propertyref prefix="jsr166."/>
# Line 327  Line 330 
330    
331      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
332      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
     <mkdir dir="@{workdir}/JTwork/scratch"/>  
     <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->  
     <mkdir dir="@{workdir}/JTreport/html"/>  
     <mkdir dir="@{workdir}/JTreport/text"/>  
333      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
334             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
335             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
336             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
337        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
338        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340          <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
341        <arg value="-agentvm"/>        <arg value="-agentvm"/>
342        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
343        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
# Line 393  Line 393 
393             classpath=""             classpath=""
394             includeAntRuntime="false"             includeAntRuntime="false"
395             includeJavaRuntime="false"             includeJavaRuntime="false"
396               encoding="ASCII"
397             executable="${build.main.javac}"             executable="${build.main.javac}"
398             fork="true">             fork="true">
399    
# Line 407  Line 408 
408        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
409    
410      </javac>      </javac>
   
     <!-- We need jdk9's Contended annotation, but at compile time only -->  
     <!--  
         <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>  
     -->  
411    </target>    </target>
412    
413    
414    <target name="jar"    <target name="jar"
415            depends="compile"            depends="compile"
416            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
417        <local name="subdir"/>
418        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
419      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
420        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
421        <manifest>        <manifest>
422          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
423          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 438  Line 435 
435      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
436      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
437    
438    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
441               packagenames="none"               packagenames="none"
442               link="${java9.api.url}"               link="${java9.api.url}"
443               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
444               access="${build.javadoc.access}"               access="${build.javadoc.access}"
445               sourcepath="${src.dir}:${jdk9.src.dir}"               sourcepath="${src.dir}"
446               classpath=""               classpath=""
447               executable="${javadoc9}">               executable="${javadoc9}">
448        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 452  Line 451 
451        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
452        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
453        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
454  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-Xmodule:java.base"/>
455        <arg value="-tag"/>        <arg value="-tag"/>
456        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
457    <!-- @apiNote currently unused -->
458    <!--       <arg value="-tag"/> -->
459    <!--       <arg value="apiNote:a:API Note:"/> -->
460        <arg value="-tag"/>        <arg value="-tag"/>
461        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
       <arg value="-tag"/>  
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  
 <!-- tags added in jdk9 -->  
       <arg value="-tag"/>  
       <arg value="revised:X"/>  
462        <arg value="-tag"/>        <arg value="-tag"/>
463        <arg value="spec:X"/>        <arg value="implNote:a:Implementation Note:"/>
464    <!-- tags added in jdk9: currently unused -->
465    <!--       <arg value="-tag"/> -->
466    <!--       <arg value="revised:X"/> -->
467    <!--       <arg value="-tag"/> -->
468    <!--       <arg value="spec:X"/> -->
469      </javadoc>      </javadoc>
470    </target>    </target>
471    
# Line 526  Line 526 
526    
527    <target name="tck"    <target name="tck"
528            depends="jar"            depends="jar"
529            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
530    
531      <run-tck-tests      <run-tck-tests
532        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 535  Line 535 
535    </target>    </target>
536    
537    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
538            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
539      <antcall target="tck">      <antcall target="tck">
540        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
541      </antcall>      </antcall>
542    </target>    </target>
543    
544    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
545            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
546      <antcall target="tck">      <antcall target="tck">
547        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
548      </antcall>      </antcall>
549    </target>    </target>
550    
551      <target name="tck-security-manager"
552              description="Runs tck with a security manager">
553        <antcall target="tck">
554          <param name="jsr166.useSecurityManager" value="true"/>
555        </antcall>
556      </target>
557    
558    <target name="jtreg"    <target name="jtreg"
559            depends="jar"            depends="jar"
560            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
561      <run-jtreg-tests      <run-jtreg-tests
562         target="${build.main.java.version}"         target="${build.main.java.version}"
563         workdir="${build.dir}"         workdir="${build.dir}"
# Line 558  Line 565 
565    </target>    </target>
566    
567    <target name="test"    <target name="test"
568            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
569            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
570    </target>    </target>
571    
572    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
573    
574      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
575        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
576        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
577      </antcall>  <!--     </antcall> -->
578    
579    </target>  <!--   </target> -->
580    
581    <target name="test89"  <!--   <target name="test89" -->
582            description="Runs tck and jtreg tests for main for multiple java versions">  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
583    
584      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
585      <antcall target="test">  <!--     <antcall target="test"> -->
586        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
587        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
588      </antcall>  <!--     </antcall> -->
589    
590      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
591      <antcall target="test">  <!--     <antcall target="test"> -->
592        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
593        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
594      </antcall>  <!--     </antcall> -->
595    
596    </target>  <!--   </target> -->
597    
598    
599    
# Line 616  Line 623 
623    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
624    
625    
626    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
627            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
628    
629      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
630    
# Line 628  Line 635 
635        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
636             source="${build.sourcelevel}"             source="${build.sourcelevel}"
637             target="${build.sourcelevel}"             target="${build.sourcelevel}"
638             encoding="ASCII"
639               fork="true">               fork="true">
640    
641        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 655  Line 663 
663             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
664             includeAntRuntime="false"             includeAntRuntime="false"
665             includeJavaRuntime="false"             includeJavaRuntime="false"
666               encoding="ASCII"
667             executable="${javac9}"             executable="${javac9}"
668             fork="true">             fork="true">
669    
# Line 688  Line 697 
697             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
698             includeAntRuntime="false"             includeAntRuntime="false"
699             includeJavaRuntime="false"             includeJavaRuntime="false"
700               encoding="ASCII"
701             executable="${javac8}"             executable="${javac8}"
702             fork="true">             fork="true">
703    
# Line 718  Line 728 
728             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
729             includeAntRuntime="false"             includeAntRuntime="false"
730             includeJavaRuntime="false"             includeJavaRuntime="false"
731               encoding="ASCII"
732             executable="${javac8}"             executable="${javac8}"
733             fork="true">             fork="true">
734    
# Line 793  Line 804 
804               access="${build.javadoc.access}"               access="${build.javadoc.access}"
805               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
806               classpath=""               classpath=""
807               executable="${javadoc8}">               executable="${javadoc8}"
808                 failonerror = "true">
809        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
810          <include name="**/*.java"/>          <include name="**/*.java"/>
811        </fileset>        </fileset>
# Line 801  Line 813 
813        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
814        <arg value="-tag"/>        <arg value="-tag"/>
815        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
816        <arg value="-tag"/>  <!-- @apiNote currently unused -->
817        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
818    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
819        <arg value="-tag"/>        <arg value="-tag"/>
820        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
821        <arg value="-tag"/>        <arg value="-tag"/>
# Line 856  Line 869 
869             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
870             includeAntRuntime="false"             includeAntRuntime="false"
871             includeJavaRuntime="false"             includeJavaRuntime="false"
872               encoding="ASCII"
873             executable="${javac7}"             executable="${javac7}"
874             fork="true">             fork="true">
875    
# Line 886  Line 900 
900             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
901             includeAntRuntime="false"             includeAntRuntime="false"
902             includeJavaRuntime="false"             includeJavaRuntime="false"
903               encoding="ASCII"
904             executable="${javac8}"             executable="${javac8}"
905             fork="true">             fork="true">
906    
# Line 941  Line 956 
956    </target>    </target>
957    
958    
959      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
960    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
961            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
962    
963      <junit printsummary="true"      <junit printsummary="true"
964             showoutput="true"             showoutput="true"
# Line 998  Line 1013 
1013               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1014               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1015               classpath=""               classpath=""
1016               executable="${javadoc7}">               executable="${javadoc7}"
1017                 failonerror = "true">
1018        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1019          <include name="**/*.java"/>          <include name="**/*.java"/>
1020        </fileset>        </fileset>
# Line 1052  Line 1068 
1068             target="5"             target="5"
1069             includeAntRuntime="false"             includeAntRuntime="false"
1070             includeJavaRuntime="false"             includeJavaRuntime="false"
1071               encoding="ASCII"
1072             executable="${javac7}"             executable="${javac7}"
1073             fork="true">             fork="true">
1074    
# Line 1093  Line 1110 
1110               sourcepath="${topsrc.dir}:${jdk6.src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1111               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1112               source="5"               source="5"
1113               executable="${javadoc7}">               executable="${javadoc7}"
1114                 failonerror = "true">
1115        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1116        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1117    
# Line 1144  Line 1162 
1162             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1163             includeAntRuntime="false"             includeAntRuntime="false"
1164             includeJavaRuntime="false"             includeJavaRuntime="false"
1165               encoding="ASCII"
1166             executable="${javac7}"             executable="${javac7}"
1167             fork="true">             fork="true">
1168    
# Line 1185  Line 1204 
1204               sourcepath="${topsrc.dir}:${jdk6.src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1205               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1206               source="6"               source="6"
1207               executable="${javadoc7}">               executable="${javadoc7}"
1208                 failonerror = "true">
1209        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1210        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1211    
# Line 1237  Line 1257 
1257             target="6"             target="6"
1258             includeAntRuntime="false"             includeAntRuntime="false"
1259             includeJavaRuntime="false"             includeJavaRuntime="false"
1260               encoding="ASCII"
1261             executable="${javac7}"             executable="${javac7}"
1262             fork="true">             fork="true">
1263    
# Line 1398  Line 1419 
1419               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1420               sourcepath="${topsrc.dir}:${jdk6.src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1421               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1422               executable="${javadoc7}">               executable="${javadoc7}"
1423                 failonerror = "true">
1424        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1425        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1426    

Legend:
Removed from v.1.202  
changed lines
  Added in v.1.222

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