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

Diff of /jsr166/build.xml

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

revision 1.115 by jsr166, Sun Jan 20 06:11:07 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 548  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    

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

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