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

Diff of /jsr166/build.xml

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

revision 1.200, Sat Mar 26 06:22:49 2016 UTC revision 1.213, Sat Jun 4 23:49:29 2016 UTC
# Line 7  Line 7 
7    
8    Usage: ant [target]    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.    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.    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=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
34    for $N in 6 7 8 9 ...    for $N in 6 7 8 9 ...
35    
36    As of 2015-09, there is incomplete hacky support for jigsaw    As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37    Build for jigsaw using something like:    target is currently broken.
   ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist  
   "docs" target is still broken.  
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
41    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />        <arg value="-projecthelp" />
# Line 185  Line 186 
186    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <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"/>    <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"/>    <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 -->    <!-- 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"/> -->    <!-- <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"/>    <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
193    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194    
# Line 219  Line 220 
220      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
221      <attribute name="workdir"/>      <attribute name="workdir"/>
222      <attribute name="classes"/>      <attribute name="classes"/>
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"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
228    
# Line 248  Line 252 
252        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255        <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
256        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
257        <javac-elements/>        <javac-elements/>
258    
# Line 259  Line 263 
263            jvm="${java@{target}}"            jvm="${java@{target}}"
264            fork="true">            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266          <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>          <jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
268    
269          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
# Line 323  Line 327 
327    
328      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
     <mkdir dir="@{workdir}/JTwork/scratch"/>  
     <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->  
     <mkdir dir="@{workdir}/JTreport/html"/>  
     <mkdir dir="@{workdir}/JTreport/text"/>  
330      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
331             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
332             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
333             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
334        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
335        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336        <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>        <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
337        <arg value="-agentvm"/>        <arg value="-agentvm"/>
338        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
339        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
# Line 403  Line 403 
403        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
404    
405      </javac>      </javac>
   
     <!-- We need jdk9's Contended annotation, but at compile time only -->  
     <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>  
406    </target>    </target>
407    
408    
409    <target name="jar"    <target name="jar"
410            depends="compile"            depends="compile"
411            description="Builds library jar from compiled sources">            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}">      <jar destfile="${product.jar}">
415        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
416        <manifest>        <manifest>
417          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
418          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 520  Line 518 
518    
519    <target name="tck"    <target name="tck"
520            depends="jar"            depends="jar"
521            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
522    
523      <run-tck-tests      <run-tck-tests
524        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 529  Line 527 
527    </target>    </target>
528    
529    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
530            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
531      <antcall target="tck">      <antcall target="tck">
532        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
533      </antcall>      </antcall>
534    </target>    </target>
535    
536    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
537            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
538      <antcall target="tck">      <antcall target="tck">
539        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
540      </antcall>      </antcall>
541    </target>    </target>
542    
543      <target name="tck-security-manager"
544              description="Runs tck with a security manager">
545        <antcall target="tck">
546          <param name="jsr166.useSecurityManager" value="true"/>
547        </antcall>
548      </target>
549    
550    <target name="jtreg"    <target name="jtreg"
551            depends="jar"            depends="jar"
552            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
553      <run-jtreg-tests      <run-jtreg-tests
554         target="${build.main.java.version}"         target="${build.main.java.version}"
555         workdir="${build.dir}"         workdir="${build.dir}"
# Line 552  Line 557 
557    </target>    </target>
558    
559    <target name="test"    <target name="test"
560            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
561            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
562    </target>    </target>
563    
564    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
565    
566      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
567        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
568        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
569      </antcall>  <!--     </antcall> -->
570    
571    </target>  <!--   </target> -->
572    
573    <target name="test89"  <!--   <target name="test89" -->
574            description="Runs tck and jtreg tests for main for multiple java versions">  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
575    
576      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
577      <antcall target="test">  <!--     <antcall target="test"> -->
578        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
579        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
580      </antcall>  <!--     </antcall> -->
581    
582      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
583      <antcall target="test">  <!--     <antcall target="test"> -->
584        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
585        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
586      </antcall>  <!--     </antcall> -->
587    
588    </target>  <!--   </target> -->
589    
590    
591    
# Line 610  Line 615 
615    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
616    
617    
618    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
619            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
620    
621      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
622    
# Line 787  Line 792 
792               access="${build.javadoc.access}"               access="${build.javadoc.access}"
793               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
794               classpath=""               classpath=""
795               executable="${javadoc8}">               executable="${javadoc8}"
796                 failonerror = "true">
797        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
798          <include name="**/*.java"/>          <include name="**/*.java"/>
799        </fileset>        </fileset>
# Line 935  Line 941 
941    </target>    </target>
942    
943    
944      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
945    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
946            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
947    
948      <junit printsummary="true"      <junit printsummary="true"
949             showoutput="true"             showoutput="true"
# Line 992  Line 998 
998               access="${build.javadoc.access}"               access="${build.javadoc.access}"
999               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1000               classpath=""               classpath=""
1001               executable="${javadoc7}">               executable="${javadoc7}"
1002                 failonerror = "true">
1003        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1004          <include name="**/*.java"/>          <include name="**/*.java"/>
1005        </fileset>        </fileset>
# Line 1087  Line 1094 
1094               sourcepath="${topsrc.dir}:${jdk6.src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1095               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1096               source="5"               source="5"
1097               executable="${javadoc7}">               executable="${javadoc7}"
1098                 failonerror = "true">
1099        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1100        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1101    
# Line 1179  Line 1187 
1187               sourcepath="${topsrc.dir}:${jdk6.src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1188               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1189               source="6"               source="6"
1190               executable="${javadoc7}">               executable="${javadoc7}"
1191                 failonerror = "true">
1192        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1193        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1194    
# Line 1392  Line 1401 
1401               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1402               sourcepath="${topsrc.dir}:${jdk6.src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1403               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1404               executable="${javadoc7}">               executable="${javadoc7}"
1405                 failonerror = "true">
1406        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1407        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1408    

Legend:
Removed from v.1.200  
changed lines
  Added in v.1.213

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8