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

Diff of /jsr166/build.xml

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

revision 1.202 by jsr166, Sat Mar 26 15:10:14 2016 UTC revision 1.206 by jsr166, Sun Mar 27 19:38:01 2016 UTC
# Line 407  Line 407 
407        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
408    
409      </javac>      </javac>
   
     <!-- We need jdk9's Contended annotation, but at compile time only -->  
     <!--  
         <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>  
     -->  
410    </target>    </target>
411    
412    
413    <target name="jar"    <target name="jar"
414            depends="compile"            depends="compile"
415            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
416    
417      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
418        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
# Line 526  Line 521 
521    
522    <target name="tck"    <target name="tck"
523            depends="jar"            depends="jar"
524            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
525    
526      <run-tck-tests      <run-tck-tests
527        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 550  Line 545 
545    
546    <target name="jtreg"    <target name="jtreg"
547            depends="jar"            depends="jar"
548            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
549      <run-jtreg-tests      <run-jtreg-tests
550         target="${build.main.java.version}"         target="${build.main.java.version}"
551         workdir="${build.dir}"         workdir="${build.dir}"
# Line 559  Line 554 
554    
555    <target name="test"    <target name="test"
556            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, jtreg"
557            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
558    </target>    </target>
559    
560    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
561    
562      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
563        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
564        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
565      </antcall>  <!--     </antcall> -->
566    
567    </target>  <!--   </target> -->
568    
569    <target name="test89"  <!--   <target name="test89" -->
570            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"> -->
571    
572      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
573      <antcall target="test">  <!--     <antcall target="test"> -->
574        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
575        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
576      </antcall>  <!--     </antcall> -->
577    
578      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
579      <antcall target="test">  <!--     <antcall target="test"> -->
580        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
581        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
582      </antcall>  <!--     </antcall> -->
583    
584    </target>  <!--   </target> -->
585    
586    
587    
# Line 616  Line 611 
611    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
612    
613    
614    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
615            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
616    
617      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
618    
# Line 793  Line 788 
788               access="${build.javadoc.access}"               access="${build.javadoc.access}"
789               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
790               classpath=""               classpath=""
791               executable="${javadoc8}">               executable="${javadoc8}"
792                 failonerror = "true">
793        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
794          <include name="**/*.java"/>          <include name="**/*.java"/>
795        </fileset>        </fileset>
# Line 941  Line 937 
937    </target>    </target>
938    
939    
940      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
941    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
942            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
943    
944      <junit printsummary="true"      <junit printsummary="true"
945             showoutput="true"             showoutput="true"
# Line 998  Line 994 
994               access="${build.javadoc.access}"               access="${build.javadoc.access}"
995               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
996               classpath=""               classpath=""
997               executable="${javadoc7}">               executable="${javadoc7}"
998                 failonerror = "true">
999        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1000          <include name="**/*.java"/>          <include name="**/*.java"/>
1001        </fileset>        </fileset>
# Line 1093  Line 1090 
1090               sourcepath="${topsrc.dir}:${jdk6.src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1091               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1092               source="5"               source="5"
1093               executable="${javadoc7}">               executable="${javadoc7}"
1094                 failonerror = "true">
1095        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1096        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1097    
# Line 1185  Line 1183 
1183               sourcepath="${topsrc.dir}:${jdk6.src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1184               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1185               source="6"               source="6"
1186               executable="${javadoc7}">               executable="${javadoc7}"
1187                 failonerror = "true">
1188        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1189        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1190    
# Line 1398  Line 1397 
1397               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1398               sourcepath="${topsrc.dir}:${jdk6.src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1399               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1400               executable="${javadoc7}">               executable="${javadoc7}"
1401                 failonerror = "true">
1402        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1403        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1404    

Legend:
Removed from v.1.202  
changed lines
  Added in v.1.206

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27