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

Diff of /jsr166/build.xml

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

revision 1.97, Tue Jan 15 01:15:02 2013 UTC revision 1.124, Tue Jan 22 21:22:57 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.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.jdk7.docs.dir"         location="${build.jdk7.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">
# Line 67  Line 72 
72      <property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>
73      <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
74      <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
75      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76      <property name="bootclasspath@{v}"      <local name="boot.jar.dir"/>
77       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
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 77  Line 90 
90    <defjdklocations v="7"/>    <defjdklocations v="7"/>
91    <defjdklocations v="8"/>    <defjdklocations v="8"/>
92    
   <macrodef name="run-tck-tests">  
     <attribute name="jvm"/>  
     <attribute name="tck.classes"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
     <sequential>  
     <java classname="JSR166TestCase"  
           jvm="@{jvm}" fork="true">  
         <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>  
         <jvmarg line="@{jvmflags}"/>  
         <classpath>  
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{tck.classes}"/>  
         </classpath>  
     </java>  
     </sequential>  
   </macrodef>  
   
93    <!-- Source locations -->    <!-- Source locations -->
94    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
95    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 104  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}/jsr166docs"/>
110    <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
111    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
112    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
113    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
114    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
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"/>
124    
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
   
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/"/>
127    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
128    <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/"/>
129    
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 2013-01 -->
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="tck.src.dir" default="${tck.src.dir}"/>
150        <attribute name="source" default="6"/>
151        <attribute name="target"/>
152        <attribute name="workdir"/>
153        <attribute name="classes"/>
154        <attribute name="jvmflags" default=""/>
155        <sequential>
156    
157        <mkdir dir="@{workdir}/tck-classes"/>
158    
159        <javac srcdir="@{tck.src.dir}"
160               destdir="@{workdir}/tck-classes"
161               debug="${build.debug}"
162               debuglevel="${build.debuglevel}"
163               deprecation="${build.deprecation}"
164               source="@{source}"
165               classpath="${junit.jar}"
166               bootclasspath="@{classes}:${bootclasspath@{source}}"
167               includeAntRuntime="false"
168               includeJavaRuntime="false"
169               executable="${javac@{target}}"
170               fork="true">
171    
172          <include name="*.java"/>
173          <compilerarg value="-XDignore.symbol.file=true"/>
174          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
175          <compilerarg line="${build.args}"/>
176    
177        </javac>
178    
179        <java classname="JSR166TestCase"
180              failonerror="true"
181              jvm="${java@{target}}"
182              fork="true">
183            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
184            <jvmarg line="@{jvmflags}"/>
185            <classpath>
186              <pathelement location="${junit.jar}"/>
187              <pathelement location="@{workdir}/tck-classes"/>
188            </classpath>
189        </java>
190    
191        </sequential>
192      </macrodef>
193    
194    <!-- ALoops classpath -->    <!-- ALoops classpath -->
195    <path id="loops.classpath">    <path id="loops.classpath">
196      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
197    </path>    </path>
198    
199      <!-- Support @jls tag, used in jdk8+ javadoc -->
200      <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
201      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
202    
203    <!-- Main targets -->    <!-- Main targets -->
204    
205    <target name="dists"    <target name="dists"
206            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
207            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
208    
209    <target name="compile"    <target name="compile"
210            depends="init, configure-compiler"            depends="configure-compiler"
211            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
212    
213      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
214    
# Line 170  Line 217 
217              debug="${build.debug}"              debug="${build.debug}"
218         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
219        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
220             source="${build.sourcelevel}"             classpath=""
221               includeAntRuntime="false"
222               includeJavaRuntime="false"
223               executable="${javac8}"
224               fork="true">               fork="true">
225    
226        <include name="**/*.java"/>        <include name="**/*.java"/>
227        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
228          <compilerarg value="-Xlint:all"/>
 <!--  
       <exclude name="java/lang/**"/>  
229        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
230    
231      </javac>      </javac>
   
232    </target>    </target>
233    
234    
   
235    <target name="jar"    <target name="jar"
236            depends="compile"            depends="compile"
237            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
238    
     <mkdir dir="${build.lib.dir}"/>  
   
239      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
240        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
241      </jar>      </jar>
   
242    </target>    </target>
243    
244    
   
245    <target name="test"    <target name="test"
246            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
247            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)" />
248    
249    
   
250    <target name="docs"    <target name="docs"
251            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
252    
253      <delete dir="${build.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
254      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
255    
256      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
257      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
258    
259      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${dist.javadocs.dir}"
260               packagenames="none"               packagenames="none"
261               link="${jdkapidocs.url}"               link="${jdkapi8docs.url}"
262               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
263               sourcepath="${src.dir}:${jdksrc.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
264               additionalparam="-XDignore.symbol.file=true" >               classpath=""
265                 executable="${javadoc8}">
266        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
267          <include name="**/*.java"/>          <include name="**/*.java"/>
268        </fileset>        </fileset>
269          <arg value="-XDignore.symbol.file=true"/>
270          <arg value="-tag"/>
271          <arg value="${javadoc.jls.option}"/>
272      </javadoc>      </javadoc>
   
273    </target>    </target>
274    
275    
   
276    <target name="dist"    <target name="dist"
277            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, docs"
278            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
279    
280    
# Line 252  Line 293 
293        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
294        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
295      </jar>      </jar>
   
296    </target>    </target>
297    
298    
   
299    <target name="clean"    <target name="clean"
300            description="Removes all build products">            description="Removes all build products">
301    
302      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
303    
304    </target>    </target>
305    
306    
   
307    <target name="dist-clean"    <target name="dist-clean"
308            description="Removes all build and distribution products">            description="Removes all build and distribution products">
309    
# Line 276  Line 312 
312    </target>    </target>
313    
314    
   
   <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>  
   
   
   
315    <!-- Internal targets -->    <!-- Internal targets -->
316    
317    
   <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>  
   
   
318    <target name="dist-jar"    <target name="dist-jar"
319            depends="clean, jar">            depends="clean, jar">
320    
# Line 332  Line 333 
333              debug="${build.debug}"              debug="${build.debug}"
334         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
335        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
336             source="${build.sourcelevel}"             source="6"
337               classpath="${junit.jar}"
338               bootclasspath="@{product.jar}:${bootclasspath6}"
339               includeAntRuntime="false"
340               includeJavaRuntime="false"
341               executable="${javac8}"
342               fork="true">               fork="true">
343    
344        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
345        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
346          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
348    
349      </javac>      </javac>
350    
# Line 348  Line 353 
353              debug="${build.debug}"              debug="${build.debug}"
354         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
355        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
356             source="${build.sourcelevel}"             source="6"
357               classpath=""
358               bootclasspath="@{product.jar}:${bootclasspath6}"
359               includeAntRuntime="false"
360               includeJavaRuntime="false"
361               executable="${javac8}"
362               fork="true">               fork="true">
363    
364        <include name="jsr166/test/**"/>        <include name="jsr166/test/**/*.java"/>
   
       <compilerarg value="${bootclasspath.args}"/>  
       <compilerarg line="${build.args}"/>  
365        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
366          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
367        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
368    
369      </javac>      </javac>
370    
# Line 370  Line 377 
377             source="${build.sourcelevel}"             source="${build.sourcelevel}"
378               fork="true">               fork="true">
379    
380        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
381        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
382          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
383    
384      </javac>      </javac>
385  -->  -->
# Line 395  Line 400 
400            errorProperty="junit.failed"            errorProperty="junit.failed"
401          failureProperty="junit.failed"          failureProperty="junit.failed"
402                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
403                        jvm="${java8}"
404                     fork="true">                     fork="true">
405    
406        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
407        <jvmarg value="-server"/>        <jvmarg value="-server"/>
408        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
409    
# Line 498  Line 504 
504    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
505    
506    
507    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
508            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
509    
510      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 524  Line 530 
530    </target>    </target>
531    
532    
533    <!-- jdk7 -->    <!-- jsr166 4jdk7 -->
534    
535      <target name="4jdk7compile"
   <target name="jdk7compile"  
536            depends="configure-compiler"            depends="configure-compiler"
537            description="Compiles src/jdk7 sources">            description="Compiles src/jdk7 sources, targeting jdk7">
538    
539      <mkdir dir="${build.jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
540    
541      <javac srcdir="${jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
542             destdir="${build.jdk7.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
543             debug="${build.debug}"             debug="${build.debug}"
544             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
545             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
546             source="1.6"             source="6"
547             classpath=""             classpath=""
548             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
549             includeAntRuntime="false"             includeAntRuntime="false"
# Line 547  Line 552 
552             fork="true">             fork="true">
553    
554        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
555        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
556        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
557          <compilerarg line="${build.args}"/>
558    
559      </javac>      </javac>
560      </target>
561    
     <mkdir dir="${build.jdk7.lib.dir}"/>  
   
     <jar destfile="${jdk7product.jar}" index="true">  
       <fileset dir="${build.jdk7.classes.dir}"/>  
     </jar>  
   
     <mkdir dir="${build.jdk7.tck.classes.dir}"/>  
562    
563      <javac srcdir="${tck.src.dir}"    <target name="4jdk7-jar"
564             destdir="${build.jdk7.tck.classes.dir}"            depends="4jdk7compile"
565             debug="${build.debug}"            description="Builds library jar from compiled sources">
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="1.6"  
            classpath="${junit.jar}"  
            bootclasspath="${jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
566    
567      </javac>      <jar destfile="${4jdk7product.jar}">
568          <fileset dir="${build.4jdk7.classes.dir}"/>
569        </jar>
570    
571    </target>    </target>
572    
573    
574    <target name="run-jdk7-tck-tests"    <target name="4jdk7-test-tck"
575            depends="jdk7compile"            depends="4jdk7-jar"
576            description="Runs tck tests for jsr166-jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
577    
578      <run-tck-tests      <run-tck-tests
579        jvm="${java7}"        target="7"
580        tck.classes="${build.jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
581        product.jar="${jdk7product.jar}"/>        classes="${4jdk7product.jar}"/>
582    </target>    </target>
583    
584    
585    <target name="run-jdk7-tck-tests-via-junit-task"    <target name="4jdk7-test-tck-junit"
586            depends="jdk7compile">            depends="4jdk7compile"
587              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
588    
589      <junit printsummary="true"      <junit printsummary="true"
590             showoutput="true"             showoutput="true"
# Line 605  Line 594 
594             jvm="${java7}"             jvm="${java7}"
595             fork="true">             fork="true">
596    
597        <jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>        <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
598        <jvmarg value="-server"/>        <jvmarg value="-server"/>
599    
600        <classpath>        <classpath>
601          <pathelement location="${junit.jar}"/>          <pathelement location="${junit.jar}"/>
602          <pathelement location="${build.jdk7.tck.classes.dir}"/>          <pathelement location="${build.4jdk7.tck.classes.dir}"/>
603        </classpath>        </classpath>
604    
605        <formatter type="brief"/>        <formatter type="brief"/>
# Line 621  Line 610 
610      </junit>      </junit>
611    </target>    </target>
612    
613      <target name="4jdk7-test-jtreg"
614              depends="4jdk7compile"
615              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
616        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
617        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
618        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
619        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
620        <jtreg dir="${jtreg.src.dir}"
621               jdk="${jdk7.home}"
622               workDir="${build.4jdk7.dir}/JTwork"
623               reportDir="${build.4jdk7.dir}/JTreport">
624    
625          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
626          <arg value="-agentvm"/>
627          <arg value="-v:nopass,fail"/>
628          <arg value="-vmoptions:-esa -ea"/>
629          <arg value="-automatic"/>
630          <arg value="-k:!ignore"/>
631        </jtreg>
632      </target>
633    
634    
635      <target name="4jdk7-test"
636              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
637              description="Runs tck and jtreg tests for jsr166-4jdk7">
638      </target>
639    
640    
641    <target name="jdk7docs"    <target name="4jdk7docs"
642            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
643    
644      <delete dir="${build.jdk7.docs.dir}"/>      <delete dir="${dist.4jdk7.docs.dir}"/>
645      <mkdir dir="${build.jdk7.docs.dir}"/>      <mkdir dir="${dist.4jdk7.docs.dir}"/>
646    
647      <javadoc destdir="${build.jdk7.docs.dir}"      <javadoc destdir="${dist.4jdk7.docs.dir}"
648               packagenames="none"               packagenames="none"
649               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
650               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
651               sourcepath="${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
              bootclasspath="${bootclasspath6}"  
652               classpath=""               classpath=""
653               source="1.6"               executable="${javadoc7}">
654               executable="${javadoc7}"        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
655          <include name="**/*.java"/>          <include name="**/*.java"/>
656        </fileset>        </fileset>
657          <arg value="-XDignore.symbol.file=true"/>
658      </javadoc>      </javadoc>
   
659    </target>    </target>
660    
661    
662    <target name="jdk7dist"    <target name="4jdk7dist"
663            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
664            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
665    
666    
667      <target name="4jdk7clean"
668              description="Removes all 4jdk7 build products">
669    
670    <target name="jdk7clean"      <delete dir="${build.4jdk7.dir}"/>
           description="Removes all build products">  
   
     <delete dir="${build.jdk7.dir}"/>  
671    
672    </target>    </target>
673    
674    
675      <target name="4jdk7dist-clean"
   <target name="jdk7dist-clean"  
676            description="Removes all build and distribution products">            description="Removes all build and distribution products">
677    
678    </target>    </target>
679    
680    <target name="jdk7dist-docs"    <target name="4jdk7dist-jar"
681            description="Builds javadocs without custom tags to dist folder">            depends="4jdk7clean, 4jdk7-jar">
   
     <delete dir="${dist.jdk7.docs.dir}"/>  
     <mkdir dir="${dist.jdk7.docs.dir}"/>  
682    
683      <javadoc destdir="${dist.jdk7.docs.dir}"      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${jdk7src.dir}/intro.html"  
              sourcepath="${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}"  
              bootclasspath="${bootclasspath6}"  
              source="1.6">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
684    
685    </target>    </target>
686    
   <target name="jdk7dist-jar"  
           depends="jdk7clean, jdk7compile">  
   
     <copy file="${jdk7product.jar}" todir="${dist.dir}"/>  
   
   </target>  
687    
688    <!-- jsr166x -->    <!-- jsr166x -->
689    
   
690    <target name="jsr166xcompile"    <target name="jsr166xcompile"
691            depends="init, configure-compiler"            depends="configure-compiler"
692            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
693    
694      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
695    
696      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
697            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
698              debug="${build.debug}"              debug="${build.debug}"
699         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
700        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
701             source="${build.sourcelevel}"             classpath=""
702               bootclasspath="${bootclasspath6}"
703               source="5"
704               includeAntRuntime="false"
705               includeJavaRuntime="false"
706               executable="${javac7}"
707               fork="true">               fork="true">
708    
709        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
710        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
711          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
712          <compilerarg line="${build.args}"/>
713    
714      </javac>      </javac>
   
715    </target>    </target>
716    
717    
718      <target name="jsr166x-jar"
   <target name="jsr166xjar"  
719            depends="jsr166xcompile"            depends="jsr166xcompile"
720            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
721    
722      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
723          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
724      </jar>      </jar>
725    
726    </target>    </target>
727    
728    
   
729    <target name="jsr166xdocs"    <target name="jsr166xdocs"
730            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
731    
732      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
733      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
734    
735      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
736               packagenames="jsr166x"               packagenames="jsr166x.*"
737               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
738               source="${build.sourcelevel}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
739               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
740               additionalparam="-XDignore.symbol.file=true" />               source="5"
741                 executable="${javadoc7}">
742          <arg value="-XDignore.symbol.file=true"/>
743    
744        </javadoc>
745    </target>    </target>
746    
747    
748    <target name="jsr166xdist"    <target name="jsr166xdist"
749            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
750            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
751    
752    
   
753    <target name="jsr166xclean"    <target name="jsr166xclean"
754            description="Removes all build products">            description="Removes all jsr166x build products">
755    
756      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
757    
758    </target>    </target>
759    
760    
   
761    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
762            description="Removes all build and distribution products">            description="Removes all build and distribution products">
763    
764    </target>    </target>
765    
766    
   
   <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>  
   
767    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
768            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166x-jar">
769    
770      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
771    
772    </target>    </target>
773    
# Line 802  Line 775 
775    
776    
777    <target name="jsr166ycompile"    <target name="jsr166ycompile"
778            depends="init, configure-compiler"            depends="configure-compiler"
779            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
780    
781      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
782    
783      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
784            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
785              debug="${build.debug}"              debug="${build.debug}"
786         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
787        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
788             source="${build.sourcelevel}"             source="6"
789               classpath=""
790               bootclasspath="${bootclasspath6}"
791               includeAntRuntime="false"
792               includeJavaRuntime="false"
793               executable="${javac7}"
794               fork="true">               fork="true">
795    
796        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
797        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
798        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
799          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
800    
801      </javac>      </javac>
   
802    </target>    </target>
803    
804    
805      <target name="jsr166y-jar"
   <target name="jsr166yjar"  
806            depends="jsr166ycompile"            depends="jsr166ycompile"
807            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
808    
809      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
810          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
811      </jar>      </jar>
812    
813    </target>    </target>
814    
815    
   
816    <target name="jsr166ydocs"    <target name="jsr166ydocs"
817            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
818    
819      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
820      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
821    
822      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
823               packagenames="jsr166y"               packagenames="jsr166y.*"
824               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
825               source="${build.sourcelevel}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
826               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
827               additionalparam="-XDignore.symbol.file=true" />               source="6"
828                 executable="${javadoc7}">
829          <arg value="-XDignore.symbol.file=true"/>
830    
831        </javadoc>
832    </target>    </target>
833    
834    
835    <target name="jsr166ydist"    <target name="jsr166ydist"
836            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
837            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
838    
839    
   
840    <target name="jsr166yclean"    <target name="jsr166yclean"
841            description="Removes all build products">            description="Removes all jsr166y build products">
842    
843      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
844    
845    </target>    </target>
846    
847    
   
848    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
849            description="Removes all build and distribution products">            description="Removes all build and distribution products">
850    
851    </target>    </target>
852    
   <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>  
   
853    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
854            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166y-jar">
855    
856      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
857    
858    </target>    </target>
859    
# Line 906  Line 862 
862    
863    
864    <target name="extra166ycompile"    <target name="extra166ycompile"
865            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166y-jar"
866            description="Compiles extra166y sources">            description="Compiles extra166y sources">
867    
868      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
869    
870      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
871            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
872              debug="${build.debug}"              debug="${build.debug}"
             classpath="${jsr166yproduct.jar}"  
873         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
874        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
875             source="${build.sourcelevel}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
876               classpath=""
877               source="6"
878               includeAntRuntime="false"
879               includeJavaRuntime="false"
880               executable="${javac7}"
881               fork="true">               fork="true">
882    
883        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
884        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
885        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
886          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
887    
888      </javac>      </javac>
   
889    </target>    </target>
890    
891    
892      <target name="extra166y-jar"
   <target name="extra166yjar"  
893            depends="extra166ycompile"            depends="extra166ycompile"
894            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
895    
896      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
897          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
898      </jar>      </jar>
899    
900    </target>    </target>
901    
902    
   
903    <target name="extra166ydocs"    <target name="extra166ydocs"
904            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
905    
906      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
907      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
908    
909      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
910               packagenames="extra166y"               packagenames="extra166y.*"
911               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
912               source="${build.sourcelevel}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
913               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
914               additionalparam="-XDignore.symbol.file=true" />               source="6"
915                 executable="${javadoc7}">
916          <arg value="-XDignore.symbol.file=true"/>
917    
918        </javadoc>
919    </target>    </target>
920    
921    
922    <target name="extra166ydist"    <target name="extra166ydist"
923            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
924            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
925    
926    
   
927    <target name="extra166yclean"    <target name="extra166yclean"
928            description="Removes all build products">            description="Removes all extra166y build products">
929    
930      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
931    
932    </target>    </target>
933    
934    
   
935    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
936            description="Removes all build and distribution products">            description="Removes all build and distribution products">
937    
938    </target>    </target>
939    
   <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>  
   
940    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
941            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166y-jar">
942    
943      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
944    
945    </target>    </target>
946    
# Line 1012  Line 950 
950            depends="configure-compiler"            depends="configure-compiler"
951            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
952    
953      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
954    
955      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
956             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
957             debug="${build.debug}"             debug="${build.debug}"
958             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
959             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
960             source="1.7"             source="7"
961             classpath=""             classpath=""
962             includeAntRuntime="false"             includeAntRuntime="false"
963             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1027  Line 965 
965             fork="true">             fork="true">
966    
967        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
968        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
969        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
970          <compilerarg line="${build.args}"/>
971    
972      </javac>      </javac>
   
973    </target>    </target>
974    
975    
976      <target name="jsr166e-jar"
   <target name="jsr166ejar"  
977            depends="jsr166ecompile"            depends="jsr166ecompile"
978            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
979    
980      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
981          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
982      </jar>      </jar>
983    
984    </target>    </target>
985    
986    
   
987    <target name="jsr166edocs"    <target name="jsr166edocs"
988            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
989    
990      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
991      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
992    
993        <javadoc destdir="${dist.jsr166ejavadocs.dir}"
994                 packagenames="jsr166e.*"
995                 link="${jdkapidocs.url}"
996                 sourcepath="${topsrc.dir}:${jdk7src.dir}"
997                 source="7"
998                 executable="${javadoc7}">
999          <arg value="-XDignore.symbol.file=true"/>
1000    
     <javadoc destdir="${build.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapi7docs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
1001      </javadoc>      </javadoc>
1002      </target>
1003    
1004    
1005      <target name="jsr166e-test-tck"
1006              depends="jsr166e-jar"
1007              description="Runs tck tests for jsr166e">
1008    
1009        <run-tck-tests
1010          tck.src.dir="${test.src.dir}/tck-jsr166e"
1011          source="7"
1012          target="8"
1013          workdir="${build.jsr166e.dir}"
1014          classes="${jsr166e.jar}"/>
1015    </target>    </target>
1016    
1017    
1018    <target name="jsr166edist"    <target name="jsr166edist"
1019            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1020            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1021    
1022    
   
1023    <target name="jsr166eclean"    <target name="jsr166eclean"
1024            description="Removes all build products">            description="Removes all jsr166e build products">
1025    
1026      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
1027    
1028    </target>    </target>
1029    
1030    
   
1031    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1032            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1033    
1034    </target>    </target>
1035    
   <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>  
   
1036    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1037            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166e-jar">
1038    
1039      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1040    
1041    </target>    </target>
1042    

Legend:
Removed from v.1.97  
changed lines
  Added in v.1.124

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8