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

Diff of /jsr166/build.xml

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

revision 1.114 by jsr166, Sun Jan 20 04:44:26 2013 UTC revision 1.117 by jsr166, Sun Jan 20 07:43:30 2013 UTC
# Line 84  Line 84 
84    <defjdklocations v="8"/>    <defjdklocations v="8"/>
85    
86    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
87      <attribute name="jvm"/>      <attribute name="target"/>
88      <attribute name="tck.classes"/>      <attribute name="workdir"/>
89      <attribute name="product.jar" default="${product.jar}"/>      <attribute name="product.jar" default="${product.jar}"/>
90      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
91      <sequential>      <sequential>
92    
93        <mkdir dir="@{workdir}/tck-classes"/>
94    
95        <javac srcdir="${tck.src.dir}"
96               destdir="@{workdir}/tck-classes"
97               debug="${build.debug}"
98               debuglevel="${build.debuglevel}"
99               deprecation="${build.deprecation}"
100               source="6"
101               classpath="${junit.jar}"
102               bootclasspath="@{product.jar}:${bootclasspath6}"
103               includeAntRuntime="false"
104               includeJavaRuntime="false"
105               executable="${javac@{target}}"
106               fork="true">
107    
108          <include name="**/*.java"/>
109          <compilerarg value="-XDignore.symbol.file=true"/>
110          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111          <compilerarg line="${build.args}"/>
112        </javac>
113    
114      <java classname="JSR166TestCase"      <java classname="JSR166TestCase"
115            jvm="@{jvm}" fork="true">            failonerror="true"
116              jvm="${java@{target}}"
117              fork="true">
118          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
119          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
120          <classpath>          <classpath>
121            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
122            <pathelement location="@{tck.classes}"/>            <pathelement location="@{workdir}/tck-classes"/>
123          </classpath>          </classpath>
124      </java>      </java>
125    
126      </sequential>      </sequential>
127    </macrodef>    </macrodef>
128    
# Line 148  Line 173 
173    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
174    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
175    
176      <!-- Define the "jtreg" task -->
177      <!-- See the docs in "jtreg -onlineHelp" -->
178      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
179               classpath="${lib.dir}/jtreg.jar" />
180    
181    <!-- Test classpath -->    <!-- Test classpath -->
182    <path id="test.classpath">    <path id="test.classpath">
183      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 543  Line 573 
573    
574      </javac>      </javac>
575    
576      <jar destfile="${4jdk7product.jar}" index="true">    </target>
       <fileset dir="${build.4jdk7.classes.dir}"/>  
     </jar>  
   
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.4jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
577    
578        <include name="**/*.java"/>    <target name="4jdk7-jar"
579        <compilerarg line="${build.args}"/>            depends="4jdk7compile"
580        <compilerarg value="-XDignore.symbol.file=true"/>            description="Builds library jar from compiled sources">
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
581    
582      </javac>      <jar destfile="${4jdk7product.jar}">
583          <fileset dir="${build.4jdk7.classes.dir}"/>
584        </jar>
585    
586    </target>    </target>
587    
588    
589    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
590            depends="4jdk7compile"            depends="4jdk7-jar"
591            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
592    
593      <run-tck-tests      <run-tck-tests
594        jvm="${java7}"        target="7"
595        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
596        product.jar="${4jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
597    </target>    </target>
598    
# Line 610  Line 625 
625      </junit>      </junit>
626    </target>    </target>
627    
628      <target name="4jdk7-test-jtreg"
629              depends="4jdk7compile"
630              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
631        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
632        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
633        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
634        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
635        <jtreg dir="${jtreg.src.dir}"
636               jdk="${jdk7.home}"
637               workDir="${build.4jdk7.dir}/JTwork"
638               reportDir="${build.4jdk7.dir}/JTreport">
639    
640          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
641          <arg value="-agentvm"/>
642          <arg value="-v:nopass,fail"/>
643          <arg value="-vmoptions:-esa -ea"/>
644          <arg value="-automatic"/>
645          <arg value="-k:!ignore"/>
646        </jtreg>
647      </target>
648    
649    
650      <target name="4jdk7-test"
651              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
652              description="Runs tck and jtreg tests for jsr166-4jdk7">
653      </target>
654    
655    
656    <target name="4jdk7docs"    <target name="4jdk7docs"
657            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
# Line 718  Line 760 
760               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
761               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
762               executable="${javadoc7}"               executable="${javadoc7}"
763               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
764    
765    </target>    </target>
766    
# Line 806  Line 848 
848               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
849               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
850               executable="${javadoc7}"               executable="${javadoc7}"
851               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
852    
853    </target>    </target>
854    
# Line 897  Line 939 
939               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
940               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
941               executable="${javadoc7}"               executable="${javadoc7}"
942               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
943    
944    </target>    </target>
945    

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.117

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