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

Diff of /jsr166/build.xml

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

revision 1.209 by jsr166, Sun Apr 17 18:51:48 2016 UTC revision 1.228 by jsr166, Sat Dec 17 22:28:20 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 63  Line 63 
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>  
66    
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 188  Line 187 
187    <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"/>
188    <!-- The expected canonical location does not yet exist as of 2016-04 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
189    <!-- <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"/> -->
190    <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
192    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193    
# Line 245  Line 244 
244             classpath="${junit.jar}"             classpath="${junit.jar}"
245             includeAntRuntime="false"             includeAntRuntime="false"
246             includeJavaRuntime="false"             includeJavaRuntime="false"
247               encoding="ASCII"
248             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
249             fork="true">             fork="true">
250    
# Line 252  Line 252 
252        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255        <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
256        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
257        <javac-elements/>        <javac-elements/>
258    
# Line 263  Line 263 
263            jvm="${java@{target}}"            jvm="${java@{target}}"
264            fork="true">            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266          <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>          <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
267            <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
268            <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
269            <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
270            <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
271          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
272            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
273            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
274    
275          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
276          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
277            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
278            <propertyref prefix="jsr166."/>            <propertyref prefix="jsr166."/>
# Line 292  Line 298 
298    <fileset dir="${jtreg8.src.dir}">    <fileset dir="${jtreg8.src.dir}">
299      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
300        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="**/SpliteratorCharacteristics.java"/>  
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->  
       <exclude name="**/GCDuringIteration.java"/>  
301      </patternset>      </patternset>
302    </fileset>    </fileset>
303    
# Line 326  Line 329 
329      </condition>      </condition>
330    
331      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>  
332      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
333             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
334             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
335        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
336        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
337        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
338          <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339        <arg value="-agentvm"/>        <arg value="-agentvm"/>
340          <arg value="-noreport"/>
341        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
342        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
343        <arg value="-automatic"/>        <arg value="-automatic"/>
# Line 389  Line 392 
392             classpath=""             classpath=""
393             includeAntRuntime="false"             includeAntRuntime="false"
394             includeJavaRuntime="false"             includeJavaRuntime="false"
395               encoding="ASCII"
396             executable="${build.main.javac}"             executable="${build.main.javac}"
397             fork="true">             fork="true">
398    
# Line 409  Line 413 
413    <target name="jar"    <target name="jar"
414            depends="compile"            depends="compile"
415            description="Builds library jar for src/main from compiled sources">            description="Builds library jar for src/main from compiled sources">
416        <local name="subdir"/>
417        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
418      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
419        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
420        <manifest>        <manifest>
421          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
422          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 429  Line 434 
434      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
435      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
436    
437    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
438    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
439    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
440    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
441    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
442      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
443               packagenames="none"               packagenames="none"
444               link="${java9.api.url}"               link="${java9.api.url}"
445               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
446               access="${build.javadoc.access}"               access="${build.javadoc.access}"
447               sourcepath="${src.dir}:${jdk9.src.dir}"               sourcepath="${src.dir}"
448               classpath=""               classpath=""
449               executable="${javadoc9}">               executable="${javadoc9}">
450        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 443  Line 453 
453        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
454        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
455        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
456  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-Xmodule:java.base"/>
457        <arg value="-tag"/>        <arg value="-tag"/>
458        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
459    <!-- @apiNote currently unused -->
460    <!--       <arg value="-tag"/> -->
461    <!--       <arg value="apiNote:a:API Note:"/> -->
462        <arg value="-tag"/>        <arg value="-tag"/>
463        <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"/>  
464        <arg value="-tag"/>        <arg value="-tag"/>
465        <arg value="spec:X"/>        <arg value="implNote:a:Implementation Note:"/>
466    <!-- tags added in jdk9: currently unused -->
467    <!--       <arg value="-tag"/> -->
468    <!--       <arg value="revised:X"/> -->
469    <!--       <arg value="-tag"/> -->
470    <!--       <arg value="spec:X"/> -->
471      </javadoc>      </javadoc>
472    </target>    </target>
473    
# Line 539  Line 550 
550      </antcall>      </antcall>
551    </target>    </target>
552    
553      <target name="tck-security-manager"
554              description="Runs tck with a security manager">
555        <antcall target="tck">
556          <param name="jsr166.useSecurityManager" value="true"/>
557        </antcall>
558      </target>
559    
560    <target name="jtreg"    <target name="jtreg"
561            depends="jar"            depends="jar"
562            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
# Line 619  Line 637 
637        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
638             source="${build.sourcelevel}"             source="${build.sourcelevel}"
639             target="${build.sourcelevel}"             target="${build.sourcelevel}"
640             encoding="ASCII"
641               fork="true">               fork="true">
642    
643        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 646  Line 665 
665             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
666             includeAntRuntime="false"             includeAntRuntime="false"
667             includeJavaRuntime="false"             includeJavaRuntime="false"
668               encoding="ASCII"
669             executable="${javac9}"             executable="${javac9}"
670             fork="true">             fork="true">
671    
# Line 679  Line 699 
699             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
700             includeAntRuntime="false"             includeAntRuntime="false"
701             includeJavaRuntime="false"             includeJavaRuntime="false"
702               encoding="ASCII"
703             executable="${javac8}"             executable="${javac8}"
704             fork="true">             fork="true">
705    
# Line 709  Line 730 
730             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
731             includeAntRuntime="false"             includeAntRuntime="false"
732             includeJavaRuntime="false"             includeJavaRuntime="false"
733               encoding="ASCII"
734             executable="${javac8}"             executable="${javac8}"
735             fork="true">             fork="true">
736    
# Line 793  Line 815 
815        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
816        <arg value="-tag"/>        <arg value="-tag"/>
817        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
818        <arg value="-tag"/>  <!-- @apiNote currently unused -->
819        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
820    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
821        <arg value="-tag"/>        <arg value="-tag"/>
822        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
823        <arg value="-tag"/>        <arg value="-tag"/>
# Line 848  Line 871 
871             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
872             includeAntRuntime="false"             includeAntRuntime="false"
873             includeJavaRuntime="false"             includeJavaRuntime="false"
874               encoding="ASCII"
875             executable="${javac7}"             executable="${javac7}"
876             fork="true">             fork="true">
877    
# Line 878  Line 902 
902             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
903             includeAntRuntime="false"             includeAntRuntime="false"
904             includeJavaRuntime="false"             includeJavaRuntime="false"
905               encoding="ASCII"
906             executable="${javac8}"             executable="${javac8}"
907             fork="true">             fork="true">
908    
# Line 1045  Line 1070 
1070             target="5"             target="5"
1071             includeAntRuntime="false"             includeAntRuntime="false"
1072             includeJavaRuntime="false"             includeJavaRuntime="false"
1073               encoding="ASCII"
1074             executable="${javac7}"             executable="${javac7}"
1075             fork="true">             fork="true">
1076    
# Line 1138  Line 1164 
1164             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1165             includeAntRuntime="false"             includeAntRuntime="false"
1166             includeJavaRuntime="false"             includeJavaRuntime="false"
1167               encoding="ASCII"
1168             executable="${javac7}"             executable="${javac7}"
1169             fork="true">             fork="true">
1170    
# Line 1232  Line 1259 
1259             target="6"             target="6"
1260             includeAntRuntime="false"             includeAntRuntime="false"
1261             includeJavaRuntime="false"             includeJavaRuntime="false"
1262               encoding="ASCII"
1263             executable="${javac7}"             executable="${javac7}"
1264             fork="true">             fork="true">
1265    

Legend:
Removed from v.1.209  
changed lines
  Added in v.1.228

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