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.201 by dl, Sat Mar 26 12:35:25 2016 UTC vs.
Revision 1.212 by jsr166, Sat May 21 00:35:58 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  
41 <  <!-- Display main targets by running 'ant -projecthelp' -->
41 >  <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />
# Line 185 | Line 186
186    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189 <  <!-- The expected canonical location does not yet exist as of 2016-03 -->
189 >  <!-- The expected canonical location does not yet exist as of 2016-04 -->
190    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
191 >  <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->
193    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194  
# Line 251 | Line 252
252        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
255 >      <compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
256        <compilerarg line="${build.args}"/>
257        <javac-elements/>
258  
# Line 262 | Line 263
263            jvm="${java@{target}}"
264            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
266 >        <jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>
268  
269          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
# Line 326 | Line 327
327  
328      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329      <delete dir="@{workdir}/JTreport" quiet="true"/>
329    <mkdir dir="@{workdir}/JTwork/scratch"/>
330    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
331    <mkdir dir="@{workdir}/JTreport/html"/>
332    <mkdir dir="@{workdir}/JTreport/text"/>
330      <jtreg dir="${jtreg@{target}.src.dir}"
331             jdk="${jdk@{target}.home}"
332             workDir="@{workdir}/JTwork"
333             reportDir="@{workdir}/JTreport">
334        <patternset refid="jdk@{target}.jtreg.tests"/>
335        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
336 >      <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
337        <arg value="-agentvm"/>
338        <arg value="-verbose:${jtreg.verbose}"/>
339        <arg value="-vmoptions:-esa -ea"/>
# Line 406 | Line 403
403        <compilerarg line="${build.args}"/>
404  
405      </javac>
409
410    <!-- We need jdk9's Contended annotation, but at compile time only -->
411    <!--
412        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
413    -->
406    </target>
407  
408  
409    <target name="jar"
410            depends="compile"
411 <          description="Builds library jar from compiled sources">
412 <
411 >          description="Builds library jar for src/main from compiled sources">
412 >    <local name="subdir"/>
413 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
414      <jar destfile="${product.jar}">
415 <      <fileset dir="${build.classes.dir}"/>
415 >      <fileset dir="${build.classes.dir}${subdir}"/>
416        <manifest>
417          <attribute name="Built-By" value="${user.name}"/>
418          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 525 | Line 518
518  
519    <target name="tck"
520            depends="jar"
521 <          description="Runs tck tests for main directly">
521 >          description="Runs tck tests for src/main directly">
522  
523      <run-tck-tests
524        target="${build.main.java.version}"
# Line 534 | Line 527
527    </target>
528  
529    <target name="tck-parallelism-1"
530 <          description="Runs tck with given common pool parallelism">
530 >          description="Runs tck with common pool parallelism 1">
531      <antcall target="tck">
532        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
533      </antcall>
534    </target>
535  
536    <target name="tck-parallelism-0"
537 <          description="Runs tck with given common pool parallelism">
537 >          description="Runs tck with common pool parallelism 0">
538      <antcall target="tck">
539        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
540      </antcall>
# Line 549 | Line 542
542  
543    <target name="jtreg"
544            depends="jar"
545 <          description="Runs jtreg tests for main using the jtreg ant task">
545 >          description="Runs jtreg tests for src/main using the jtreg ant task">
546      <run-jtreg-tests
547         target="${build.main.java.version}"
548         workdir="${build.dir}"
# Line 557 | Line 550
550    </target>
551  
552    <target name="test"
553 <          depends="tck, tck-parallelism-1, jtreg"
554 <          description="Runs tck and jtreg tests for main">
553 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
554 >          description="Runs tck and jtreg tests for src/main">
555    </target>
556  
557 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
557 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
558  
559 <    <antcall target="jtreg">
560 <      <param name="build.main.java.version" value="8"/>
561 <      <param name="build.main.javac" value="${javac8}"/>
562 <    </antcall>
559 > <!--     <antcall target="jtreg"> -->
560 > <!--       <param name="build.main.java.version" value="8"/> -->
561 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
562 > <!--     </antcall> -->
563  
564 <  </target>
564 > <!--   </target> -->
565  
566 <  <target name="test89"
567 <          description="Runs tck and jtreg tests for main for multiple java versions">
566 > <!--   <target name="test89" -->
567 > <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
568  
569 <    <antcall target="clean"/>
570 <    <antcall target="test">
571 <      <param name="build.main.java.version" value="8"/>
572 <      <param name="build.main.javac" value="${javac8}"/>
573 <    </antcall>
569 > <!--     <antcall target="clean"/> -->
570 > <!--     <antcall target="test"> -->
571 > <!--       <param name="build.main.java.version" value="8"/> -->
572 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
573 > <!--     </antcall> -->
574  
575 <    <antcall target="clean"/>
576 <    <antcall target="test">
577 <      <param name="build.main.java.version" value="9"/>
578 <      <param name="build.main.javac" value="${javac9}"/>
579 <    </antcall>
575 > <!--     <antcall target="clean"/> -->
576 > <!--     <antcall target="test"> -->
577 > <!--       <param name="build.main.java.version" value="9"/> -->
578 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
579 > <!--     </antcall> -->
580  
581 <  </target>
581 > <!--   </target> -->
582  
583  
584  
# Line 615 | Line 608
608    <!-- Various demos and test programs -->
609  
610  
611 <  <target name="loops" depends="configure-compiler"
612 <          description="Benchmark from Doug Lea's AQS paper">
611 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
612 >  <target name="loops" depends="configure-compiler">
613  
614      <mkdir dir="${build.loops.dir}"/>
615  
# Line 792 | Line 785
785               access="${build.javadoc.access}"
786               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
787               classpath=""
788 <             executable="${javadoc8}">
788 >             executable="${javadoc8}"
789 >             failonerror = "true">
790        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
791          <include name="**/*.java"/>
792        </fileset>
# Line 940 | Line 934
934    </target>
935  
936  
937 +  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
938    <target name="4jdk7-tck-junit"
939 <          depends="4jdk7compile"
945 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
939 >          depends="4jdk7compile">
940  
941      <junit printsummary="true"
942             showoutput="true"
# Line 997 | Line 991
991               access="${build.javadoc.access}"
992               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
993               classpath=""
994 <             executable="${javadoc7}">
994 >             executable="${javadoc7}"
995 >             failonerror = "true">
996        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
997          <include name="**/*.java"/>
998        </fileset>
# Line 1092 | Line 1087
1087               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1088               bootclasspath="${bootclasspath6}"
1089               source="5"
1090 <             executable="${javadoc7}">
1090 >             executable="${javadoc7}"
1091 >             failonerror = "true">
1092        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1093        <arg value="-XDignore.symbol.file=true"/>
1094  
# Line 1184 | Line 1180
1180               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1181               bootclasspath="${bootclasspath6}"
1182               source="6"
1183 <             executable="${javadoc7}">
1183 >             executable="${javadoc7}"
1184 >             failonerror = "true">
1185        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1186        <arg value="-XDignore.symbol.file=true"/>
1187  
# Line 1397 | Line 1394
1394               access="${build.javadoc.access}"
1395               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1396               source="${build.jsr166e.java.version}"
1397 <             executable="${javadoc7}">
1397 >             executable="${javadoc7}"
1398 >             failonerror = "true">
1399        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1400        <arg value="-XDignore.symbol.file=true"/>
1401  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines