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

Diff of /jsr166/build.xml

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

revision 1.93 by jsr166, Mon Jan 14 08:58:47 2013 UTC revision 1.126 by jsr166, Wed Jan 23 06:46:27 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>
87      </macrodef>
88    
89      <macrodef name="mirror-dir">
90        <attribute name="src"/>
91        <attribute name="dst"/>
92        <sequential>
93        <delete dir="@{dst}"/>
94        <mkdir dir="@{dst}"/>
95        <copy todir="@{dst}" preservelastmodified="true">
96          <fileset dir="@{src}"/>
97        </copy>
98      </sequential>      </sequential>
99    </macrodef>    </macrodef>
100    
# Line 84  Line 111 
111    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
112    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
113    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
114    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
115    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
116    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
117    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
118    <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"/>  
119    
120    <!-- Distribution locations -->    <!-- Javadoc locations -->
121    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="javadocs.dir"          location="${build.dir}/javadocs"/>
122    <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>    <property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
123    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
124    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
125    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
126    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
127    
128      <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
129      <property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
130      <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
131      <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
132      <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
133      <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
134    
135    <!-- Jar locations -->    <!-- Jar locations -->
136    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
137    <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
138    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
139    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
140    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
141    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
142    <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}"/>  
143    
144    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
145    <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 117  Line 147 
147    <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/"/>
148    
149    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
150    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
151    <!-- <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/"/> -->
152    
153      <!-- Default jdk api doc location (latest stable release seems best) -->
154    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
155    
156      <!-- Define the "jtreg" task -->
157      <!-- See the docs in "jtreg -onlineHelp" -->
158      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
159               classpath="${lib.dir}/jtreg.jar" />
160    
161    <!-- Test classpath -->    <!-- Test classpath -->
162    <path id="test.classpath">    <path id="test.classpath">
163      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
164      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
165    </path>    </path>
166    
167      <macrodef name="run-tck-tests">
168        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
169        <attribute name="source" default="6"/>
170        <attribute name="target"/>
171        <attribute name="workdir"/>
172        <attribute name="classes"/>
173        <attribute name="jvmflags" default=""/>
174        <sequential>
175    
176        <mkdir dir="@{workdir}/tck-classes"/>
177    
178        <javac srcdir="@{tck.src.dir}"
179               destdir="@{workdir}/tck-classes"
180               debug="${build.debug}"
181               debuglevel="${build.debuglevel}"
182               deprecation="${build.deprecation}"
183               source="@{source}"
184               classpath="${junit.jar}"
185               bootclasspath="@{classes}:${bootclasspath@{source}}"
186               includeAntRuntime="false"
187               includeJavaRuntime="false"
188               executable="${javac@{target}}"
189               fork="true">
190    
191          <include name="*.java"/>
192          <compilerarg value="-XDignore.symbol.file=true"/>
193          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
194          <compilerarg line="${build.args}"/>
195    
196        </javac>
197    
198        <java classname="JSR166TestCase"
199              failonerror="true"
200              jvm="${java@{target}}"
201              fork="true">
202            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
203            <jvmarg line="@{jvmflags}"/>
204            <classpath>
205              <pathelement location="${junit.jar}"/>
206              <pathelement location="@{workdir}/tck-classes"/>
207            </classpath>
208        </java>
209    
210        </sequential>
211      </macrodef>
212    
213    <!-- ALoops classpath -->    <!-- ALoops classpath -->
214    <path id="loops.classpath">    <path id="loops.classpath">
215      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
216    </path>    </path>
217    
218      <!-- Support @jls tag, used in jdk8+ javadoc -->
219      <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
220      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
221    
222    <!-- Main targets -->    <!-- Main targets -->
223    
224    <target name="dists"    <target name="dists"
225            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
226            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
227    
228    <target name="compile"    <target name="compile"
229            depends="init, configure-compiler"            depends="configure-compiler"
230            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
231    
232      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
233    
234      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
235            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
236              debug="${build.debug}"             debug="${build.debug}"
237         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
238        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
239             source="${build.sourcelevel}"             classpath=""
240               fork="true">             includeAntRuntime="false"
241               includeJavaRuntime="false"
242               executable="${javac8}"
243               fork="true">
244    
245        <include name="**/*.java"/>        <include name="**/*.java"/>
246        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
247          <compilerarg value="-Xlint:all"/>
 <!--  
       <exclude name="java/lang/**"/>  
248        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
249    
250      </javac>      </javac>
   
251    </target>    </target>
252    
253    
   
254    <target name="jar"    <target name="jar"
255            depends="compile"            depends="compile"
256            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
257    
     <mkdir dir="${build.lib.dir}"/>  
   
258      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
259        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
260      </jar>      </jar>
   
261    </target>    </target>
262    
263    
   
264    <target name="test"    <target name="test"
265            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
266            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)" />
267    
268    
   
269    <target name="docs"    <target name="docs"
270            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
271    
272      <delete dir="${build.javadocs.dir}"/>      <delete dir="${javadocs.dir}"/>
273      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${javadocs.dir}"/>
274    
275      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
276      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
277    
278      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${javadocs.dir}"
279               packagenames="none"               packagenames="none"
280               link="${jdkapidocs.url}"               link="${jdkapi8docs.url}"
281               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
282               sourcepath="${src.dir}:${jdksrc.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
283               additionalparam="-XDignore.symbol.file=true" >               classpath=""
284                 executable="${javadoc8}">
285        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
286          <include name="**/*.java"/>          <include name="**/*.java"/>
287        </fileset>        </fileset>
288          <arg value="-XDignore.symbol.file=true"/>
289          <arg value="-tag"/>
290          <arg value="${javadoc.jls.option}"/>
291      </javadoc>      </javadoc>
   
292    </target>    </target>
293    
294    
   
295    <target name="dist"    <target name="dist"
296            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, dist-docs"
297            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
298    
299    
# Line 232  Line 312 
312        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
313        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
314      </jar>      </jar>
   
315    </target>    </target>
316    
317    
   
318    <target name="clean"    <target name="clean"
319            description="Removes all build products">            description="Removes all build products">
320    
321      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
322    
323    </target>    </target>
324    
325    
   
326    <target name="dist-clean"    <target name="dist-clean"
327            description="Removes all build and distribution products">            description="Removes all build and distribution products">
328    
# Line 256  Line 331 
331    </target>    </target>
332    
333    
   
   <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>  
   
   
   
334    <!-- Internal targets -->    <!-- Internal targets -->
335    
336    
   <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>  
   
   
337    <target name="dist-jar"    <target name="dist-jar"
338            depends="clean, jar">            depends="clean, jar">
   
339      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
340      </target>
341    
342      <target name="dist-docs"
343              depends="clean, docs">
344        <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
345    </target>    </target>
346    
347    
# Line 308  Line 351 
351      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
352    
353      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
354            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
355              debug="${build.debug}"             debug="${build.debug}"
356         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
357        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
358             source="${build.sourcelevel}"             source="6"
359               fork="true">             classpath="${junit.jar}"
360               bootclasspath="@{product.jar}:${bootclasspath6}"
361               includeAntRuntime="false"
362               includeJavaRuntime="false"
363               executable="${javac8}"
364               fork="true">
365    
366        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
367        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
368          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
369        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
370    
371      </javac>      </javac>
372    
373      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
374            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
375              debug="${build.debug}"             debug="${build.debug}"
376         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
377        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
378             source="${build.sourcelevel}"             source="6"
379               fork="true">             classpath=""
380               bootclasspath="@{product.jar}:${bootclasspath6}"
381        <include name="jsr166/test/**"/>             includeAntRuntime="false"
382               includeJavaRuntime="false"
383               executable="${javac8}"
384               fork="true">
385    
386        <compilerarg value="${bootclasspath.args}"/>        <include name="jsr166/test/**/*.java"/>
       <compilerarg line="${build.args}"/>  
387        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
388          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
389        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
390    
391      </javac>      </javac>
392    
# Line 350  Line 399 
399             source="${build.sourcelevel}"             source="${build.sourcelevel}"
400               fork="true">               fork="true">
401    
402        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
403        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
404          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
405    
406      </javac>      </javac>
407  -->  -->
# Line 375  Line 422 
422            errorProperty="junit.failed"            errorProperty="junit.failed"
423          failureProperty="junit.failed"          failureProperty="junit.failed"
424                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
425                        jvm="${java8}"
426                     fork="true">                     fork="true">
427    
428        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
429        <jvmarg value="-server"/>        <jvmarg value="-server"/>
430        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
431    
# Line 478  Line 526 
526    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
527    
528    
529    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
530            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
531    
532      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 504  Line 552 
552    </target>    </target>
553    
554    
555    <!-- jdk7 -->    <!-- jsr166 4jdk7 -->
556    
557      <target name="4jdk7compile"
   <target name="jdk7compile"  
558            depends="configure-compiler"            depends="configure-compiler"
559            description="Compiles src/jdk7 sources">            description="Compiles src/jdk7 sources, targeting jdk7">
560    
561      <mkdir dir="${build.jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
562    
563      <javac srcdir="${jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
564             destdir="${build.jdk7.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
565             debug="${build.debug}"             debug="${build.debug}"
566             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
567             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
568             source="1.6"             source="6"
569             classpath=""             classpath=""
570             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
571             includeAntRuntime="false"             includeAntRuntime="false"
572             includeJavaRuntime="false"             includeJavaRuntime="false"
573             executable="${javac6}"             executable="${javac7}"
574             fork="true">             fork="true">
575    
576        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
577        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
578        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
579          <compilerarg line="${build.args}"/>
580    
581      </javac>      </javac>
   
582    </target>    </target>
583    
584    
585      <target name="4jdk7-jar"
586    <target name="jdk7jar"            depends="4jdk7compile"
           depends="jdk7compile"  
587            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
588    
589      <mkdir dir="${build.jdk7.lib.dir}"/>      <jar destfile="${4jdk7product.jar}">
590          <fileset dir="${build.4jdk7.classes.dir}"/>
     <jar destfile="${jdk7product.jar}" index="true">  
       <fileset dir="${build.jdk7.classes.dir}"/>  
591      </jar>      </jar>
592    
593    </target>    </target>
594    
595    
596      <target name="4jdk7-test-tck"
597              depends="4jdk7-jar"
598              description="Runs tck tests for jsr166-4jdk7 directly">
599    
600    <target name="jdk7docs"      <run-tck-tests
601            description="Builds javadocs with custom tags to build folder">        target="7"
602          workdir="${build.4jdk7.dir}"
603      <delete dir="${build.jdk7.docs.dir}"/>        classes="${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>  
   
604    </target>    </target>
605    
606    
607    <target name="jdk7dist"    <target name="4jdk7-test-tck-junit"
608            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"            depends="4jdk7compile"
609            description="Puts all distributable products in single hierarchy"/>            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
610    
611        <junit printsummary="true"
612               showoutput="true"
613               errorProperty="junit.failed"
614               failureProperty="junit.failed"
615               includeantruntime="true"
616               jvm="${java7}"
617               fork="true">
618    
619          <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
620          <jvmarg value="-server"/>
621    
622          <classpath>
623            <pathelement location="${junit.jar}"/>
624            <pathelement location="${build.4jdk7.tck.classes.dir}"/>
625          </classpath>
626    
627    <target name="jdk7clean"        <formatter type="brief"/>
           description="Removes all build products">  
628    
629      <delete dir="${build.jdk7.dir}"/>        <test name="JSR166TestCase" haltonfailure="no">
630          </test>
631    
632        </junit>
633    </target>    </target>
634    
635      <target name="4jdk7-test-jtreg"
636              depends="4jdk7compile"
637              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
638        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
639        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
640        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
641        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
642        <jtreg dir="${jtreg.src.dir}"
643               jdk="${jdk7.home}"
644               workDir="${build.4jdk7.dir}/JTwork"
645               reportDir="${build.4jdk7.dir}/JTreport">
646    
647          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
648          <arg value="-agentvm"/>
649          <arg value="-v:nopass,fail"/>
650          <arg value="-vmoptions:-esa -ea"/>
651          <arg value="-automatic"/>
652          <arg value="-k:!ignore"/>
653        </jtreg>
654      </target>
655    
   <target name="jdk7dist-clean"  
           description="Removes all build and distribution products">  
656    
657      <target name="4jdk7-test"
658              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
659              description="Runs tck and jtreg tests for jsr166-4jdk7">
660    </target>    </target>
661    
   <target name="jdk7dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
662    
663      <delete dir="${dist.jdk7.docs.dir}"/>    <target name="4jdk7docs"
664      <mkdir dir="${dist.jdk7.docs.dir}"/>            description="Builds javadocs for src/jdk7 to dist dir">
665    
666      <javadoc destdir="${dist.jdk7.docs.dir}"      <delete dir="${4jdk7javadocs.dir}"/>
667        <mkdir dir="${4jdk7javadocs.dir}"/>
668    
669        <javadoc destdir="${4jdk7javadocs.dir}"
670               packagenames="none"               packagenames="none"
671               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
672               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
673               sourcepath="${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
674               classpath=""               classpath=""
675               executable="${javadoc7}"               executable="${javadoc7}">
676               bootclasspath="${bootclasspath6}"        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
              source="1.6">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
677          <include name="**/*.java"/>          <include name="**/*.java"/>
678        </fileset>        </fileset>
679          <arg value="-XDignore.symbol.file=true"/>
680      </javadoc>      </javadoc>
681      </target>
682    
683    
684      <target name="4jdk7dist"
685              depends="4jdk7dist-jar, 4jdk7dist-docs"
686              description="Puts all distributable products in single hierarchy"/>
687    
688    
689      <target name="4jdk7clean"
690              description="Removes all 4jdk7 build products">
691    
692        <delete dir="${build.4jdk7.dir}"/>
693    
694    </target>    </target>
695    
   <target name="jdk7dist-jar"  
           depends="jdk7clean, jdk7jar">  
696    
697      <copy file="${jdk7product.jar}" todir="${dist.dir}"/>    <target name="4jdk7dist-clean"
698              description="Removes all build and distribution products">
699    
700    </target>    </target>
701    
702    <!-- jsr166x -->    <target name="4jdk7dist-jar"
703              depends="4jdk7clean, 4jdk7-jar">
704        <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
705      </target>
706    
707    
708      <target name="4jdk7dist-docs"
709              depends="4jdk7clean, 4jdk7docs">
710        <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
711      </target>
712    
713    
714      <!-- jsr166x -->
715    
716    <target name="jsr166xcompile"    <target name="jsr166xcompile"
717            depends="init, configure-compiler"            depends="configure-compiler"
718            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
719    
720      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
721    
722      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
723            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
724              debug="${build.debug}"             debug="${build.debug}"
725         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
726        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
727             source="${build.sourcelevel}"             classpath=""
728               fork="true">             bootclasspath="${bootclasspath6}"
729               source="5"
730               includeAntRuntime="false"
731               includeJavaRuntime="false"
732               executable="${javac7}"
733               fork="true">
734    
735        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
736        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
737          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
738          <compilerarg line="${build.args}"/>
739    
740      </javac>      </javac>
   
741    </target>    </target>
742    
743    
744      <target name="jsr166x-jar"
   <target name="jsr166xjar"  
745            depends="jsr166xcompile"            depends="jsr166xcompile"
746            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
747    
748      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
749          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
750      </jar>      </jar>
751    
752    </target>    </target>
753    
754    
   
755    <target name="jsr166xdocs"    <target name="jsr166xdocs"
756            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
757    
758      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xjavadocs.dir}"/>
759      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xjavadocs.dir}"/>
760    
761      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xjavadocs.dir}"
762               packagenames="jsr166x"               packagenames="jsr166x.*"
763               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
764               source="${build.sourcelevel}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
765               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
766               additionalparam="-XDignore.symbol.file=true" />               source="5"
767                 executable="${javadoc7}">
768          <arg value="-XDignore.symbol.file=true"/>
769    
770        </javadoc>
771    </target>    </target>
772    
773    
774    <target name="jsr166xdist"    <target name="jsr166xdist"
775            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-jar, jsr166xdist-docs"
776            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
777    
778    
   
779    <target name="jsr166xclean"    <target name="jsr166xclean"
780            description="Removes all build products">            description="Removes all jsr166x build products">
781    
782      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
783    
784    </target>    </target>
785    
786    
   
787    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
788            description="Removes all build and distribution products">            description="Removes all build and distribution products">
789    
790    </target>    </target>
791    
792    
   
   <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>  
   
793    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
794            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166x-jar">
795        <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
796      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>    </target>
797    
798      <target name="jsr166xdist-docs"
799              depends="jsr166xclean, jsr166xdocs">
800        <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
801    </target>    </target>
802    
803    <!-- jsr166y -->    <!-- jsr166y -->
804    
805    
806    <target name="jsr166ycompile"    <target name="jsr166ycompile"
807            depends="init, configure-compiler"            depends="configure-compiler"
808            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
809    
810      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
811    
812      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
813            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
814              debug="${build.debug}"             debug="${build.debug}"
815         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
816        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
817             source="${build.sourcelevel}"             source="6"
818               fork="true">             classpath=""
819               bootclasspath="${bootclasspath6}"
820               includeAntRuntime="false"
821               includeJavaRuntime="false"
822               executable="${javac7}"
823               fork="true">
824    
825        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
826        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
827        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
828          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
829    
830      </javac>      </javac>
   
831    </target>    </target>
832    
833    
834      <target name="jsr166y-jar"
   <target name="jsr166yjar"  
835            depends="jsr166ycompile"            depends="jsr166ycompile"
836            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
837    
838      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
839          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
840      </jar>      </jar>
841    
842    </target>    </target>
843    
844    
   
845    <target name="jsr166ydocs"    <target name="jsr166ydocs"
846            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
847    
848      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166yjavadocs.dir}"/>
849      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166yjavadocs.dir}"/>
850    
851      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166yjavadocs.dir}"
852               packagenames="jsr166y"               packagenames="jsr166y.*"
853               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
854               source="${build.sourcelevel}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
855               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
856               additionalparam="-XDignore.symbol.file=true" />               source="6"
857                 executable="${javadoc7}">
858          <arg value="-XDignore.symbol.file=true"/>
859    
860        </javadoc>
861    </target>    </target>
862    
863    
864    <target name="jsr166ydist"    <target name="jsr166ydist"
865            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-jar, jsr166ydist-docs"
866            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
867    
868    
   
869    <target name="jsr166yclean"    <target name="jsr166yclean"
870            description="Removes all build products">            description="Removes all jsr166y build products">
871    
872      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
873    
874    </target>    </target>
875    
876    
   
877    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
878            description="Removes all build and distribution products">            description="Removes all build and distribution products">
879    
880    </target>    </target>
881    
   <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>  
   
882    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
883            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166y-jar">
884        <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
885      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>    </target>
886    
887      <target name="jsr166ydist-docs"
888              depends="jsr166yclean, jsr166ydocs">
889        <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
890    </target>    </target>
891    
892    
# Line 835  Line 894 
894    
895    
896    <target name="extra166ycompile"    <target name="extra166ycompile"
897            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166y-jar"
898            description="Compiles extra166y sources">            description="Compiles extra166y sources">
899    
900      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
901    
902      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
903            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
904              debug="${build.debug}"             debug="${build.debug}"
905              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
906         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
907        deprecation="${build.deprecation}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
908             source="${build.sourcelevel}"             classpath=""
909               fork="true">             source="6"
910               includeAntRuntime="false"
911               includeJavaRuntime="false"
912               executable="${javac7}"
913               fork="true">
914    
915        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
916        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
917        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
918          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
919    
920      </javac>      </javac>
   
921    </target>    </target>
922    
923    
924      <target name="extra166y-jar"
   <target name="extra166yjar"  
925            depends="extra166ycompile"            depends="extra166ycompile"
926            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
927    
928      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
929          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
930      </jar>      </jar>
931    
932    </target>    </target>
933    
934    
   
935    <target name="extra166ydocs"    <target name="extra166ydocs"
936            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
937    
938      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${extra166yjavadocs.dir}"/>
939      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166yjavadocs.dir}"/>
940    
941      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${extra166yjavadocs.dir}"
942               packagenames="extra166y"               packagenames="extra166y.*"
943               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
944               source="${build.sourcelevel}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
945               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
946               additionalparam="-XDignore.symbol.file=true" />               source="6"
947                 executable="${javadoc7}">
948          <arg value="-XDignore.symbol.file=true"/>
949    
950        </javadoc>
951    </target>    </target>
952    
953    
954    <target name="extra166ydist"    <target name="extra166ydist"
955            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-jar, extra166ydist-docs"
956            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
957    
958    
   
959    <target name="extra166yclean"    <target name="extra166yclean"
960            description="Removes all build products">            description="Removes all extra166y build products">
961    
962      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
963    
964    </target>    </target>
965    
966    
   
967    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
968            description="Removes all build and distribution products">            description="Removes all build and distribution products">
969    
970    </target>    </target>
971    
   <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>  
   
972    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
973            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166y-jar">
974        <copy file="${extra166y.jar}" todir="${dist.dir}"/>
975      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>    </target>
976    
977      <target name="extra166ydist-docs"
978              depends="extra166yclean, extra166ydocs">
979        <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
980    </target>    </target>
981    
982    <!-- jsr166e -->    <!-- jsr166e -->
983    
   
984    <target name="jsr166ecompile"    <target name="jsr166ecompile"
985            depends="init, configure-compiler"            depends="configure-compiler"
986            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
987    
988      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
989    
990      <javac srcdir="${jsr166esrc.dir}"      <javac srcdir="${topsrc.dir}"
991            destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
992              debug="${build.debug}"             debug="${build.debug}"
993         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
994        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
995             source="1.7"             source="7"
996               fork="true">             classpath=""
997               includeAntRuntime="false"
998               includeJavaRuntime="false"
999               executable="${javac7}"
1000               fork="true">
1001    
1002        <include name="**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1003        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1004        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
1005          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
1006    
1007      </javac>      </javac>
   
1008    </target>    </target>
1009    
1010    
1011      <target name="jsr166e-jar"
   <target name="jsr166ejar"  
1012            depends="jsr166ecompile"            depends="jsr166ecompile"
1013            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1014    
1015      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
1016          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
1017      </jar>      </jar>
1018    
1019    </target>    </target>
1020    
1021    
   
1022    <target name="jsr166edocs"    <target name="jsr166edocs"
1023            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
1024    
1025      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166ejavadocs.dir}"/>
1026      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166ejavadocs.dir}"/>
1027    
1028      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166ejavadocs.dir}"
1029               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
1030               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1031               source="1.7"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1032               sourcepath="${topsrc.dir}:${jdksrc.dir}"               source="7"
1033               additionalparam="-XDignore.symbol.file=true" />               executable="${javadoc7}">
1034          <arg value="-XDignore.symbol.file=true"/>
1035    
1036        </javadoc>
1037      </target>
1038    
1039    
1040      <target name="jsr166e-test-tck"
1041              depends="jsr166e-jar"
1042              description="Runs tck tests for jsr166e">
1043    
1044        <run-tck-tests
1045          tck.src.dir="${test.src.dir}/tck-jsr166e"
1046          source="7"
1047          target="8"
1048          workdir="${build.jsr166e.dir}"
1049          classes="${jsr166e.jar}"/>
1050    </target>    </target>
1051    
1052    
1053    <target name="jsr166edist"    <target name="jsr166edist"
1054            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
1055            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1056    
1057    
   
1058    <target name="jsr166eclean"    <target name="jsr166eclean"
1059            description="Removes all build products">            description="Removes all jsr166e build products">
   
1060      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
   
1061    </target>    </target>
1062    
1063    
   
1064    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1065            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1066    
1067    </target>    </target>
1068    
   <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>  
   
1069    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1070            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166e-jar">
1071        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1072      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>    </target>
1073    
1074      <target name="jsr166edist-docs"
1075              depends="jsr166eclean, jsr166edocs">
1076        <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1077    </target>    </target>
1078    
1079  </project>  </project>

Legend:
Removed from v.1.93  
changed lines
  Added in v.1.126

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