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

Diff of /jsr166/build.xml

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

revision 1.96 by jsr166, Mon Jan 14 21:06:16 2013 UTC revision 1.118 by jsr166, Mon Jan 21 01:05:01 2013 UTC
# Line 8  Line 8 
8    
9    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
11    
12      The repository contains all dependencies except for ant and the JDK
13      itself.  Because the JDK version matters and because different
14      targets require different JDKs, we assume that users have created a
15      hierarchy containing:
16      $HOME/jdk/jdk6
17      $HOME/jdk/jdk7
18      $HOME/jdk/jdk8
19      where each of the above is a JDK or a symlink to same, and
20      $HOME/jdk/src/jdk6
21      $HOME/jdk/src/jdk7
22      $HOME/jdk/src/jdk8
23      where each of the above is a complete JDK source tree
24      (e.g. mercurial forest) or a symlink to same.
25  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
26    </description>    </description>
27    
# Line 21  Line 35 
35    
36    
37    <!-- Compilation options -->    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 31  Line 45 
45    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
46    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47    <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"/>  
48    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
49    
50    <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53    <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54    
55    <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"/>  
   
56    <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"/>  
   
57    <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"/>  
   
58    <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"/>  
59    
60    <!-- JDK binary locations -->    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61      <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62      <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63      <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64    
65      <!-- JDK locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
67    
68    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
69      <attribute name="v"/>      <attribute name="v"/>
70      <sequential>      <sequential>
71      <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
72      <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
73      <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
74      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
75      <property name="bootclasspath@{v}"        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>      <local name="boot.jar.dir"/>
77        <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
78        <path id="bootclasspath@{v}">
79          <pathelement path="${boot.jar.dir}/resources.jar"/>
80          <pathelement path="${boot.jar.dir}/rt.jar"/>
81          <pathelement path="${boot.jar.dir}/jsse.jar"/>
82          <pathelement path="${boot.jar.dir}/jce.jar"/>
83          <pathelement path="${boot.jar.dir}/charsets.jar"/>
84        </path>
85        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
86      </sequential>      </sequential>
87    </macrodef>    </macrodef>
88    
# Line 84  Line 99 
99    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
100    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
101    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
102    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
103    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
104    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
105    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
106    <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"/>  
107    
108    <!-- Distribution locations -->    <!-- Distribution locations -->
109    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
110    <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
111    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
112    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
113    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
114    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
115    
116    <!-- Jar locations -->    <!-- Jar locations -->
117    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
118    <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
119    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
120    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
121    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
122    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
123    <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}"/>  
124    
125    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
126    <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 119  Line 130 
130    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
131    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2012-11 -->
132    <!-- <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/"/> -->
133    
134      <!-- Default jdk api doc location (latest stable release seems best) -->
135    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
136    
137      <!-- Define the "jtreg" task -->
138      <!-- See the docs in "jtreg -onlineHelp" -->
139      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
140               classpath="${lib.dir}/jtreg.jar" />
141    
142    <!-- Test classpath -->    <!-- Test classpath -->
143    <path id="test.classpath">    <path id="test.classpath">
144      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
145      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
146    </path>    </path>
147    
148      <macrodef name="run-tck-tests">
149        <attribute name="target"/>
150        <attribute name="workdir"/>
151        <attribute name="product.jar" default="${product.jar}"/>
152        <attribute name="jvmflags" default=""/>
153        <sequential>
154    
155        <mkdir dir="@{workdir}/tck-classes"/>
156    
157        <javac srcdir="${tck.src.dir}"
158               destdir="@{workdir}/tck-classes"
159               debug="${build.debug}"
160               debuglevel="${build.debuglevel}"
161               deprecation="${build.deprecation}"
162               source="6"
163               classpath="${junit.jar}"
164               includeAntRuntime="false"
165               includeJavaRuntime="false"
166               executable="${javac@{target}}"
167               fork="true">
168    
169          <include name="**/*.java"/>
170          <bootclasspath path="@{product.jar}"/>
171          <bootclasspath path="${bootclasspath6}"/>
172          <compilerarg value="-XDignore.symbol.file=true"/>
173          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
174          <compilerarg line="${build.args}"/>
175    
176        </javac>
177    
178        <java classname="JSR166TestCase"
179              failonerror="true"
180              jvm="${java@{target}}"
181              fork="true">
182            <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
183            <jvmarg line="@{jvmflags}"/>
184            <classpath>
185              <pathelement location="${junit.jar}"/>
186              <pathelement location="@{workdir}/tck-classes"/>
187            </classpath>
188        </java>
189    
190        </sequential>
191      </macrodef>
192    
193    <!-- ALoops classpath -->    <!-- ALoops classpath -->
194    <path id="loops.classpath">    <path id="loops.classpath">
195      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
196    </path>    </path>
197    
198      <!-- Support @jls tag, used in jdk8+ javadoc -->
199      <!-- TODO: How do we get &trade to work? -->
200      <!-- TODO: Why isn't @jls a "standard" tag? -->
201      <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
202      <property name="javadoc.jls.cite" value="The Java Language Specification"/>
203      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
204    
205    <!-- Main targets -->    <!-- Main targets -->
206    
207    <target name="dists"    <target name="dists"
208            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
209            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
210    
211    <target name="compile"    <target name="compile"
212            depends="init, configure-compiler"            depends="configure-compiler"
213            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
214    
215      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
216    
217      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
218            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
219              debug="${build.debug}"             debug="${build.debug}"
220         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
221        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
222             source="${build.sourcelevel}"             classpath=""
223               fork="true">             includeAntRuntime="false"
224               includeJavaRuntime="false"
225               executable="${javac8}"
226               fork="true">
227    
228        <include name="**/*.java"/>        <include name="**/*.java"/>
229        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
230          <compilerarg value="-Xlint:all"/>
 <!--  
       <exclude name="java/lang/**"/>  
231        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
232    
233      </javac>      </javac>
   
234    </target>    </target>
235    
236    
   
237    <target name="jar"    <target name="jar"
238            depends="compile"            depends="compile"
239            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
240    
     <mkdir dir="${build.lib.dir}"/>  
   
241      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
242        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
243      </jar>      </jar>
   
244    </target>    </target>
245    
246    
   
247    <target name="test"    <target name="test"
248            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
249            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)" />
250    
251    
   
252    <target name="docs"    <target name="docs"
253            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
254    
255      <delete dir="${build.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
256      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
257    
258      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
259      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
260    
261      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${dist.javadocs.dir}"
262               packagenames="none"               packagenames="none"
263               link="${jdkapidocs.url}"               link="${jdkapi8docs.url}"
264               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
265               sourcepath="${src.dir}:${jdksrc.dir}"               classpath=""
266               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc8}">
267          <sourcepath path="${src.dir}"/>
268          <sourcepath path="${jdk8src.dir}"/>
269          <arg value="-XDignore.symbol.file=true"/>
270          <arg value="-tag"/>
271          <arg value="${javadoc.jls.option}"/>
272        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
273          <include name="**/*.java"/>          <include name="**/*.java"/>
274        </fileset>        </fileset>
275      </javadoc>      </javadoc>
   
276    </target>    </target>
277    
278    
   
279    <target name="dist"    <target name="dist"
280            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, docs"
281            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
282    
283    
# Line 232  Line 296 
296        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
297        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
298      </jar>      </jar>
   
299    </target>    </target>
300    
301    
   
302    <target name="clean"    <target name="clean"
303            description="Removes all build products">            description="Removes all build products">
304    
305      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
306    
307    </target>    </target>
308    
309    
   
310    <target name="dist-clean"    <target name="dist-clean"
311            description="Removes all build and distribution products">            description="Removes all build and distribution products">
312    
# Line 256  Line 315 
315    </target>    </target>
316    
317    
   
   <target name="dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.javadocs.dir}"/>  
     <mkdir dir="${dist.javadocs.dir}"/>  
   
     <!-- the packagenames="none" hack below prevents scanning the -->  
     <!-- sourcepath for packages -->  
   
     <javadoc destdir="${dist.javadocs.dir}"  
              packagenames="none"  
              link="${jdkapidocs.url}"  
              overview="${src.dir}/intro.html"  
              sourcepath="${src.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   
   
318    <!-- Internal targets -->    <!-- Internal targets -->
319    
320    
   <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>  
   
   
321    <target name="dist-jar"    <target name="dist-jar"
322            depends="clean, jar">            depends="clean, jar">
323    
# Line 308  Line 332 
332      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
333    
334      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
335            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
336              debug="${build.debug}"             debug="${build.debug}"
337         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
338        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
339             source="${build.sourcelevel}"             source="6"
340               fork="true">             classpath="${junit.jar}"
341               includeAntRuntime="false"
342               includeJavaRuntime="false"
343               executable="${javac8}"
344               fork="true">
345    
346        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
347        <compilerarg line="${build.args}"/>        <bootclasspath path="@{product.jar}"/>
348          <bootclasspath path="${bootclasspath6}"/>
349        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
350          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
351        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
352    
353      </javac>      </javac>
354    
355      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
356            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
357              debug="${build.debug}"             debug="${build.debug}"
358         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
359        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
360             source="${build.sourcelevel}"             source="6"
361               fork="true">             classpath=""
362               includeAntRuntime="false"
363        <include name="jsr166/test/**"/>             includeJavaRuntime="false"
364               executable="${javac8}"
365               fork="true">
366    
367        <compilerarg value="${bootclasspath.args}"/>        <include name="jsr166/test/**/*.java"/>
368        <compilerarg line="${build.args}"/>        <bootclasspath path="${product.jar}"/>
369          <bootclasspath path="${bootclasspath6}"/>
370        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
371          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
372        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
373    
374      </javac>      </javac>
375    
# Line 350  Line 382 
382             source="${build.sourcelevel}"             source="${build.sourcelevel}"
383               fork="true">               fork="true">
384    
385        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
386        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
387          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
388    
389      </javac>      </javac>
390  -->  -->
# Line 375  Line 405 
405            errorProperty="junit.failed"            errorProperty="junit.failed"
406          failureProperty="junit.failed"          failureProperty="junit.failed"
407                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
408                        jvm="${java8}"
409                     fork="true">                     fork="true">
410    
411        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
412        <jvmarg value="-server"/>        <jvmarg value="-server"/>
413        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
414    
# Line 478  Line 509 
509    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
510    
511    
512    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
513            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
514    
515      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 504  Line 535 
535    </target>    </target>
536    
537    
538    <!-- jdk7 -->    <!-- jsr166 4jdk7 -->
539    
540      <target name="4jdk7compile"
   <target name="jdk7compile"  
541            depends="configure-compiler"            depends="configure-compiler"
542            description="Compiles src/jdk7 sources">            description="Compiles src/jdk7 sources, targeting jdk7">
543    
544      <mkdir dir="${build.jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
545    
546      <javac srcdir="${jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
547             destdir="${build.jdk7.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
548             debug="${build.debug}"             debug="${build.debug}"
549             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
550             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
551             source="1.6"             source="6"
552             classpath=""             classpath=""
            bootclasspath="${bootclasspath6}"  
553             includeAntRuntime="false"             includeAntRuntime="false"
554             includeJavaRuntime="false"             includeJavaRuntime="false"
555             executable="${javac6}"             executable="${javac7}"
556             fork="true">             fork="true">
557    
558        <include name="**/*.java"/>        <include name="**/*.java"/>
559        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
560        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
561        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
562          <compilerarg line="${build.args}"/>
563    
564      </javac>      </javac>
   
565    </target>    </target>
566    
567    
568      <target name="4jdk7-jar"
569    <target name="jdk7jar"            depends="4jdk7compile"
           depends="jdk7compile"  
570            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
571    
572      <mkdir dir="${build.jdk7.lib.dir}"/>      <jar destfile="${4jdk7product.jar}">
573          <fileset dir="${build.4jdk7.classes.dir}"/>
     <jar destfile="${jdk7product.jar}" index="true">  
       <fileset dir="${build.jdk7.classes.dir}"/>  
574      </jar>      </jar>
575    
576    </target>    </target>
577    
578    
579      <target name="4jdk7-test-tck"
580              depends="4jdk7-jar"
581              description="Runs tck tests for jsr166-4jdk7 directly">
582    
583    <target name="jdk7docs"      <run-tck-tests
584            description="Builds javadocs with custom tags to build folder">        target="7"
585          workdir="${build.4jdk7.dir}"
586      <delete dir="${build.jdk7.docs.dir}"/>        product.jar="${4jdk7product.jar}"/>
     <mkdir dir="${build.jdk7.docs.dir}"/>  
   
     <javadoc destdir="${build.jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${jdk7src.dir}/intro.html"  
              sourcepath="${jdk7src.dir}"  
              bootclasspath="${bootclasspath6}"  
              classpath=""  
              source="1.6"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
587    </target>    </target>
588    
589    
590    <target name="jdk7dist"    <target name="4jdk7-test-tck-junit"
591            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"            depends="4jdk7compile"
592            description="Puts all distributable products in single hierarchy"/>            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
593    
594        <junit printsummary="true"
595               showoutput="true"
596               errorProperty="junit.failed"
597               failureProperty="junit.failed"
598               includeantruntime="true"
599               jvm="${java7}"
600               fork="true">
601    
602          <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
603          <jvmarg value="-server"/>
604    
605    <target name="jdk7clean"        <classpath>
606            description="Removes all build products">          <pathelement location="${junit.jar}"/>
607            <pathelement location="${build.4jdk7.tck.classes.dir}"/>
608          </classpath>
609    
610          <formatter type="brief"/>
611    
612      <delete dir="${build.jdk7.dir}"/>        <test name="JSR166TestCase" haltonfailure="no">
613          </test>
614    
615        </junit>
616    </target>    </target>
617    
618      <target name="4jdk7-test-jtreg"
619              depends="4jdk7compile"
620              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
621        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
622        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
623        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
624        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
625        <jtreg dir="${jtreg.src.dir}"
626               jdk="${jdk7.home}"
627               workDir="${build.4jdk7.dir}/JTwork"
628               reportDir="${build.4jdk7.dir}/JTreport">
629    
630          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
631          <arg value="-agentvm"/>
632          <arg value="-v:nopass,fail"/>
633          <arg value="-vmoptions:-esa -ea"/>
634          <arg value="-automatic"/>
635          <arg value="-k:!ignore"/>
636        </jtreg>
637      </target>
638    
   <target name="jdk7dist-clean"  
           description="Removes all build and distribution products">  
639    
640      <target name="4jdk7-test"
641              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
642              description="Runs tck and jtreg tests for jsr166-4jdk7">
643    </target>    </target>
644    
   <target name="jdk7dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
645    
646      <delete dir="${dist.jdk7.docs.dir}"/>    <target name="4jdk7docs"
647      <mkdir dir="${dist.jdk7.docs.dir}"/>            description="Builds javadocs for src/jdk7 to dist dir">
648    
649      <javadoc destdir="${dist.jdk7.docs.dir}"      <delete dir="${dist.4jdk7.docs.dir}"/>
650        <mkdir dir="${dist.4jdk7.docs.dir}"/>
651    
652        <javadoc destdir="${dist.4jdk7.docs.dir}"
653               packagenames="none"               packagenames="none"
654               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
655               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
              sourcepath="${jdk7src.dir}"  
656               classpath=""               classpath=""
657               executable="${javadoc7}"               executable="${javadoc7}">
658               bootclasspath="${bootclasspath6}"        <sourcepath path="${4jdk7src.dir}"/>
659               source="1.6">        <sourcepath path="${jdk7src.dir}"/>
660        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
661        <fileset dir="${jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
662          <include name="**/*.java"/>          <include name="**/*.java"/>
663        </fileset>        </fileset>
664      </javadoc>      </javadoc>
665      </target>
666    
667    
668      <target name="4jdk7dist"
669              depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
670              description="Puts all distributable products in single hierarchy"/>
671    
672    
673      <target name="4jdk7clean"
674              description="Removes all 4jdk7 build products">
675    
676        <delete dir="${build.4jdk7.dir}"/>
677    
678      </target>
679    
680    
681      <target name="4jdk7dist-clean"
682              description="Removes all build and distribution products">
683    
684    </target>    </target>
685    
686    <target name="jdk7dist-jar"    <target name="4jdk7dist-jar"
687            depends="jdk7clean, jdk7jar">            depends="4jdk7clean, 4jdk7-jar">
688    
689      <copy file="${jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
690    
691    </target>    </target>
692    
   <!-- jsr166x -->  
693    
694      <!-- jsr166x -->
695    
696    <target name="jsr166xcompile"    <target name="jsr166xcompile"
697            depends="init, configure-compiler"            depends="configure-compiler"
698            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
699    
700      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
701    
702      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
703            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
704              debug="${build.debug}"             debug="${build.debug}"
705         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
706        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
707             source="${build.sourcelevel}"             classpath=""
708               fork="true">             source="5"
709               includeAntRuntime="false"
710               includeJavaRuntime="false"
711               executable="${javac7}"
712               fork="true">
713    
714        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
715        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
716        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
717          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
718          <compilerarg line="${build.args}"/>
719    
720      </javac>      </javac>
   
721    </target>    </target>
722    
723    
724      <target name="jsr166x-jar"
   <target name="jsr166xjar"  
725            depends="jsr166xcompile"            depends="jsr166xcompile"
726            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
727    
728      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
729          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
730      </jar>      </jar>
731    
732    </target>    </target>
733    
734    
   
735    <target name="jsr166xdocs"    <target name="jsr166xdocs"
736            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
737    
738      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
739      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
740    
741      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
742               packagenames="jsr166x"               packagenames="jsr166x.*"
743               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
744               source="${build.sourcelevel}"               source="5"
745               sourcepath="${topsrc.dir}:${jdksrc.dir}"               executable="${javadoc7}">
746               additionalparam="-XDignore.symbol.file=true" />        <sourcepath path="${topsrc.dir}"/>
747          <sourcepath path="${jdk6src.dir}"/>
748          <bootclasspath path="${bootclasspath6}"/>
749          <arg value="-XDignore.symbol.file=true"/>
750    
751        </javadoc>
752    </target>    </target>
753    
754    
755    <target name="jsr166xdist"    <target name="jsr166xdist"
756            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
757            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
758    
759    
   
760    <target name="jsr166xclean"    <target name="jsr166xclean"
761            description="Removes all build products">            description="Removes all jsr166x build products">
762    
763      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
764    
765    </target>    </target>
766    
767    
   
768    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
769            description="Removes all build and distribution products">            description="Removes all build and distribution products">
770    
771    </target>    </target>
772    
773    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <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>  
   
774    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
775            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166x-jar">
776    
777      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
778    
779    </target>    </target>
780    
# Line 731  Line 782 
782    
783    
784    <target name="jsr166ycompile"    <target name="jsr166ycompile"
785            depends="init, configure-compiler"            depends="configure-compiler"
786            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
787    
788      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
789    
790      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
791            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
792              debug="${build.debug}"             debug="${build.debug}"
793         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
794        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
795             source="${build.sourcelevel}"             source="6"
796               fork="true">             classpath=""
797               includeAntRuntime="false"
798               includeJavaRuntime="false"
799               executable="${javac7}"
800               fork="true">
801    
802        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
803        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
804        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
805        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
806          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
807    
808      </javac>      </javac>
   
809    </target>    </target>
810    
811    
812      <target name="jsr166y-jar"
   <target name="jsr166yjar"  
813            depends="jsr166ycompile"            depends="jsr166ycompile"
814            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
815    
816      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
817          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
818      </jar>      </jar>
819    
820    </target>    </target>
821    
822    
   
823    <target name="jsr166ydocs"    <target name="jsr166ydocs"
824            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
825    
826      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
827      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
828    
829      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
830               packagenames="jsr166y"               packagenames="jsr166y.*"
831               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
832               source="${build.sourcelevel}"               source="6"
833               sourcepath="${topsrc.dir}:${jdksrc.dir}"               executable="${javadoc7}">
834               additionalparam="-XDignore.symbol.file=true" />        <sourcepath path="${topsrc.dir}"/>
835          <sourcepath path="${jdk6src.dir}"/>
836          <bootclasspath path="${bootclasspath6}"/>
837          <arg value="-XDignore.symbol.file=true"/>
838    
839        </javadoc>
840    </target>    </target>
841    
842    
843    <target name="jsr166ydist"    <target name="jsr166ydist"
844            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
845            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
846    
847    
   
848    <target name="jsr166yclean"    <target name="jsr166yclean"
849            description="Removes all build products">            description="Removes all jsr166y build products">
850    
851      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
852    
853    </target>    </target>
854    
855    
   
856    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
857            description="Removes all build and distribution products">            description="Removes all build and distribution products">
858    
859    </target>    </target>
860    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <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>  
   
861    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
862            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166y-jar">
863    
864      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
865    
866    </target>    </target>
867    
# Line 835  Line 870 
870    
871    
872    <target name="extra166ycompile"    <target name="extra166ycompile"
873            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166y-jar"
874            description="Compiles extra166y sources">            description="Compiles extra166y sources">
875    
876      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
877    
878      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
879            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
880              debug="${build.debug}"             debug="${build.debug}"
881              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
882         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
883        deprecation="${build.deprecation}"             classpath=""
884             source="${build.sourcelevel}"             source="6"
885               fork="true">             includeAntRuntime="false"
886               includeJavaRuntime="false"
887               executable="${javac7}"
888               fork="true">
889    
890        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
891        <compilerarg line="${build.args}"/>        <bootclasspath path="${jsr166y.jar}"/>
892          <bootclasspath path="${bootclasspath6}"/>
893        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
894        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
895          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
896    
897      </javac>      </javac>
   
898    </target>    </target>
899    
900    
901      <target name="extra166y-jar"
   <target name="extra166yjar"  
902            depends="extra166ycompile"            depends="extra166ycompile"
903            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
904    
905      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
906          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
907      </jar>      </jar>
908    
909    </target>    </target>
910    
911    
   
912    <target name="extra166ydocs"    <target name="extra166ydocs"
913            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
914    
915      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
916      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
917    
918      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
919               packagenames="extra166y"               packagenames="extra166y.*"
920               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
921               source="${build.sourcelevel}"               source="6"
922               sourcepath="${topsrc.dir}:${jdksrc.dir}"               executable="${javadoc7}">
923               additionalparam="-XDignore.symbol.file=true" />        <sourcepath path="${topsrc.dir}"/>
924          <sourcepath path="${jdk6src.dir}"/>
925          <bootclasspath path="${bootclasspath6}"/>
926          <arg value="-XDignore.symbol.file=true"/>
927    
928        </javadoc>
929    </target>    </target>
930    
931    
932    <target name="extra166ydist"    <target name="extra166ydist"
933            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
934            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
935    
936    
   
937    <target name="extra166yclean"    <target name="extra166yclean"
938            description="Removes all build products">            description="Removes all extra166y build products">
939    
940      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
941    
942    </target>    </target>
943    
944    
   
945    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
946            description="Removes all build and distribution products">            description="Removes all build and distribution products">
947    
948    </target>    </target>
949    
   <target name="extra166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <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>  
   
950    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
951            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166y-jar">
952    
953      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
954    
955    </target>    </target>
956    
# Line 941  Line 960 
960            depends="configure-compiler"            depends="configure-compiler"
961            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
962    
963      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
964    
965      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
966             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
967             debug="${build.debug}"             debug="${build.debug}"
968             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
969             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
970             source="1.7"             source="7"
971             classpath=""             classpath=""
972             includeAntRuntime="false"             includeAntRuntime="false"
973             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 956  Line 975 
975             fork="true">             fork="true">
976    
977        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
978        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
979        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
980          <compilerarg line="${build.args}"/>
981    
982      </javac>      </javac>
   
983    </target>    </target>
984    
985    
986      <target name="jsr166e-jar"
   <target name="jsr166ejar"  
987            depends="jsr166ecompile"            depends="jsr166ecompile"
988            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
989    
990      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
991          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
992      </jar>      </jar>
993    
994    </target>    </target>
995    
996    
   
997    <target name="jsr166edocs"    <target name="jsr166edocs"
998            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
999    
1000      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
1001      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1002    
1003      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1004               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
1005               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
1006               source="1.7"               source="7"
1007               sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"               executable="${javadoc7}">
1008               executable="${javadoc7}"        <sourcepath path="${topsrc.dir}"/>
1009               additionalparam="-XDignore.symbol.file=true" >        <sourcepath path="${jdk7src.dir}"/>
1010        <fileset dir="${topsrc.dir}" defaultexcludes="yes">        <arg value="-XDignore.symbol.file=true"/>
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
     </javadoc>  
1011    
1012        </javadoc>
1013    </target>    </target>
1014    
1015    
1016    <target name="jsr166edist"    <target name="jsr166edist"
1017            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1018            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1019    
1020    
   
1021    <target name="jsr166eclean"    <target name="jsr166eclean"
1022            description="Removes all build products">            description="Removes all jsr166e build products">
1023    
1024      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
1025    
1026    </target>    </target>
1027    
1028    
   
1029    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1030            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1031    
1032    </target>    </target>
1033    
   <target name="jsr166edist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166ejavadocs.dir}"/>  
     <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" />  
   
   </target>  
   
1034    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1035            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166e-jar">
1036    
1037      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1038    
1039    </target>    </target>
1040    

Legend:
Removed from v.1.96  
changed lines
  Added in v.1.118

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