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

Diff of /jsr166/build.xml

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

revision 1.121, Mon Jan 21 22:03:09 2013 UTC revision 1.122, Mon Jan 21 23:09:26 2013 UTC
# Line 146  Line 146 
146    </path>    </path>
147    
148    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
149        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
150        <attribute name="source" default="6"/>
151      <attribute name="target"/>      <attribute name="target"/>
152      <attribute name="workdir"/>      <attribute name="workdir"/>
153      <attribute name="product.jar" default="${product.jar}"/>      <attribute name="classes"/>
154      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
155      <sequential>      <sequential>
156    
157      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
158    
159      <javac srcdir="${tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
160             destdir="@{workdir}/tck-classes"             destdir="@{workdir}/tck-classes"
161             debug="${build.debug}"             debug="${build.debug}"
162             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
163             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
164             source="6"             source="@{source}"
165             classpath="${junit.jar}"             classpath="${junit.jar}"
166             bootclasspath="@{product.jar}:${bootclasspath6}"             bootclasspath="@{classes}:${bootclasspath@{source}}"
167             includeAntRuntime="false"             includeAntRuntime="false"
168             includeJavaRuntime="false"             includeJavaRuntime="false"
169             executable="${javac@{target}}"             executable="${javac@{target}}"
# Line 178  Line 180 
180            failonerror="true"            failonerror="true"
181            jvm="${java@{target}}"            jvm="${java@{target}}"
182            fork="true">            fork="true">
183          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
184          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
185          <classpath>          <classpath>
186            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
# Line 576  Line 578 
578      <run-tck-tests      <run-tck-tests
579        target="7"        target="7"
580        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
581        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}"/>
582    </target>    </target>
583    
584    
# Line 1000  Line 1002 
1002    </target>    </target>
1003    
1004    
1005      <target name="jsr166e-test-tck"
1006              depends="jsr166e-jar"
1007              description="Runs tck tests for jsr166e">
1008    
1009        <run-tck-tests
1010          tck.src.dir="${test.src.dir}/tck-jsr166e"
1011          source="7"
1012          target="8"
1013          workdir="${build.jsr166e.dir}"
1014          classes="${jsr166e.jar}"/>
1015      </target>
1016    
1017    
1018    <target name="jsr166edist"    <target name="jsr166edist"
1019            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1020            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>

Legend:
Removed from v.1.121  
changed lines
  Added in v.1.122

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8