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

Diff of /jsr166/build.xml

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

revision 1.201 by dl, Sat Mar 26 12:35:25 2016 UTC revision 1.205 by jsr166, Sat Mar 26 17:35:47 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    
# Line 406  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 525  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 549  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 558  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 615  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 940  Line 936 
936    </target>    </target>
937    
938    
939      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
940    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit"
941            depends="4jdk7compile"            depends="4jdk7compile">
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
942    
943      <junit printsummary="true"      <junit printsummary="true"
944             showoutput="true"             showoutput="true"

Legend:
Removed from v.1.201  
changed lines
  Added in v.1.205

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