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

Diff of /jsr166/build.xml

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

revision 1.102 by jsr166, Sat Jan 19 20:53:34 2013 UTC revision 1.130 by jsr166, Mon Jan 28 22:00:34 2013 UTC
# Line 25  Line 25 
25  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
26    </description>    </description>
27    
28    <target name="usage" description="Advises user to run with -projecthelp">    <target name="usage" description="Display main targets by running 'ant -projecthelp'">
29      <echo>Run "ant -projecthelp" for full usage information.</echo>      <java classname="org.apache.tools.ant.Main">
30          <arg value="-projecthelp" />
31        </java>
32    </target>    </target>
33    
34    
# Line 35  Line 37 
37    
38    
39    <!-- Compilation options -->    <!-- Compilation options -->
40    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
41    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
42    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
43    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
44      <property name="build.javadoc.access" value="protected"/>
45    
46    <!-- Build locations -->    <!-- Build locations -->
47    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
48    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
49    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
50    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.lib.dir"               location="${build.dir}/lib"/>  
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
51    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
52    
53    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
54    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
55    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
56    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>  
57    
58    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>  
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>  
   
59    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>  
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
   
60    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>  
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
   
61    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
   <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
   <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>  
62    
63    <!-- JDK binary locations -->    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
64      <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
65      <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
66      <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
67    
68      <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
70    
71    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
# Line 81  Line 75 
75      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
76      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
77      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
     <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>  
78      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
79      <property name="bootclasspath@{v}"      <local name="boot.jar.dir"/>
80       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
81        <path id="bootclasspath@{v}">
82          <pathelement path="${boot.jar.dir}/resources.jar"/>
83          <pathelement path="${boot.jar.dir}/rt.jar"/>
84          <pathelement path="${boot.jar.dir}/jsse.jar"/>
85          <pathelement path="${boot.jar.dir}/jce.jar"/>
86          <pathelement path="${boot.jar.dir}/charsets.jar"/>
87        </path>
88        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
89      </sequential>      </sequential>
90    </macrodef>    </macrodef>
91    
92    <defjdklocations v="6"/>    <macrodef name="mirror-dir">
93    <defjdklocations v="7"/>      <attribute name="src"/>
94    <defjdklocations v="8"/>      <attribute name="dst"/>
   
   <macrodef name="run-tck-tests">  
     <attribute name="jvm"/>  
     <attribute name="tck.classes"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
95      <sequential>      <sequential>
96      <java classname="JSR166TestCase"      <delete dir="@{dst}"/>
97            jvm="@{jvm}" fork="true">      <mkdir dir="@{dst}"/>
98          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>      <copy todir="@{dst}" preservelastmodified="true">
99          <jvmarg line="@{jvmflags}"/>        <fileset dir="@{src}"/>
100          <classpath>      </copy>
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{tck.classes}"/>  
         </classpath>  
     </java>  
101      </sequential>      </sequential>
102    </macrodef>    </macrodef>
103    
104      <defjdklocations v="6"/>
105      <defjdklocations v="7"/>
106      <defjdklocations v="8"/>
107    
108    <!-- Source locations -->    <!-- Source locations -->
109    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
110    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 124  Line 119 
119    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
120    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
121    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
   <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>  
122    
123    <!-- Distribution locations -->    <!-- Javadoc locations -->
124    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
125    <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
126    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
127    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
128    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
129    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
130    
131      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
132      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
133      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
134      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
135      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
136      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
137    
138    <!-- Jar locations -->    <!-- Jar locations -->
139    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
140    <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
141    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
142    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
143    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
144    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
145    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
   
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
146    
147    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
148    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
# Line 152  Line 150 
150    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
151    
152    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
153    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
154    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
155    
156      <!-- Default jdk api doc location (latest stable release seems best) -->
157    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158    
159      <!-- Define the "jtreg" task -->
160      <!-- See the docs in "jtreg -onlineHelp" -->
161      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
162               classpath="${lib.dir}/jtreg.jar" />
163    
164    <!-- Test classpath -->    <!-- Test classpath -->
165    <path id="test.classpath">    <path id="test.classpath">
166      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
167      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
168    </path>    </path>
169    
170      <macrodef name="run-tck-tests">
171        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
172        <attribute name="source" default="6"/>
173        <attribute name="target"/>
174        <attribute name="workdir"/>
175        <attribute name="classes"/>
176        <attribute name="jvmflags" default=""/>
177        <sequential>
178    
179        <mkdir dir="@{workdir}/tck-classes"/>
180    
181        <javac srcdir="@{tck.src.dir}"
182               destdir="@{workdir}/tck-classes"
183               debug="${build.debug}"
184               debuglevel="${build.debuglevel}"
185               deprecation="${build.deprecation}"
186               source="@{source}"
187               classpath="${junit.jar}"
188               bootclasspath="@{classes}:${bootclasspath@{source}}"
189               includeAntRuntime="false"
190               includeJavaRuntime="false"
191               executable="${javac@{target}}"
192               fork="true">
193    
194          <include name="*.java"/>
195          <compilerarg value="-XDignore.symbol.file=true"/>
196          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
197          <compilerarg line="${build.args}"/>
198    
199        </javac>
200    
201        <java classname="JSR166TestCase"
202              failonerror="true"
203              jvm="${java@{target}}"
204              fork="true">
205            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
206            <jvmarg line="@{jvmflags}"/>
207            <classpath>
208              <pathelement location="${junit.jar}"/>
209              <pathelement location="@{workdir}/tck-classes"/>
210            </classpath>
211        </java>
212    
213        </sequential>
214      </macrodef>
215    
216    <!-- ALoops classpath -->    <!-- ALoops classpath -->
217    <path id="loops.classpath">    <path id="loops.classpath">
218      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
219    </path>    </path>
220    
221    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
222    <!-- TODO: How do we get &trade to work? -->    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <!-- TODO: Why isn't @jls a "standard" tag? -->  
   <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->  
   <property name="javadoc.jls.cite" value="The Java Language Specification"/>  
223    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
224    
225    <!-- Main targets -->    <!-- Main targets -->
226    
227    <target name="dists"    <target name="dists"
228            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
229            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
230    
231    <target name="compile"    <target name="compile"
# Line 198  Line 246 
246             fork="true">             fork="true">
247    
248        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
249        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
250        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
251        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
252    
253      </javac>      </javac>
   
254    </target>    </target>
255    
256    
   
257    <target name="jar"    <target name="jar"
258            depends="compile"            depends="compile"
259            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
260    
     <mkdir dir="${build.lib.dir}"/>  
   
261      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
262        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
263      </jar>      </jar>
   
264    </target>    </target>
265    
266    
   
267    <target name="test"    <target name="test"
268            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
269            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
270    
271    
   
272    <target name="docs"    <target name="docs"
273            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
274    
275      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
276      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
277    
278      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
279      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
280    
281      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
282               packagenames="none"               packagenames="none"
283               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
284               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
285                 access="${build.javadoc.access}"
286               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
287               classpath=""               classpath=""
288               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
289        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
290          <include name="**/*.java"/>          <include name="**/*.java"/>
291        </fileset>        </fileset>
292          <arg value="-XDignore.symbol.file=true"/>
293          <arg value="-tag"/>
294          <arg value="${javadoc.jls.option}"/>
295      </javadoc>      </javadoc>
   
296    </target>    </target>
297    
298    
   
299    <target name="dist"    <target name="dist"
300            depends="init, dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
301            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
302    
303    
# Line 282  Line 316 
316        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
317        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
318      </jar>      </jar>
   
319    </target>    </target>
320    
321    
   
322    <target name="clean"    <target name="clean"
323            description="Removes all build products">            description="Removes all build products">
324    
325      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
326    
327    </target>    </target>
328    
329    
   
330    <target name="dist-clean"    <target name="dist-clean"
331            description="Removes all build and distribution products">            description="Removes all build and distribution products">
332    
# Line 306  Line 335 
335    </target>    </target>
336    
337    
   
338    <!-- Internal targets -->    <!-- Internal targets -->
339    
340    
   <target name="init">  
   
     <!-- Version is kept in a separate file -->  
     <loadfile property="version" srcFile="version.properties"/>  
     <echo>Building JSR-166 version ${version}</echo>  
     <echo>java.home is ${java.home}</echo>  
   
   </target>  
   
   
341    <target name="dist-jar"    <target name="dist-jar"
342            depends="clean, jar">            depends="clean, jar">
   
343      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
344      </target>
345    
346      <target name="dist-docs"
347              depends="clean, docs">
348        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
349    </target>    </target>
350    
351    
# Line 334  Line 355 
355      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
356    
357      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
358            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
359              debug="${build.debug}"             debug="${build.debug}"
360         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
361        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
362             source="${build.sourcelevel}"             source="6"
363               fork="true">             classpath="${junit.jar}"
364               bootclasspath="@{product.jar}:${bootclasspath6}"
365               includeAntRuntime="false"
366               includeJavaRuntime="false"
367               executable="${javac8}"
368               fork="true">
369    
370        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
371        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
372          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
373        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
374    
375      </javac>      </javac>
376    
377      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
378            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
379              debug="${build.debug}"             debug="${build.debug}"
380         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
381        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
382             source="${build.sourcelevel}"             source="6"
383               fork="true">             classpath=""
384               bootclasspath="@{product.jar}:${bootclasspath6}"
385        <include name="jsr166/test/**"/>             includeAntRuntime="false"
386               includeJavaRuntime="false"
387               executable="${javac8}"
388               fork="true">
389    
390        <compilerarg value="${bootclasspath.args}"/>        <include name="jsr166/test/**/*.java"/>
       <compilerarg line="${build.args}"/>  
391        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
392          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
393        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
394    
395      </javac>      </javac>
396    
# Line 376  Line 403 
403             source="${build.sourcelevel}"             source="${build.sourcelevel}"
404               fork="true">               fork="true">
405    
406        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
407        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
408          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
409    
410      </javac>      </javac>
411  -->  -->
# Line 401  Line 426 
426            errorProperty="junit.failed"            errorProperty="junit.failed"
427          failureProperty="junit.failed"          failureProperty="junit.failed"
428                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
429                        jvm="${java8}"
430                     fork="true">                     fork="true">
431    
432        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
433        <jvmarg value="-server"/>        <jvmarg value="-server"/>
434        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
435    
# Line 504  Line 530 
530    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
531    
532    
533    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
534            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
535    
536      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 532  Line 558 
558    
559    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
560    
   
561    <target name="4jdk7compile"    <target name="4jdk7compile"
562            depends="configure-compiler"            depends="configure-compiler"
563            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 544  Line 569 
569             debug="${build.debug}"             debug="${build.debug}"
570             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
571             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
572             source="1.6"             source="6"
573             classpath=""             classpath=""
574             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
575             includeAntRuntime="false"             includeAntRuntime="false"
# Line 553  Line 578 
578             fork="true">             fork="true">
579    
580        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
581        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
582        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
583          <compilerarg line="${build.args}"/>
584    
585      </javac>      </javac>
586      </target>
587    
588    
589      <mkdir dir="${build.4jdk7.lib.dir}"/>    <target name="4jdk7jar"
590              depends="4jdk7compile"
591              description="Builds library jar from compiled sources">
592    
593      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}">
594        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
595      </jar>      </jar>
596    
     <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="1.6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
   
     </javac>  
   
597    </target>    </target>
598    
599    
600    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
601            depends="4jdk7compile"            depends="4jdk7jar"
602            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
603    
604      <run-tck-tests      <run-tck-tests
605        jvm="${java7}"        target="7"
606        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
607        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}"/>
608    </target>    </target>
609    
610    
# Line 628  Line 636 
636      </junit>      </junit>
637    </target>    </target>
638    
639      <target name="4jdk7-test-jtreg"
640              depends="4jdk7compile"
641              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
642        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
643        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
644        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
645        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
646        <jtreg dir="${jtreg.src.dir}"
647               jdk="${jdk7.home}"
648               workDir="${build.4jdk7.dir}/JTwork"
649               reportDir="${build.4jdk7.dir}/JTreport">
650    
651          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
652          <arg value="-agentvm"/>
653          <arg value="-v:nopass,fail"/>
654          <arg value="-vmoptions:-esa -ea"/>
655          <arg value="-automatic"/>
656          <arg value="-k:!ignore"/>
657        </jtreg>
658      </target>
659    
660    
661      <target name="4jdk7-test"
662              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
663              description="Runs tck and jtreg tests for jsr166-4jdk7">
664      </target>
665    
666    
667    <target name="4jdk7docs"    <target name="4jdk7docs"
668            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
669    
670      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
671      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
672    
673      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
674               packagenames="none"               packagenames="none"
675               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
676               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
677                 access="${build.javadoc.access}"
678               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
679               classpath=""               classpath=""
680               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
681        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
682          <include name="**/*.java"/>          <include name="**/*.java"/>
683        </fileset>        </fileset>
684          <arg value="-XDignore.symbol.file=true"/>
685      </javadoc>      </javadoc>
   
686    </target>    </target>
687    
688    
689    <target name="4jdk7dist"    <target name="4jdk7dist"
690            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
691            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
692    
693    
   
694    <target name="4jdk7clean"    <target name="4jdk7clean"
695            description="Removes all build products">            description="Removes all 4jdk7 build products">
696    
697      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
698    
699    </target>    </target>
700    
701    
   
702    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
703            description="Removes all build and distribution products">            description="Removes all build and distribution products">
704    
705    </target>    </target>
706    
707    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
708            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
709      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
710      </target>
711    
712    
713      <target name="4jdk7dist-docs"
714              depends="4jdk7clean, 4jdk7docs">
715        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
716    </target>    </target>
717    
   <!-- jsr166x -->  
718    
719      <!-- jsr166x -->
720    
721    <target name="jsr166xcompile"    <target name="jsr166xcompile"
722            depends="init, configure-compiler"            depends="configure-compiler"
723            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
724    
725      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
726    
727      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
728            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
729              debug="${build.debug}"             debug="${build.debug}"
730         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
731        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
732             source="${build.sourcelevel}"             classpath=""
733               fork="true">             bootclasspath="${bootclasspath6}"
734               source="5"
735               includeAntRuntime="false"
736               includeJavaRuntime="false"
737               executable="${javac7}"
738               fork="true">
739    
740        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
741        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
742          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
743          <compilerarg line="${build.args}"/>
744    
745      </javac>      </javac>
   
746    </target>    </target>
747    
748    
   
749    <target name="jsr166xjar"    <target name="jsr166xjar"
750            depends="jsr166xcompile"            depends="jsr166xcompile"
751            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
752    
753      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
754          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
755      </jar>      </jar>
756    
757    </target>    </target>
758    
759    
   
760    <target name="jsr166xdocs"    <target name="jsr166xdocs"
761            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
762    
763      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
764      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
765    
766      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
767               packagenames="jsr166x"               packagenames="jsr166x.*"
768               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
769               source="${build.sourcelevel}"               access="${build.javadoc.access}"
770               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
771               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
772                 source="5"
773                 executable="${javadoc7}">
774          <arg value="-XDignore.symbol.file=true"/>
775    
776        </javadoc>
777    </target>    </target>
778    
779    
780    <target name="jsr166xdist"    <target name="jsr166xdist"
781            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-jar, jsr166xdist-docs"
782            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
783    
784    
   
785    <target name="jsr166xclean"    <target name="jsr166xclean"
786            description="Removes all build products">            description="Removes all jsr166x build products">
787    
788      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
789    
790    </target>    </target>
791    
792    
   
793    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
794            description="Removes all build and distribution products">            description="Removes all build and distribution products">
795    
796    </target>    </target>
797    
798    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166xjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
              packagenames="jsr166x"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
799    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
800            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
801        <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
802      </target>
803    
804      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166xdist-docs"
805              depends="jsr166xclean, jsr166xdocs">
806        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
807    </target>    </target>
808    
809    <!-- jsr166y -->    <!-- jsr166y -->
810    
811    
812    <target name="jsr166ycompile"    <target name="jsr166ycompile"
813            depends="init, configure-compiler"            depends="configure-compiler"
814            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
815    
816      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
817    
818      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
819            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
820              debug="${build.debug}"             debug="${build.debug}"
821         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
822        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
823             source="${build.sourcelevel}"             source="6"
824               fork="true">             classpath=""
825               bootclasspath="${bootclasspath6}"
826               includeAntRuntime="false"
827               includeJavaRuntime="false"
828               executable="${javac7}"
829               fork="true">
830    
831        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
832        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
833        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
834          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
835    
836      </javac>      </javac>
   
837    </target>    </target>
838    
839    
   
840    <target name="jsr166yjar"    <target name="jsr166yjar"
841            depends="jsr166ycompile"            depends="jsr166ycompile"
842            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
843    
844      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
845          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
846      </jar>      </jar>
847    
848    </target>    </target>
849    
850    
   
851    <target name="jsr166ydocs"    <target name="jsr166ydocs"
852            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
853    
854      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
855      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
856    
857      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
858               packagenames="jsr166y"               packagenames="jsr166y.*"
859               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
860               source="${build.sourcelevel}"               access="${build.javadoc.access}"
861               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
862               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
863                 source="6"
864                 executable="${javadoc7}">
865          <arg value="-XDignore.symbol.file=true"/>
866    
867        </javadoc>
868    </target>    </target>
869    
870    
871    <target name="jsr166ydist"    <target name="jsr166ydist"
872            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-jar, jsr166ydist-docs"
873            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
874    
875    
   
876    <target name="jsr166yclean"    <target name="jsr166yclean"
877            description="Removes all build products">            description="Removes all jsr166y build products">
878    
879      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
880    
881    </target>    </target>
882    
883    
   
884    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
885            description="Removes all build and distribution products">            description="Removes all build and distribution products">
886    
887    </target>    </target>
888    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166yjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"  
              packagenames="jsr166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
889    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
890            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
891        <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
892      </target>
893    
894      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166ydist-docs"
895              depends="jsr166yclean, jsr166ydocs">
896        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
897    </target>    </target>
898    
899    
# Line 888  Line 901 
901    
902    
903    <target name="extra166ycompile"    <target name="extra166ycompile"
904            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
905            description="Compiles extra166y sources">            description="Compiles extra166y sources">
906    
907      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
908    
909      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
910            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
911              debug="${build.debug}"             debug="${build.debug}"
912              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
913         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
914        deprecation="${build.deprecation}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
915             source="${build.sourcelevel}"             classpath=""
916               fork="true">             source="6"
917               includeAntRuntime="false"
918               includeJavaRuntime="false"
919               executable="${javac7}"
920               fork="true">
921    
922        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
923        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
924        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
925          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
926    
927      </javac>      </javac>
   
928    </target>    </target>
929    
930    
   
931    <target name="extra166yjar"    <target name="extra166yjar"
932            depends="extra166ycompile"            depends="extra166ycompile"
933            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
934    
935      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
936          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
937      </jar>      </jar>
938    
939    </target>    </target>
940    
941    
   
942    <target name="extra166ydocs"    <target name="extra166ydocs"
943            description="Builds javadocs with custom tags to build dir">            description="Builds javadocs to build dir">
944    
945      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
946      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
947    
948      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
949               packagenames="extra166y"               packagenames="extra166y.*"
950               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
951               source="${build.sourcelevel}"               access="${build.javadoc.access}"
952               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
953               additionalparam="-XDignore.symbol.file=true" />               bootclasspath="${bootclasspath6}"
954                 source="6"
955                 executable="${javadoc7}">
956          <arg value="-XDignore.symbol.file=true"/>
957    
958        </javadoc>
959    </target>    </target>
960    
961    
962    <target name="extra166ydist"    <target name="extra166ydist"
963            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-jar, extra166ydist-docs"
964            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
965    
966    
   
967    <target name="extra166yclean"    <target name="extra166yclean"
968            description="Removes all build products">            description="Removes all extra166y build products">
969    
970      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
971    
972    </target>    </target>
973    
974    
   
975    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
976            description="Removes all build and distribution products">            description="Removes all build and distribution products">
977    
978    </target>    </target>
979    
   <target name="extra166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.extra166yjavadocs.dir}"/>  
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.extra166yjavadocs.dir}"  
              packagenames="extra166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
980    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
981            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
982        <copy file="${extra166y.jar}" todir="${dist.dir}"/>
983      </target>
984    
985      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>    <target name="extra166ydist-docs"
986              depends="extra166yclean, extra166ydocs">
987        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
988    </target>    </target>
989    
990    <!-- jsr166e -->    <!-- jsr166e -->
# Line 994  Line 993 
993            depends="configure-compiler"            depends="configure-compiler"
994            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
995    
996      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
997    
998      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
999             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
1000             debug="${build.debug}"             debug="${build.debug}"
1001             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1002             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1003             source="1.7"             source="7"
1004             classpath=""             classpath=""
1005             includeAntRuntime="false"             includeAntRuntime="false"
1006             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1009  Line 1008 
1008             fork="true">             fork="true">
1009    
1010        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1011        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1012        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1013          <compilerarg line="${build.args}"/>
1014    
1015      </javac>      </javac>
   
1016    </target>    </target>
1017    
1018    
   
1019    <target name="jsr166ejar"    <target name="jsr166ejar"
1020            depends="jsr166ecompile"            depends="jsr166ecompile"
1021            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1022    
1023      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
1024          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
1025      </jar>      </jar>
1026    
1027    </target>    </target>
1028    
1029    
   
1030    <target name="jsr166edocs"    <target name="jsr166edocs"
1031            description="Builds javadocs with custom tags to build dir">            description="Builds javadocs to build dir">
1032    
1033      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1034      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1035    
1036      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1037               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
1038               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
1039               source="1.7"               access="${build.javadoc.access}"
1040               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1041               executable="${javadoc7}"               source="7"
1042               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
1043        <fileset dir="${topsrc.dir}" defaultexcludes="yes">        <arg value="-XDignore.symbol.file=true"/>
1044          <include name="jsr166e/**/*.java"/>  
       </fileset>  
1045      </javadoc>      </javadoc>
1046      </target>
1047    
1048    
1049      <target name="jsr166e-test-tck"
1050              depends="jsr166ejar"
1051              description="Runs tck tests for jsr166e">
1052    
1053        <run-tck-tests
1054          tck.src.dir="${test.src.dir}/tck-jsr166e"
1055          source="7"
1056          target="8"
1057          workdir="${build.jsr166e.dir}"
1058          classes="${jsr166e.jar}"/>
1059    </target>    </target>
1060    
1061    
1062    <target name="jsr166edist"    <target name="jsr166edist"
1063            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
1064            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1065    
1066    
   
1067    <target name="jsr166eclean"    <target name="jsr166eclean"
1068            description="Removes all build products">            description="Removes all jsr166e build products">
   
1069      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
   
1070    </target>    </target>
1071    
1072    
   
1073    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1074            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1075    
1076    </target>    </target>
1077    
1078    <target name="jsr166edist-docs"    <target name="jsr166edist-jar"
1079            description="Builds javadocs to dist dir">            depends="jsr166eclean, jsr166ejar">
1080        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1081      <delete dir="${dist.jsr166ejavadocs.dir}"/>    </target>
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapidocs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
1082    
1083      <target name="jsr166edist-docs"
1084              depends="jsr166eclean, jsr166edocs">
1085        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1086    </target>    </target>
1087    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
1088    
1089      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1090    
1091      <target name="lint">
1092        <antcall target="dists">
1093          <param name="build.javadoc.access" value="private"/>
1094        </antcall>
1095    </target>    </target>
1096    
1097    
1098  </project>  </project>

Legend:
Removed from v.1.102  
changed lines
  Added in v.1.130

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