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.205 by jsr166, Sat Mar 26 17:35:47 2016 UTC vs.
Revision 1.208 by jsr166, Sat Apr 2 16:09:42 2016 UTC

# Line 327 | Line 327
327  
328      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329      <delete dir="@{workdir}/JTreport" quiet="true"/>
330 –    <mkdir dir="@{workdir}/JTwork/scratch"/>
331 –    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332 –    <mkdir dir="@{workdir}/JTreport/html"/>
333 –    <mkdir dir="@{workdir}/JTreport/text"/>
330      <jtreg dir="${jtreg@{target}.src.dir}"
331             jdk="${jdk@{target}.home}"
332             workDir="@{workdir}/JTwork"
# Line 530 | Line 526
526    </target>
527  
528    <target name="tck-parallelism-1"
529 <          description="Runs tck with given common pool parallelism">
529 >          description="Runs tck with common pool parallelism 1">
530      <antcall target="tck">
531        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
532      </antcall>
533    </target>
534  
535    <target name="tck-parallelism-0"
536 <          description="Runs tck with given common pool parallelism">
536 >          description="Runs tck with common pool parallelism 0">
537      <antcall target="tck">
538        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
539      </antcall>
# Line 553 | Line 549
549    </target>
550  
551    <target name="test"
552 <          depends="tck, tck-parallelism-1, jtreg"
552 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
553            description="Runs tck and jtreg tests for src/main">
554    </target>
555  
# Line 788 | Line 784
784               access="${build.javadoc.access}"
785               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
786               classpath=""
787 <             executable="${javadoc8}">
787 >             executable="${javadoc8}"
788 >             failonerror = "true">
789        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
790          <include name="**/*.java"/>
791        </fileset>
# Line 993 | Line 990
990               access="${build.javadoc.access}"
991               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
992               classpath=""
993 <             executable="${javadoc7}">
993 >             executable="${javadoc7}"
994 >             failonerror = "true">
995        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
996          <include name="**/*.java"/>
997        </fileset>
# Line 1088 | Line 1086
1086               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1087               bootclasspath="${bootclasspath6}"
1088               source="5"
1089 <             executable="${javadoc7}">
1089 >             executable="${javadoc7}"
1090 >             failonerror = "true">
1091        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1092        <arg value="-XDignore.symbol.file=true"/>
1093  
# Line 1180 | Line 1179
1179               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1180               bootclasspath="${bootclasspath6}"
1181               source="6"
1182 <             executable="${javadoc7}">
1182 >             executable="${javadoc7}"
1183 >             failonerror = "true">
1184        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1185        <arg value="-XDignore.symbol.file=true"/>
1186  
# Line 1393 | Line 1393
1393               access="${build.javadoc.access}"
1394               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1395               source="${build.jsr166e.java.version}"
1396 <             executable="${javadoc7}">
1396 >             executable="${javadoc7}"
1397 >             failonerror = "true">
1398        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1399        <arg value="-XDignore.symbol.file=true"/>
1400  

Diff Legend

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