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

Diff of /jsr166/build.xml

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

revision 1.160 by jsr166, Sat Nov 1 14:50:26 2014 UTC revision 1.172 by jsr166, Wed Sep 2 05:00:20 2015 UTC
# Line 213  Line 213 
213             source="@{compile-target}"             source="@{compile-target}"
214             target="@{compile-target}"             target="@{compile-target}"
215             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
216             includeAntRuntime="false"             includeAntRuntime="false"
217             includeJavaRuntime="false"             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 222  Line 221 
221        <include name="*.java"/>        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
226        <javac-elements/>        <javac-elements/>
227    
# Line 251  Line 251 
251      </sequential>      </sequential>
252    </macrodef>    </macrodef>
253    
254      <!-- Define jtreg test sets for different jdk versions -->
255      <fileset dir="${jtreg.src.dir}">
256        <patternset id="jdk9.jtreg.tests">
257          <include name="**/*.java"/>
258        </patternset>
259      </fileset>
260    
261      <fileset dir="${jtreg.src.dir}">
262        <patternset id="jdk8.jtreg.tests">
263          <include name="**/*.java"/>
264          <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266          <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267        </patternset>
268      </fileset>
269    
270      <fileset dir="${jtreg.src.dir}">
271        <patternset id="jdk7.jtreg.tests">
272          <include name="**/*.java"/>
273          <exclude name="util/Collection/CollectionDefaults.java"/>
274          <exclude name="util/List/ListDefaults.java"/>
275          <exclude name="util/Spliterator/**/*.java"/>
276          <exclude name="**/CompletableFuture/**/*.java"/>
277          <exclude name="**/ConcurrentAssociateTest.java"/>
278          <exclude name="**/ConcurrentContainsKeyTest.java"/>
279          <exclude name="**/ConcurrentHashMap/ToArray.java"/>
280          <exclude name="**/ConcurrentRemoveIf.java"/>
281          <exclude name="**/COWSubList.java"/>
282          <exclude name="**/FutureTask/NegativeTimeout.java"/>
283          <exclude name="**/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java"/>
284          <exclude name="**/forkjoin/SubmissionTest.java"/>
285          <exclude name="**/StampedLock/**/*.java"/>
286          <exclude name="**/AtomicReferenceTest.java"/>
287          <exclude name="util/concurrent/atomic/Serial.java"/>
288        </patternset>
289      </fileset>
290    
291    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
292      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
293      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
# Line 268  Line 305 
305             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
306             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
307             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
308          <patternset refid="jdk@{target}.jtreg.tests"/>
309        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
310        <arg value="-agentvm"/>        <arg value="-agentvm"/>
311        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 319  Line 356 
356        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
357        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
358        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
359          <compilerarg value="-Werror"/>
360        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
361        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
362        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 422  Line 460 
460      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
461    </target>    </target>
462    
463      <target name="tck" depends="test-tck" description="alias for test-tck"/>
464    <target name="test-tck"    <target name="test-tck"
465            depends="jar"            depends="jar"
466            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
# Line 447  Line 485 
485      </antcall>      </antcall>
486    </target>    </target>
487    
488      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
489    <target name="test-jtreg"    <target name="test-jtreg"
490            depends="jar"            depends="jar"
491            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
# Line 461  Line 500 
500            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
501    </target>    </target>
502    
503      <target name="jtreg8" description="Runs jtreg tests with jdk8">
504    
505        <antcall target="jtreg">
506          <param name="build.main.java.version" value="8"/>
507          <param name="build.main.javac" value="${javac8}"/>
508        </antcall>
509    
510      </target>
511    
512    <target name="test89"    <target name="test89"
513            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
514    
# Line 527  Line 575 
575    </target>    </target>
576    
577    
578      <target name="compile-test-loops" depends="jar"
579              description="compile all the perf tests in src/test/loops">
580    
581        <mkdir dir="${build.dir}/test/loops"/>
582    
583        <javac srcdir="${basedir}/src/test/loops"
584               destdir="${build.dir}/test/loops"
585               debug="${build.debug}"
586               debuglevel="${build.debuglevel}"
587               deprecation="${build.deprecation}"
588               includeAntRuntime="false"
589               includeJavaRuntime="false"
590               executable="${javac9}"
591               fork="true">
592    
593          <include name="*.java"/>
594          <compilerarg value="-XDignore.symbol.file=true"/>
595          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
596          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
597          <compilerarg line="${build.args}"/>
598    
599        </javac>
600    
601      </target>
602    
603    
604    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
605    
606    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 552  Line 626 
626        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
627        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
628        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
629          <compilerarg value="-Werror"/>
630        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
631    
632      </javac>      </javac>
# Line 656  Line 731 
731      <run-jtreg-tests      <run-jtreg-tests
732         target="7"         target="7"
733         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
734         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
735    </target>    </target>
736    
737    
# Line 739  Line 813 
813        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
814        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
815        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
816          <compilerarg value="-Werror"/>
817        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
818    
819      </javac>      </javac>
# Line 825  Line 900 
900        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
901        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
902        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
903          <compilerarg value="-Werror"/>
904        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
905    
906      </javac>      </javac>
# Line 912  Line 988 
988        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
989        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
990        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
991          <compilerarg value="-Werror"/>
992        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
993    
994      </javac>      </javac>
# Line 999  Line 1076 
1076        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1077        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1078        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1079          <compilerarg value="-Werror"/>
1080        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1081    
1082      </javac>      </javac>
# Line 1025  Line 1103 
1103        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1104        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1105        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1106          <compilerarg value="-Werror"/>
1107        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
1108    
1109      </javac>      </javac>
# Line 1128  Line 1207 
1207    
1208    <target name="lint">    <target name="lint">
1209      <antcall target="dists">      <antcall target="dists">
1210          <param name="build.javadoc.access" value="public"/>
1211        </antcall>
1212      </target>
1213    
1214    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1215      <target name="lint-private">
1216        <antcall target="dist">
1217        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1218      </antcall>      </antcall>
1219    </target>    </target>
Legend:
Removed from v.1.160  
changed lines
  Added in v.1.172
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27