ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.160 by jsr166, Sat Nov 1 14:50:26 2014 UTC vs.
Revision 1.166 by jsr166, Mon Aug 10 06:32:23 2015 UTC

# Line 213 | Line 213
213             source="@{compile-target}"
214             target="@{compile-target}"
215             classpath="${junit.jar}"
216 –           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216             includeAntRuntime="false"
217             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"
# Line 222 | Line 221
221        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224 +      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>
226        <javac-elements/>
227  
# Line 251 | Line 251
251      </sequential>
252    </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 +    </patternset>
266 +  </fileset>
267 +
268 +  <fileset dir="${jtreg.src.dir}">
269 +    <patternset id="jdk7.jtreg.tests">
270 +      <include name="**/*.java"/>
271 +      <exclude name="util/Collection/CollectionDefaults.java"/>
272 +      <exclude name="util/List/ListDefaults.java"/>
273 +      <exclude name="util/Spliterator/**/*.java"/>
274 +      <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275 +      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276 +      <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
277 +    </patternset>
278 +  </fileset>
279 +
280    <macrodef name="run-jtreg-tests">
281      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
# Line 268 | Line 294
294             jdk="${jdk@{target}.home}"
295             workDir="@{workdir}/JTwork"
296             reportDir="@{workdir}/JTreport">
297 <
297 >      <patternset refid="jdk@{target}.jtreg.tests"/>
298        <arg value="-Xbootclasspath/p:@{classes}"/>
299        <arg value="-agentvm"/>
300        <arg value="-v:nopass,fail"/>
# Line 319 | Line 345
345        <compilerarg value="-Xprefer:source"/>
346        <compilerarg value="-XDignore.symbol.file=true"/>
347        <compilerarg value="-Xlint:all"/>
348 +      <compilerarg value="-Werror"/>
349        <compilerarg value="-Xdoclint:all/protected"/>
350        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
# Line 422 | Line 449
449      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
450    </target>
451  
452 <
452 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
453    <target name="test-tck"
454            depends="jar"
455            description="Runs tck tests for main directly">
# Line 447 | Line 474
474      </antcall>
475    </target>
476  
477 +  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
478    <target name="test-jtreg"
479            depends="jar"
480            description="Runs jtreg tests for main using the jtreg ant task">
# Line 468 | Line 496
496      <antcall target="test">
497        <param name="build.main.java.version" value="8"/>
498        <param name="build.main.javac" value="${javac8}"/>
499 +      <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500      </antcall>
501  
502      <antcall target="clean"/>
# Line 527 | Line 556
556    </target>
557  
558  
559 +  <target name="compile-test-loops" depends="jar"
560 +          description="compile all the perf tests in src/test/loops">
561 +
562 +    <mkdir dir="${build.dir}/test/loops"/>
563 +
564 +    <javac srcdir="${basedir}/src/test/loops"
565 +           destdir="${build.dir}/test/loops"
566 +           debug="${build.debug}"
567 +           debuglevel="${build.debuglevel}"
568 +           deprecation="${build.deprecation}"
569 +           includeAntRuntime="false"
570 +           includeJavaRuntime="false"
571 +           executable="${javac9}"
572 +           fork="true">
573 +
574 +      <include name="*.java"/>
575 +      <compilerarg value="-XDignore.symbol.file=true"/>
576 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
578 +      <compilerarg line="${build.args}"/>
579 +
580 +    </javac>
581 +
582 +  </target>
583 +
584 +
585    <!-- jsr166 4jdk7 -->
586  
587    <target name="4jdk7compile"
# Line 552 | Line 607
607        <compilerarg value="-Xprefer:source"/>
608        <compilerarg value="-XDignore.symbol.file=true"/>
609        <compilerarg value="-Xlint:all"/>
610 +      <compilerarg value="-Werror"/>
611        <compilerarg line="${build.args}"/>
612  
613      </javac>
# Line 656 | Line 712
712      <run-jtreg-tests
713         target="7"
714         workdir="${build.4jdk7.dir}"
715 <       classes="${4jdk7product.jar}"
660 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
715 >       classes="${4jdk7product.jar}"/>
716    </target>
717  
718  
# Line 739 | Line 794
794        <include name="jsr166x/**/*.java"/>
795        <compilerarg value="-XDignore.symbol.file=true"/>
796        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
797 +      <compilerarg value="-Werror"/>
798        <compilerarg line="${build.args}"/>
799  
800      </javac>
# Line 825 | Line 881
881        <include name="jsr166y/**/*.java"/>
882        <compilerarg value="-XDignore.symbol.file=true"/>
883        <compilerarg value="-Xlint:all"/>
884 +      <compilerarg value="-Werror"/>
885        <compilerarg line="${build.args}"/>
886  
887      </javac>
# Line 912 | Line 969
969        <include name="extra166y/**/*.java"/>
970        <compilerarg value="-XDignore.symbol.file=true"/>
971        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
972 +      <compilerarg value="-Werror"/>
973        <compilerarg line="${build.args}"/>
974  
975      </javac>
# Line 999 | Line 1057
1057        <include name="jsr166e/**/*.java"/>
1058        <compilerarg value="-XDignore.symbol.file=true"/>
1059        <compilerarg value="-Xlint:all"/>
1060 +      <compilerarg value="-Werror"/>
1061        <compilerarg line="${build.args}"/>
1062  
1063      </javac>
# Line 1025 | Line 1084
1084        <include name="jsr166e/**/*.java"/>
1085        <compilerarg value="-XDignore.symbol.file=true"/>
1086        <compilerarg value="-Xlint:all"/>
1087 +      <compilerarg value="-Werror"/>
1088        <compilerarg value="-Xdoclint:all/protected"/>
1089  
1090      </javac>
# Line 1128 | Line 1188
1188  
1189    <target name="lint">
1190      <antcall target="dists">
1191 +      <param name="build.javadoc.access" value="public"/>
1192 +    </antcall>
1193 +  </target>
1194 +
1195 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1196 +  <target name="lint-private">
1197 +    <antcall target="dist">
1198        <param name="build.javadoc.access" value="private"/>
1199      </antcall>
1200    </target>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines