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.200 by jsr166, Sat Mar 26 06:22:49 2016 UTC vs.
Revision 1.206 by jsr166, Sun Mar 27 19:38:01 2016 UTC

# Line 7 | Line 7
7  
8    Usage: ant [target]
9  
10 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11 +  more details.
12 +
13    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.
15  
# Line 30 | Line 33
33    ant -Djdk$N.home=... -Djdk$N.src.home=...
34    for $N in 6 7 8 9 ...
35  
36 <  As of 2015-09, there is incomplete hacky support for jigsaw
37 <  Build for jigsaw using something like:
35 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still broken.
36 >  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37 >  target is currently broken.
38   ------------------------------------------------------------------------------
39    </description>
40  
# Line 219 | Line 220
220      <attribute name="compile-target" default="@{target}"/>
221      <attribute name="workdir"/>
222      <attribute name="classes"/>
223 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
223 >    <!--
224 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
225 >    -->
226 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227      <element name="javac-elements" optional="true"/>
228  
229      <sequential>
# Line 403 | Line 407
407        <compilerarg line="${build.args}"/>
408  
409      </javac>
406
407    <!-- We need jdk9's Contended annotation, but at compile time only -->
408    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
410    </target>
411  
412  
413    <target name="jar"
414            depends="compile"
415 <          description="Builds library jar from compiled sources">
415 >          description="Builds library jar for src/main from compiled sources">
416  
417      <jar destfile="${product.jar}">
418        <fileset dir="${build.classes.dir}"/>
# Line 520 | Line 521
521  
522    <target name="tck"
523            depends="jar"
524 <          description="Runs tck tests for main directly">
524 >          description="Runs tck tests for src/main directly">
525  
526      <run-tck-tests
527        target="${build.main.java.version}"
# Line 544 | Line 545
545  
546    <target name="jtreg"
547            depends="jar"
548 <          description="Runs jtreg tests for main using the jtreg ant task">
548 >          description="Runs jtreg tests for src/main using the jtreg ant task">
549      <run-jtreg-tests
550         target="${build.main.java.version}"
551         workdir="${build.dir}"
# Line 553 | Line 554
554  
555    <target name="test"
556            depends="tck, tck-parallelism-1, jtreg"
557 <          description="Runs tck and jtreg tests for main">
557 >          description="Runs tck and jtreg tests for src/main">
558    </target>
559  
560 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
560 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
561  
562 <    <antcall target="jtreg">
563 <      <param name="build.main.java.version" value="8"/>
564 <      <param name="build.main.javac" value="${javac8}"/>
565 <    </antcall>
562 > <!--     <antcall target="jtreg"> -->
563 > <!--       <param name="build.main.java.version" value="8"/> -->
564 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
565 > <!--     </antcall> -->
566  
567 <  </target>
567 > <!--   </target> -->
568  
569 <  <target name="test89"
570 <          description="Runs tck and jtreg tests for main for multiple java versions">
569 > <!--   <target name="test89" -->
570 > <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
571  
572 <    <antcall target="clean"/>
573 <    <antcall target="test">
574 <      <param name="build.main.java.version" value="8"/>
575 <      <param name="build.main.javac" value="${javac8}"/>
576 <    </antcall>
572 > <!--     <antcall target="clean"/> -->
573 > <!--     <antcall target="test"> -->
574 > <!--       <param name="build.main.java.version" value="8"/> -->
575 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
576 > <!--     </antcall> -->
577  
578 <    <antcall target="clean"/>
579 <    <antcall target="test">
580 <      <param name="build.main.java.version" value="9"/>
581 <      <param name="build.main.javac" value="${javac9}"/>
582 <    </antcall>
578 > <!--     <antcall target="clean"/> -->
579 > <!--     <antcall target="test"> -->
580 > <!--       <param name="build.main.java.version" value="9"/> -->
581 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
582 > <!--     </antcall> -->
583  
584 <  </target>
584 > <!--   </target> -->
585  
586  
587  
# Line 610 | Line 611
611    <!-- Various demos and test programs -->
612  
613  
614 <  <target name="loops" depends="configure-compiler"
615 <          description="Benchmark from Doug Lea's AQS paper">
614 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
615 >  <target name="loops" depends="configure-compiler">
616  
617      <mkdir dir="${build.loops.dir}"/>
618  
# Line 787 | Line 788
788               access="${build.javadoc.access}"
789               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
790               classpath=""
791 <             executable="${javadoc8}">
791 >             executable="${javadoc8}"
792 >             failonerror = "true">
793        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
794          <include name="**/*.java"/>
795        </fileset>
# Line 935 | Line 937
937    </target>
938  
939  
940 +  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
941    <target name="4jdk7-tck-junit"
942 <          depends="4jdk7compile"
940 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
942 >          depends="4jdk7compile">
943  
944      <junit printsummary="true"
945             showoutput="true"
# Line 992 | Line 994
994               access="${build.javadoc.access}"
995               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
996               classpath=""
997 <             executable="${javadoc7}">
997 >             executable="${javadoc7}"
998 >             failonerror = "true">
999        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1000          <include name="**/*.java"/>
1001        </fileset>
# Line 1087 | Line 1090
1090               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1091               bootclasspath="${bootclasspath6}"
1092               source="5"
1093 <             executable="${javadoc7}">
1093 >             executable="${javadoc7}"
1094 >             failonerror = "true">
1095        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1096        <arg value="-XDignore.symbol.file=true"/>
1097  
# Line 1179 | Line 1183
1183               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1184               bootclasspath="${bootclasspath6}"
1185               source="6"
1186 <             executable="${javadoc7}">
1186 >             executable="${javadoc7}"
1187 >             failonerror = "true">
1188        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1189        <arg value="-XDignore.symbol.file=true"/>
1190  
# Line 1392 | Line 1397
1397               access="${build.javadoc.access}"
1398               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1399               source="${build.jsr166e.java.version}"
1400 <             executable="${javadoc7}">
1400 >             executable="${javadoc7}"
1401 >             failonerror = "true">
1402        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1403        <arg value="-XDignore.symbol.file=true"/>
1404  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines