ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.120 by jsr166, Mon Jan 21 02:34:44 2013 UTC vs.
Revision 1.124 by jsr166, Tue Jan 22 21:22:57 2013 UTC

# Line 106 | Line 106
106    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
107  
108    <!-- Distribution locations -->
109 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
110 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
111 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
112 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
113 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
114 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
109 >  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>
110 >  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
111 >  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
112 >  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
113 >  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
114 >  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
115  
116    <!-- Jar locations -->
117    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128 | Line 128
128    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
129  
130    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
131 <  <!-- The below does not yet exist as of 2012-11 -->
131 >  <!-- The below does not yet exist as of 2013-01 -->
132    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
133  
134    <!-- Default jdk api doc location (latest stable release seems best) -->
# Line 146 | Line 146
146    </path>
147  
148    <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"/>
152      <attribute name="workdir"/>
153 <    <attribute name="product.jar" default="${product.jar}"/>
153 >    <attribute name="classes"/>
154      <attribute name="jvmflags" default=""/>
155      <sequential>
156  
157      <mkdir dir="@{workdir}/tck-classes"/>
158  
159 <    <javac srcdir="${tck.src.dir}"
159 >    <javac srcdir="@{tck.src.dir}"
160             destdir="@{workdir}/tck-classes"
161             debug="${build.debug}"
162             debuglevel="${build.debuglevel}"
163             deprecation="${build.deprecation}"
164 <           source="6"
164 >           source="@{source}"
165             classpath="${junit.jar}"
166 <           bootclasspath="@{product.jar}:${bootclasspath6}"
166 >           bootclasspath="@{classes}:${bootclasspath@{source}}"
167             includeAntRuntime="false"
168             includeJavaRuntime="false"
169             executable="${javac@{target}}"
170             fork="true">
171  
172 <      <include name="JSR166TestCase.java"/>
172 >      <include name="*.java"/>
173        <compilerarg value="-XDignore.symbol.file=true"/>
174        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
175        <compilerarg line="${build.args}"/>
# Line 178 | Line 180
180            failonerror="true"
181            jvm="${java@{target}}"
182            fork="true">
183 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
183 >        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
184          <jvmarg line="@{jvmflags}"/>
185          <classpath>
186            <pathelement location="${junit.jar}"/>
# Line 576 | Line 578
578      <run-tck-tests
579        target="7"
580        workdir="${build.4jdk7.dir}"
581 <      product.jar="${4jdk7product.jar}"/>
581 >      classes="${4jdk7product.jar}"/>
582    </target>
583  
584  
# Line 1000 | Line 1002
1002    </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"
1019            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1020            description="Puts all distributable products in single hierarchy"/>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines