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

Diff of /jsr166/build.xml

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

revision 1.132 by jsr166, Fri Feb 1 21:58:27 2013 UTC revision 1.139 by jsr166, Thu May 2 21:38:03 2013 UTC
# Line 44  As of 2013-02, the very latest lambda 8 Line 44  As of 2013-02, the very latest lambda 8
44    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
45    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
46    
47      <!-- Tck options; see JSR166TestCase.java -->
48      <!-- Use via, e.g. ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49      <property name="jsr166.profileTests"     value="false"/>
50      <property name="jsr166.profileThreshold" value="100"/>
51      <property name="jsr166.runsPerTest"      value="1"/>
52    
53    <!-- Build locations -->    <!-- Build locations -->
54    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
55    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 170  As of 2013-02, the very latest lambda 8 Line 176  As of 2013-02, the very latest lambda 8
176    
177    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
178      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
179      <attribute name="target"/>      <attribute name="target"/>
180        <attribute name="compile-target" default="@{target}"/>
181      <attribute name="workdir"/>      <attribute name="workdir"/>
182      <attribute name="classes"/>      <attribute name="classes"/>
183      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
# Line 185  As of 2013-02, the very latest lambda 8 Line 191  As of 2013-02, the very latest lambda 8
191             debug="${build.debug}"             debug="${build.debug}"
192             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
193             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
194             source="@{source}"             source="@{compile-target}"
195               target="@{compile-target}"
196             classpath="${junit.jar}"             classpath="${junit.jar}"
197             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
198             includeAntRuntime="false"             includeAntRuntime="false"
199             includeJavaRuntime="false"             includeJavaRuntime="false"
200             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
201             fork="true">             fork="true">
202    
203        <include name="*.java"/>        <include name="*.java"/>
# Line 207  As of 2013-02, the very latest lambda 8 Line 214  As of 2013-02, the very latest lambda 8
214            fork="true">            fork="true">
215          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
216          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
217            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
218            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
219            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
220          <classpath>          <classpath>
221            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
222            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 216  As of 2013-02, the very latest lambda 8 Line 226  As of 2013-02, the very latest lambda 8
226      </sequential>      </sequential>
227    </macrodef>    </macrodef>
228    
229      <macrodef name="run-jtreg-tests">
230        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
231        <attribute name="source" default="7"/>
232        <attribute name="target"/>
233        <attribute name="workdir"/>
234        <attribute name="classes"/>
235        <attribute name="jtregflags" default=""/>
236        <sequential>
237        <delete dir="@{workdir}/JTwork"   quiet="true"/>
238        <delete dir="@{workdir}/JTreport" quiet="true"/>
239        <mkdir dir="@{workdir}/JTwork/scratch"/>
240        <mkdir dir="@{workdir}/JTreport"/>
241        <jtreg dir="@{jtreg.src.dir}"
242               jdk="${jdk@{target}.home}"
243               workDir="@{workdir}/JTwork"
244               reportDir="@{workdir}/JTreport">
245    
246          <arg value="-Xbootclasspath/p:@{classes}"/>
247          <arg value="-agentvm"/>
248          <arg value="-v:nopass,fail"/>
249          <arg value="-vmoptions:-esa -ea"/>
250          <arg value="-automatic"/>
251          <arg value="-k:!ignore"/>
252          <arg line="@{jtregflags}"/>
253        </jtreg>
254        </sequential>
255      </macrodef>
256    
257    <!-- ALoops classpath -->    <!-- ALoops classpath -->
258    <path id="loops.classpath">    <path id="loops.classpath">
259      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 249  As of 2013-02, the very latest lambda 8 Line 287  As of 2013-02, the very latest lambda 8
287             fork="true">             fork="true">
288    
289        <include name="**/*.java"/>        <include name="**/*.java"/>
290          <compilerarg value="-Xprefer:source"/>
291        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
292        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
293        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 425  As of 2013-02, the very latest lambda 8 Line 464  As of 2013-02, the very latest lambda 8
464        classes="${product.jar}"/>        classes="${product.jar}"/>
465    </target>    </target>
466    
467      <target name="test-jtreg"
468              depends="jar"
469              description="Runs jtreg tests for main using the jtreg ant task">
470        <run-jtreg-tests
471           target="8"
472           workdir="${build.dir}"
473           classes="${product.jar}"/>
474      </target>
475    
476      <target name="test-ng"
477              depends="test-tck, test-jtreg"
478              description="Runs tck and jtreg tests for main">
479      </target>
480    
481    <target name="run-tests"    <target name="run-tests"
482            depends="compile-tests">            depends="compile-tests">
483    
# Line 590  As of 2013-02, the very latest lambda 8 Line 643  As of 2013-02, the very latest lambda 8
643             fork="true">             fork="true">
644    
645        <include name="**/*.java"/>        <include name="**/*.java"/>
646          <compilerarg value="-Xprefer:source"/>
647        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
648        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
649        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 618  As of 2013-02, the very latest lambda 8 Line 672  As of 2013-02, the very latest lambda 8
672        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
673        classes="${4jdk7product.jar}">        classes="${4jdk7product.jar}">
674        <javac-elements>        <javac-elements>
675            <!-- JDK8+ test classes -->
676            <exclude name="*8Test.java"/>
677            <exclude name="DoubleAccumulatorTest.java"/>
678            <exclude name="DoubleAdderTest.java"/>
679            <exclude name="LongAccumulatorTest.java"/>
680            <exclude name="LongAdderTest.java"/>
681            <exclude name="CompletableFutureTest.java"/>
682          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
683        </javac-elements>        </javac-elements>
684      </run-tck-tests>      </run-tck-tests>
# Line 653  As of 2013-02, the very latest lambda 8 Line 714  As of 2013-02, the very latest lambda 8
714    </target>    </target>
715    
716    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
717            depends="4jdk7compile"            depends="4jdk7jar"
718            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
719      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
720      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
721      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
722      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"/>
     <jtreg dir="${jtreg.src.dir}"  
            jdk="${jdk7.home}"  
            workDir="${build.4jdk7.dir}/JTwork"  
            reportDir="${build.4jdk7.dir}/JTreport">  
   
       <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>  
       <arg value="-agentvm"/>  
       <arg value="-v:nopass,fail"/>  
       <arg value="-vmoptions:-esa -ea"/>  
       <arg value="-automatic"/>  
       <arg value="-k:!ignore"/>  
     </jtreg>  
723    </target>    </target>
724    
725    
# Line 1068  As of 2013-02, the very latest lambda 8 Line 1117  As of 2013-02, the very latest lambda 8
1117    
1118      <run-tck-tests      <run-tck-tests
1119        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1120        source="7"        target="7"
       target="8"  
1121        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1122        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1123    </target>    </target>

Legend:
Removed from v.1.132  
changed lines
  Added in v.1.139

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