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

Diff of /jsr166/build.xml

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

revision 1.72 by dl, Fri May 20 16:29:57 2005 UTC revision 1.99 by jsr166, Sat Jan 19 01:37:44 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.5"/>    <property name="build.sourcelevel"    value="1.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"/>
42    
43    <!-- Build locations -->    <!-- Build locations -->
44    <property name="build.dir"            location="build"/>    <property name="build.dir"                   location="build"/>
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.j1.dir"         location="${build.dir}/j1"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
48    <property name="build.loops.dir"      location="${build.dir}/loops"/>    <property name="build.lib.dir"               location="${build.dir}/lib"/>
49    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50    <property name="build.ant.dir"        location="${build.dir}/ant"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
51    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>  
52    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53    <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56    <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>    <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57    <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>  
58      <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61    
62      <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63      <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64      <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65    
66      <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67      <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68      <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69    
70      <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71      <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72      <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
73    
74      <!-- JDK binary locations -->
75      <property name="jdks.home"  location="${user.home}/jdk"/>
76    
77      <macrodef name="defjdklocations">
78        <attribute name="v"/>
79        <sequential>
80        <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81        <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82        <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83        <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84        <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86        <property name="bootclasspath@{v}"
87         value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88        </sequential>
89      </macrodef>
90    
91      <defjdklocations v="6"/>
92      <defjdklocations v="7"/>
93      <defjdklocations v="8"/>
94    
95      <macrodef name="run-tck-tests">
96        <attribute name="jvm"/>
97        <attribute name="tck.classes"/>
98        <attribute name="product.jar" default="${product.jar}"/>
99        <attribute name="jvmflags" default=""/>
100        <sequential>
101        <java classname="JSR166TestCase"
102              jvm="@{jvm}" fork="true">
103            <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104            <jvmarg line="@{jvmflags}"/>
105            <classpath>
106              <pathelement location="${junit.jar}"/>
107              <pathelement location="@{tck.classes}"/>
108            </classpath>
109        </java>
110        </sequential>
111      </macrodef>
112    
113    <!-- Source locations -->    <!-- Source locations -->
114    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
115    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
   <property name="j1.src.dir"           location="${basedir}/src/javaone"/>  
116    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
117    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
118    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
   <property name="ant.src.dir"          location="${basedir}/etc/ant"/>  
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>  
119    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
120    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
121    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
122    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123      <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124      <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125      <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126      <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127      <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128    
129    <!-- Distribution locations -->    <!-- Distribution locations -->
130    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131      <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133      <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134      <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135      <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
136    
137    <!-- Jar locations -->    <!-- Jar locations -->
138    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139      <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141      <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142      <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143      <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
   <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>  
145    
146    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
147    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
148    
149      <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150      <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151      <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152      <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153    
154      <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155      <!-- The below does not yet exist as of 2012-11 -->
156      <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157      <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158    
159    <!-- Test classpath -->    <!-- Test classpath -->
160    <path id="test.classpath">    <path id="test.classpath">
161      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 82  Line 167 
167      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
168    </path>    </path>
169    
   <!-- J1 classpath -->  
   <path id="j1.classpath">  
     <pathelement location="${build.classes.dir}"/>  
     <pathelement location="${build.j1.dir}"/>  
     <pathelement location="${junit.jar}"/>  
   
     <!-- Include dl.u.c for BoundedBuffer comparison -->  
     <pathelement location="${concurrent.jar}"/>  
   </path>  
   
170    
171    <!-- Main targets -->    <!-- Main targets -->
172    
173      <target name="dists"
174              depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
175              description="Builds all public jars and docs"/>
176    
177    <target name="compile"    <target name="compile"
178            depends="init, configure-compiler"            depends="init, configure-compiler"
# Line 111  Line 189 
189               fork="true">               fork="true">
190    
191        <include name="**/*.java"/>        <include name="**/*.java"/>
192          <compilerarg value="-XDignore.symbol.file=true"/>
193    
194  <!--  <!--
195        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
 -->  
196        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
197          <compilerarg line="-Xlint -Xmaxwarns 1000"/>
198    -->
199    
200      </javac>      </javac>
201    
# Line 148  Line 229 
229      <delete dir="${build.javadocs.dir}"/>      <delete dir="${build.javadocs.dir}"/>
230      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${build.javadocs.dir}"/>
231    
232      <javadoc destdir="${build.javadocs.dir}"      <!-- the packagenames="none" hack below prevents scanning the -->
233                  link="http://java.sun.com/j2se/1.5.0/docs/api"      <!-- sourcepath for packages -->
             overview="${src.dir}/intro.html"  
             sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"  
     >            
   
       <packageset dir="${src.dir}"/>  
   
     </javadoc>  
   
   </target>  
234    
235        <javadoc destdir="${build.javadocs.dir}"
236                 packagenames="none"
237    <target name="doccheck"               link="${jdkapidocs.url}"
238            depends="filter-doccheck"               overview="${src.dir}/intro.html"
239            description="Reports on javadoc style errors">               sourcepath="${src.dir}:${jdksrc.dir}"
240                 additionalparam="-XDignore.symbol.file=true" >
241      <delete dir="${build.doccheck.dir}"/>        <fileset dir="${src.dir}" defaultexcludes="yes">
242      <mkdir dir="${build.doccheck.dir}"/>          <include name="**/*.java"/>
243          </fileset>
     <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"  
          docletpath="${lib.dir}/doccheck.jar"  
             destdir="${build.doccheck.dir}">  
       <packageset dir="${build.dc-filter.dir}"/>  
244      </javadoc>      </javadoc>
245    
     <echo>DocCheck output is in ${build.doccheck.dir}</echo>  
   
   </target>  
   
   
   
   <target name="checkstyle"  
           depends="filter-src"  
           description="Reports on style errors in Java source (verbose, mostly chaff)">  
   
     <taskdef resource="checkstyletask.properties"  
             classpath="${lib.dir}/checkstyle-all-3.1.jar"/>  
   
     <mkdir dir="${build.checkstyle.dir}"/>  
   
     <checkstyle config="etc/checkstyle/sun_checks.xml"  
        failOnViolation="false">  
       <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>  
       <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>  
     </checkstyle>  
   
     <style in="${build.checkstyle.dir}/checkstyle-report.xml"  
           out="${build.checkstyle.dir}/checkstyle-report.html"  
         style="${stylesheet.dir}/checkstyle-frames.xsl"/>  
   
246    </target>    </target>
247    
248    
# Line 209  Line 252 
252            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
253    
254    
   
255    <target name="release"    <target name="release"
256            depends="dist"            depends="dist"
257            description="Puts entire CVS tree, plus distribution productions, in a jar">            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 256  Line 298 
298      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
299      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
300    
301      <javadoc destdir="${dist.javadocs.dir}"      <!-- the packagenames="none" hack below prevents scanning the -->
302                link="http://java.sun.com/j2se/1.5.0/docs/api"      <!-- sourcepath for packages -->
             overview="${src.dir}/intro.html"  
303    
304              sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"      <javadoc destdir="${dist.javadocs.dir}"
305       >               packagenames="none"
306        <packageset dir="${src.dir}" defaultexcludes="yes">               link="${jdkapidocs.url}"
307        <include name="java/util/concurrent"/>               overview="${src.dir}/intro.html"
308        <include name="java/util/concurrent/atomic"/>               sourcepath="${src.dir}:${jdksrc.dir}"
309        <include name="java/util/concurrent/locks"/>               additionalparam="-XDignore.symbol.file=true" >
310        </packageset>        <fileset dir="${src.dir}" defaultexcludes="yes">
311        <fileset dir="${topsrc.dir}" defaultexcludes="yes">          <include name="**/*.java"/>
       <include name="main/java/util/*.java"/>  
 <!--      <include name="jsr166x/*.java"/> -->  
312        </fileset>        </fileset>
313      </javadoc>      </javadoc>
314    
# Line 298  Line 337 
337    </target>    </target>
338    
339    
   <target name="compile-ant-filter"  
           depends="init">  
   
     <mkdir dir="${build.ant.dir}"/>  
   
     <javac srcdir="${ant.src.dir}"  
           destdir="${build.ant.dir}"  
            source="1.4"/>  
   
   </target>  
   
   
   <target name="filter-src"  
           depends="compile-ant-filter">  
   
     <mkdir dir="${build.filter.src.dir}"/>  
   
     <copy todir="${build.filter.src.dir}">  
       <fileset dir="${src.dir}">  
         <include name="**/*.html"/>  
       </fileset>  
     </copy>  
   
     <copy todir="${build.filter.src.dir}">  
       <fileset dir="${src.dir}">  
         <exclude name="**/*.html"/>  
         <!-- Files excluded from dist-docs -->  
         <exclude name="java/util/Random.*"/>  
         <exclude name="sun/misc/Unsafe.*"/>  
       </fileset>  
       <!--  
       <filterchain>  
       -->  
   
         <!--  
          # This filter gets rid of angle-bracketed type parameters  
          # so that javadoc can run on the result. The following  
          # heuristic seems to work:  
          #  
          # For all lines not starting with space(s)-asterisk-space(s),  
          #   replace <something> with a space, where there may be more  
          #   than one right angle bracket at the end, and "something"  
          #   must not contain parens or pipes. (This may need some  
          #   tweaking.)  
          -->  
   
         <!--  
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
           <param name="notmatching" value="^\s+\*\s.*$"/>  
           <param name="pattern"     value="&lt;[^|>()]+?>+"/>  
           <param name="replacement" value=" "/>  
         </filterreader>  
         -->  
   
       <!--  
       </filterchain>  
       -->  
     </copy>  
   
   </target>  
   
   
   <target name="filter-doccheck"  
           depends="filter-src">  
   
     <mkdir dir="${build.dc-filter.dir}"/>  
   
     <copy todir="${build.dc-filter.dir}">  
       <fileset dir="${build.filter.src.dir}">  
         <include name="**/*.html"/>  
       </fileset>  
     </copy>  
   
     <property name="generic.declarations"  
              value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"  
     />  
   
     <copy todir="${build.dc-filter.dir}">  
       <fileset dir="${build.filter.src.dir}">  
         <exclude name="**/*.html"/>  
       </fileset>  
       <filterchain>  
         <!--  
          # These two filters try to make the source look like  
          # something that doccheck can process. The first removes  
          # -source 1.4 assertions and the second adds in a bunch  
          # of single letter public nested marker interfaces so that  
          # the generic type parameters are recognized.  
          -->  
   
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
           <param name="matching"    value="^\s*assert[\s ].*$"/>  
           <param name="pattern"     value="assert"/>  
           <param name="replacement" value="//assert"/>  
         </filterreader>  
   
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
           <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>  
           <param name="pattern"     value="$"/>  
           <param name="replacement" value=" ${generic.declarations}"/>  
         </filterreader>  
   
       </filterchain>  
     </copy>  
   
   </target>  
   
   
340    <target name="compile-tests"    <target name="compile-tests"
341            depends="jar">            depends="jar">
342    
# Line 424  Line 352 
352    
353        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
354        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
355          <compilerarg value="-XDignore.symbol.file=true"/>
356    
357        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
358    
# Line 441  Line 370 
370    
371        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
372        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
373          <compilerarg value="-XDignore.symbol.file=true"/>
374    
375        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
376    
# Line 457  Line 387 
387    
388        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
389        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
390          <compilerarg value="-XDignore.symbol.file=true"/>
391    
392        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
393    
# Line 529  Line 460 
460        <fileset dir="${build.reports.dir}">        <fileset dir="${build.reports.dir}">
461          <include name="TEST-*.xml"/>          <include name="TEST-*.xml"/>
462        </fileset>        </fileset>
463        <report styledir="${stylesheet.dir}"        <report format="${junit.report.format}" todir="${build.reports.dir}"
                 format="${junit.report.format}"  
                  todir="${build.reports.dir}"  
464        />        />
465      </junitreport>      </junitreport>
466    
# Line 581  Line 510 
510    </target>    </target>
511    
512    
   
   <!-- Anthill targets -->  
   
   <target name="anthill-build">  
   
     <!-- Override this in user.properties -->  
     <property name="tiger.home" location="e:/j2sdk1.5.0"/>  
   
     <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">  
       <arg value="-Xmx256000000"/>  
       <!-- classpath of new JVM -->  
       <arg value="-classpath"/> <arg path="${java.class.path}"/>  
       <!-- location of Ant home directory -->  
       <arg value="-Dant.home=${ant.home}"/>  
       <!-- the Ant main class -->  
       <arg value="org.apache.tools.ant.Main"/>  
       <!-- The build file -->  
       <arg value="-buildfile"/>  <arg value="build.xml"/>  
       <!-- the target to build on the new Ant instance -->  
       <arg value="-DJAVA_HOME=${tiger.home}"/>  
       <arg value="do-anthill-build"/>  
     </exec>  
   </target>  
   
   <target name="do-anthill-build"  
           depends="jar, test, docs, dist-docs"/>  
   
   <target name="anthill-publish">  
   
     <copy todir="${deployDir}/docs/private">  
       <fileset dir="${build.javadocs.dir}"/>  
     </copy>  
   
     <copy todir="${deployDir}/docs/public">  
       <fileset dir="${dist.javadocs.dir}"/>  
     </copy>  
   
     <copy tofile="${deployDir}/index.html"  
           file="${basedir}/etc/anthill-index.html"/>  
   
     <copy todir="${deployDir}/notes">  
       <fileset dir="${basedir}/etc/notes"/>  
     </copy>  
   
   </target>  
   
   
   
513    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
514    
515    
   <target name="sample" depends="init, configure-compiler"  
           description="Standalone demo program">  
   
     <mkdir dir="${build.testcases.dir}"/>  
   
     <javac srcdir="${test.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <include name="jsr166/test/Sample.java"/>  
   
     </javac>  
   
     <copy todir="${build.testcases.dir}">  
       <fileset dir="${test.src.dir}">  
         <include name="**/*.properties"/>  
       </fileset>  
     </copy>  
   
   
     <java classname="jsr166.test.Sample" fork="true">  
       <classpath refid="test.classpath"/>  
       <!-- <jvmarg value="-ea"/> -->  
       <!-- <jvmarg value="-server"/> -->  
       <!-- <arg value="1000"/> -->  
     </java>  
   </target>  
   
   
516    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="init, configure-compiler"
517            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
518    
# Line 680  Line 528 
528    
529        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
530        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
531          <compilerarg value="-XDignore.symbol.file=true"/>
532    
533      </javac>      </javac>
534    
# Line 690  Line 539 
539    </target>    </target>
540    
541    
542    <target name="compile-j1" depends="init, configure-compiler, compile">    <!-- jsr166 4jdk7 -->
543    
     <mkdir dir="${build.j1.dir}"/>  
544    
545      <javac srcdir="${j1.src.dir}"    <target name="4jdk7compile"
546            destdir="${build.j1.dir}"            depends="configure-compiler"
547              debug="${build.debug}"            description="Compiles src/jdk7 sources, targeting jdk7">
548         debuglevel="${build.debuglevel}"  
549        deprecation="${build.deprecation}"      <mkdir dir="${build.4jdk7.classes.dir}"/>
550             source="${build.sourcelevel}" >  
551        <javac srcdir="${4jdk7src.dir}"
552               destdir="${build.4jdk7.classes.dir}"
553               debug="${build.debug}"
554               debuglevel="${build.debuglevel}"
555               deprecation="${build.deprecation}"
556               source="1.6"
557               classpath=""
558               bootclasspath="${bootclasspath6}"
559               includeAntRuntime="false"
560               includeJavaRuntime="false"
561               executable="${javac7}"
562               fork="true">
563    
564        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="**/dijkstra/**"/>  
   
565        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
566        <classpath refid="j1.classpath"/>        <compilerarg value="-XDignore.symbol.file=true"/>
567          <compilerarg value="-Xlint:all"/>
568    
569      </javac>      </javac>
570    
571    </target>      <mkdir dir="${build.4jdk7.lib.dir}"/>
572    
573        <jar destfile="${4jdk7product.jar}" index="true">
574          <fileset dir="${build.4jdk7.classes.dir}"/>
575        </jar>
576    
577    <target name="sw" depends="compile-j1"      <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
           description="Runs the SwingWorker demo">  
578    
579      <!--      <javac srcdir="${tck.src.dir}"
580      <java classname="jsr166.swing.SwingWorkerDemo" fork="true">             destdir="${build.4jdk7.tck.classes.dir}"
581        <classpath refid="j1.classpath"/>             debug="${build.debug}"
582      </java>             debuglevel="${build.debuglevel}"
583      -->             deprecation="${build.deprecation}"
584               source="1.6"
585               classpath="${junit.jar}"
586               bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
587               includeAntRuntime="false"
588               includeJavaRuntime="false"
589               executable="${javac7}"
590               fork="true">
591    
592      <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>        <include name="**/*.java"/>
593          <compilerarg line="${build.args}"/>
594          <compilerarg value="-XDignore.symbol.file=true"/>
595          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
596    
597      <exec dir="${build.j1.dir}" executable="appletviewer.exe">      </javac>
       <arg value="${build.j1.dir}/SwingWorker.html"/>  
     </exec>  
598    
599    </target>    </target>
600    
   <target name="j1" depends="compile-j1"  
           description="Runs a standalone JavaOne program">  
601    
602      <java classname="${j1.test}" fork="true">    <target name="4jdk7-test-tck"
603        <classpath refid="j1.classpath"/>            depends="4jdk7compile"
604        <jvmarg value="-client"/>            description="Runs tck tests for jsr166-4jdk7 directly">
605        <run-tck-tests
606          jvm="${java7}"
607          tck.classes="${build.4jdk7.tck.classes.dir}"
608          product.jar="${4jdk7product.jar}"/>
609      </target>
610    
       <!-- TestPseudoRandom args -->  
       <arg value="2"/>  
       <arg value="25"/>  
       <arg value="100000"/>  
611    
612        <!-- WebCrawler args -->    <target name="4jdk7-test-tck-junit"
613        <!--            depends="4jdk7compile"
614        <arg value="jsr166.webcrawler.WebCrawler3"/>            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
       <arg value="http://www.priorartisans.com"/>  
       <arg value="25"/>  
       -->  
615    
616      </java>      <junit printsummary="true"
617               showoutput="true"
618               errorProperty="junit.failed"
619               failureProperty="junit.failed"
620               includeantruntime="true"
621               jvm="${java7}"
622               fork="true">
623    
624    </target>        <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
625          <jvmarg value="-server"/>
626    
627          <classpath>
628            <pathelement location="${junit.jar}"/>
629            <pathelement location="${build.4jdk7.tck.classes.dir}"/>
630          </classpath>
631    
632    <target name="test-j1" depends="compile-j1"        <formatter type="brief"/>
           description="Runs testcases from the JavaOne source directories">  
633    
634      <junit printsummary="true"        <test name="JSR166TestCase" haltonfailure="no">
635               showoutput="true"        </test>
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.j1.dir}"  
                    fork="true">  
636    
637        <!-- <jvmarg value="-server"/> -->      </junit>
638        <classpath refid="j1.classpath"/>    </target>
       <formatter type="xml"/>  
639    
       <batchtest todir="${build.j1.dir}">  
         <fileset dir="${j1.src.dir}">  
           <include name="**/*Test.java"/>  
         </fileset>  
       </batchtest>  
640    
641      </junit>    <target name="4jdk7docs"
642              description="Builds javadocs with custom tags to build folder">
643    
644      <available property="junit.report.format"      <delete dir="${build.4jdk7.docs.dir}"/>
645                    value="frames"      <mkdir dir="${build.4jdk7.docs.dir}"/>
               classname="org.apache.xalan.lib.Redirect"/>  
     <property name="junit.report.format" value="noframes"/>  
646    
647      <junitreport todir="${build.j1.dir}">      <javadoc destdir="${build.4jdk7.docs.dir}"
648        <fileset dir="${build.j1.dir}">               packagenames="none"
649          <include name="TEST-*.xml"/>               link="${jdkapi7docs.url}"
650                 overview="${4jdk7src.dir}/intro.html"
651                 sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
652                 classpath=""
653                 executable="${javadoc7}">
654          <arg value="-XDignore.symbol.file=true"/>
655          <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
656            <include name="**/*.java"/>
657        </fileset>        </fileset>
658        <report styledir="${stylesheet.dir}"      </javadoc>
                 format="${junit.report.format}"  
                  todir="${build.j1.dir}"  
       />  
     </junitreport>  
   
     <fail message="Test Cases Failed" if="junit.failed"/>  
659    
660    </target>    </target>
661    
662    
663      <target name="4jdk7dist"
664              depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
665              description="Puts all distributable products in single hierarchy"/>
666    
667    
668    
669    <!-- C++ and JNI definitions and demos -->    <target name="4jdk7clean"
670              description="Removes all build products">
671    
672    <target name="configure-cpp">      <delete dir="${build.4jdk7.dir}"/>
673    
674      <!-- Define tasks and types -->    </target>
675    
     <path id="cpptasks.path">  
       <pathelement location="${lib.dir}/cpptasks.jar"/>  
     </path>  
     <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>  
     <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>  
676    
     <!-- Set platform property for JNI includes -->  
677    
678      <condition property="platform" value="linux">    <target name="4jdk7dist-clean"
679        <os name="Linux"/>            description="Removes all build and distribution products">
     </condition>  
     <condition property="platform" value="win32">  
       <os family="windows"/>  
     </condition>  
     <condition property="platform" value="solaris">  
       <os name="SunOS"/>  
     </condition>  
680    
681    </target>    </target>
682    
683      <target name="4jdk7dist-docs"
684              description="Builds javadocs without custom tags to dist folder">
685    
686        <delete dir="${dist.4jdk7.docs.dir}"/>
687        <mkdir dir="${dist.4jdk7.docs.dir}"/>
688    
689    <target name="cppdemo" depends="configure-cpp">      <javadoc destdir="${dist.4jdk7.docs.dir}"
690                 packagenames="none"
691                 link="${jdkapi7docs.url}"
692                 overview="${4jdk7src.dir}/intro.html"
693                 sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
694                 classpath=""
695                 executable="${javadoc7}">
696          <arg value="-XDignore.symbol.file=true"/>
697          <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
698            <include name="**/*.java"/>
699          </fileset>
700        </javadoc>
701    
702      <mkdir dir="${build.dir}"/>    </target>
703    
704      <cc multithreaded="true"    <target name="4jdk7dist-jar"
705                   name="g++"            depends="4jdk7clean, 4jdk7compile">
                objdir="${build.dir}"  
               outfile="${build.dir}/CppDemo">  
       <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>  
       <libset libs="stdc++"/>  
     </cc>  
706    
707      <exec executable="${build.dir}/CppDemo">      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
       <arg line="count in word frequency of word in command line count"/>  
     </exec>  
708    
709    </target>    </target>
710    
711      <!-- jsr166x -->
712    
   <target name="jnidemo" depends="init, configure-compiler, configure-cpp">  
713    
714      <mkdir dir="${build.testcases.dir}"/>    <target name="jsr166xcompile"
715              depends="init, configure-compiler"
716              description="Compiles jsr166x sources">
717    
718      <javac srcdir="${test.src.dir}"      <mkdir dir="${build.jsr166x.dir}"/>
719            destdir="${build.testcases.dir}"  
720        <javac srcdir="${jsr166xsrc.dir}"
721              destdir="${build.jsr166x.dir}"
722              debug="${build.debug}"              debug="${build.debug}"
723         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
724        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
725             source="${build.sourcelevel}"             source="${build.sourcelevel}"
726               fork="true">               fork="true">
727        <compilerarg value="${bootclasspath.args}"/>  
728          <include name="**/*.java"/>
729        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
730        <classpath refid="test.classpath"/>        <compilerarg value="-XDignore.symbol.file=true"/>
731        <include name="JniDemo.java"/>  
732      </javac>      </javac>
733    
734      <javah destdir="${build.testcases.dir}"    </target>
735        classpathref="test.classpath">  
736        <class name="JniDemo"/>  
737      </javah>  
738      <target name="jsr166xjar"
739      <cc multithreaded="true"            depends="jsr166xcompile"
740                   name="g++"            description="Builds library jar from compiled sources">
741                 objdir="${build.dir}"  
742                outfile="${build.dir}/JniDemo"      <mkdir dir="${build.jsr166xlib.dir}"/>
743                outtype="shared">  
744        <jar destfile="${jsr166xproduct.jar}">
745        <compiler>        <fileset dir="${build.jsr166x.dir}"/>
746          <defineset>      </jar>
           <define name="__int64" value="long long"/>  
         </defineset>  
         <includepath location="${java.home}/../include"/>  
         <includepath location="${java.home}/../include/${platform}"/>  
         <compilerarg value="-mno-cygwin"/>  
       </compiler>  
   
       <linker>  
         <linkerarg value="--add-stdcall-alias"/>  
       </linker>  
   
       <includepath location="${build.testcases.dir}"/>  
   
       <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>  
   
       <libset libs="stdc++"/>  
   
     </cc>  
   
     <!-- Necessary if windows, harmless if not -->  
     <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>  
   
     <java classname="JniDemo" fork="true">  
       <!-- Watch out: path separator hardwired to semicolon here! -->  
       <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>  
       <classpath refid="test.classpath"/>  
       <arg line="count in word frequency of word in command line count"/>  
     </java>  
747    
748    </target>    </target>
749    
750    
751    
752    <!-- Backward compatibility, work in progress (some files not checked in) -->    <target name="jsr166xdocs"
753              description="Builds javadocs with custom tags to build folder">
754    
755        <delete dir="${build.jsr166xjavadocs.dir}"/>
756        <mkdir dir="${build.jsr166xjavadocs.dir}"/>
757    
758        <javadoc destdir="${build.jsr166xjavadocs.dir}"
759                 packagenames="jsr166x"
760                 link="${jdkapidocs.url}"
761                 source="${build.sourcelevel}"
762                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
763                 additionalparam="-XDignore.symbol.file=true" />
764    
765      </target>
766    
767    
768      <target name="jsr166xdist"
769              depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
770              description="Puts all distributable products in single hierarchy"/>
771    
772    
773    
774      <target name="jsr166xclean"
775              description="Removes all build products">
776    
777        <delete dir="${build.jsr166x.dir}"/>
778        <delete dir="${build.jsr166xlib.dir}"/>
779    
780      </target>
781    
782    
783    
784      <target name="jsr166xdist-clean"
785              description="Removes all build and distribution products">
786    
787      </target>
788    
789    
790    
791      <target name="jsr166xdist-docs"
792              description="Builds javadocs without custom tags to dist folder">
793    
794        <delete dir="${dist.jsr166xjavadocs.dir}"/>
795        <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
796    
797    <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
798    <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>               packagenames="jsr166x"
799    <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>               link="${jdkapidocs.url}"
800    <property name="pretiger.sourcelevel" value="1.4"/>               source="${build.sourcelevel}"
801                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
802                 additionalparam="-XDignore.symbol.file=true" />
803    
804    <target name="defang"    </target>
        depends="init"  
    description="Generates pre-Tiger compatible source">  
805    
806      <delete dir="${pretiger.src.dir}"/>    <target name="jsr166xdist-jar"
807      <mkdir dir="${pretiger.src.dir}"/>            depends="jsr166xclean, jsr166xjar">
808    
809      <exec executable="perl">      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
       <arg file="etc/defang.pl"/>  
       <!-- <arg value="-v"/> -->  
       <arg value="-s"/> <arg file="${src.dir}"/>  
       <arg value="-t"/> <arg file="${pretiger.src.dir}"/>  
     </exec>  
810    
811    </target>    </target>
812    
813    <target name="compile-pretiger"    <!-- jsr166y -->
814            depends="init, configure-compiler, defang"  
815            description="Compiles pre-Tiger sources to build folder">  
816      <target name="jsr166ycompile"
817              depends="init, configure-compiler"
818              description="Compiles jsr166y sources">
819    
820      <mkdir dir="${build.pretiger.dir}"/>      <mkdir dir="${build.jsr166y.dir}"/>
821    
822      <javac srcdir="${pretiger.src.dir}"      <javac srcdir="${jsr166ysrc.dir}"
823            destdir="${build.pretiger.dir}"            destdir="${build.jsr166y.dir}"
824              debug="${build.debug}"              debug="${build.debug}"
825         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
826        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
827             source="${pretiger.sourcelevel}"             source="${build.sourcelevel}"
828               fork="true">               fork="true">
829    
830          <include name="**/*.java"/>
831        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
832        <exclude name="**/Thread.java"/>        <compilerarg value="-XDignore.symbol.file=true"/>
833          <compilerarg value="${bootclasspath.args}"/>
834    
835    <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
836    
837      </javac>      </javac>
838    
839    </target>    </target>
840    
   <target name="pretiger" depends="compile-pretiger">  
841    
     <mkdir dir="${build.lib.dir}"/>  
842    
843      <jar destfile="${pretiger.jar}">    <target name="jsr166yjar"
844        <fileset dir="${build.pretiger.dir}">            depends="jsr166ycompile"
845        </fileset>            description="Builds library jar from compiled sources">
846    
847        <mkdir dir="${build.jsr166ylib.dir}"/>
848    
849        <jar destfile="${jsr166yproduct.jar}" index="true">
850          <fileset dir="${build.jsr166y.dir}"/>
851      </jar>      </jar>
852    
853    </target>    </target>
854    
   <!-- jsr166x -->  
855    
856    
857    <target name="jsr166xcompile"    <target name="jsr166ydocs"
858            depends="init, configure-compiler"            description="Builds javadocs with custom tags to build folder">
           description="Compiles jsr166x sources">  
859    
860      <mkdir dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166yjavadocs.dir}"/>
861        <mkdir dir="${build.jsr166yjavadocs.dir}"/>
862    
863      <javac srcdir="${jsr166xsrc.dir}"      <javadoc destdir="${build.jsr166yjavadocs.dir}"
864            destdir="${build.jsr166x.dir}"               packagenames="jsr166y"
865                 link="${jdkapidocs.url}"
866                 source="${build.sourcelevel}"
867                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
868                 additionalparam="-XDignore.symbol.file=true" />
869    
870      </target>
871    
872    
873      <target name="jsr166ydist"
874              depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
875              description="Puts all distributable products in single hierarchy"/>
876    
877    
878    
879      <target name="jsr166yclean"
880              description="Removes all build products">
881    
882        <delete dir="${build.jsr166y.dir}"/>
883        <delete dir="${build.jsr166ylib.dir}"/>
884    
885      </target>
886    
887    
888    
889      <target name="jsr166ydist-clean"
890              description="Removes all build and distribution products">
891    
892      </target>
893    
894      <target name="jsr166ydist-docs"
895              description="Builds javadocs without custom tags to dist folder">
896    
897        <delete dir="${dist.jsr166yjavadocs.dir}"/>
898        <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
899    
900        <javadoc destdir="${dist.jsr166yjavadocs.dir}"
901                 packagenames="jsr166y"
902                 link="${jdkapidocs.url}"
903                 source="${build.sourcelevel}"
904                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
905                 additionalparam="-XDignore.symbol.file=true" />
906    
907      </target>
908    
909      <target name="jsr166ydist-jar"
910              depends="jsr166yclean, jsr166yjar">
911    
912        <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
913    
914      </target>
915    
916    
917      <!-- extra166y -->
918    
919    
920      <target name="extra166ycompile"
921              depends="init, configure-compiler, jsr166ycompile"
922              description="Compiles extra166y sources">
923    
924        <mkdir dir="${build.extra166y.dir}"/>
925    
926        <javac srcdir="${extra166ysrc.dir}"
927              destdir="${build.extra166y.dir}"
928              debug="${build.debug}"              debug="${build.debug}"
929                classpath="${jsr166yproduct.jar}"
930         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
931        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
932             source="${build.sourcelevel}"             source="${build.sourcelevel}"
# Line 981  Line 934 
934    
935        <include name="**/*.java"/>        <include name="**/*.java"/>
936        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
937          <compilerarg value="-XDignore.symbol.file=true"/>
938          <compilerarg value="${bootclasspath.args}"/>
939    
940    <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
941    
942      </javac>      </javac>
943    
# Line 988  Line 945 
945    
946    
947    
948    <target name="jsr166xjar"    <target name="extra166yjar"
949            depends="jsr166xcompile"            depends="extra166ycompile"
950            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
951    
952      <mkdir dir="${build.jsr166xlib.dir}"/>      <mkdir dir="${build.extra166ylib.dir}"/>
953    
954      <jar destfile="${jsr166xproduct.jar}">      <jar destfile="${extra166yproduct.jar}" index="true">
955        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
956      </jar>      </jar>
957    
958    </target>    </target>
959    
960    
961    
962    <target name="jsr166xdocs"    <target name="extra166ydocs"
963            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs with custom tags to build folder">
964    
965      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${build.extra166yjavadocs.dir}"/>
966      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${build.extra166yjavadocs.dir}"/>
967    
968      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${build.extra166yjavadocs.dir}"
969                  link="http://java.sun.com/j2se/1.5.0/docs/api/"               packagenames="extra166y"
970              sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               link="${jdkapidocs.url}"
971                 source="${build.sourcelevel}"
972      >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
973        <packageset dir="${topsrc.dir}" defaultexcludes="yes">               additionalparam="-XDignore.symbol.file=true" />
       <include name="jsr166x"/>  
       </packageset>  
   
   
     </javadoc>  
974    
975    </target>    </target>
976    
977    
978    <target name="jsr166xdist"    <target name="extra166ydist"
979            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
980            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
981    
982    
983    
984    <target name="jsr166xclean"    <target name="extra166yclean"
985            description="Removes all build products">            description="Removes all build products">
986    
987      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.extra166y.dir}"/>
988      <delete dir="${build.jsr166xlib.dir}"/>      <delete dir="${build.extra166ylib.dir}"/>
989    
990    </target>    </target>
991    
992    
993    
994    <target name="jsr166xdist-clean"    <target name="extra166ydist-clean"
995            description="Removes all build and distribution products">            description="Removes all build and distribution products">
996    
997    </target>    </target>
998    
999      <target name="extra166ydist-docs"
1000              description="Builds javadocs without custom tags to dist folder">
1001    
1002        <delete dir="${dist.extra166yjavadocs.dir}"/>
1003        <mkdir dir="${dist.extra166yjavadocs.dir}"/>
1004    
1005    <target name="jsr166xdist-docs"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
1006            description="Builds javadocs without custom tags to dist folder">               packagenames="extra166y"
1007                 link="${jdkapidocs.url}"
1008                 source="${build.sourcelevel}"
1009                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
1010                 additionalparam="-XDignore.symbol.file=true" />
1011    
1012      <delete dir="${dist.jsr166xjavadocs.dir}"/>    </target>
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>  
1013    
1014      <javadoc destdir="${dist.jsr166xjavadocs.dir}"    <target name="extra166ydist-jar"
1015                  link="http://java.sun.com/j2se/1.5.0/docs/api/"            depends="extra166yclean, extra166yjar">
1016                source="${build.sourcelevel}">  
1017        <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1018    
1019      </target>
1020    
1021      <!-- jsr166e -->
1022    
1023      <target name="jsr166ecompile"
1024              depends="configure-compiler"
1025              description="Compiles jsr166e sources">
1026    
1027        <mkdir dir="${build.jsr166e.dir}"/>
1028    
1029        <javac srcdir="${topsrc.dir}"
1030               destdir="${build.jsr166e.dir}"
1031               debug="${build.debug}"
1032               debuglevel="${build.debuglevel}"
1033               deprecation="${build.deprecation}"
1034               source="1.7"
1035               classpath=""
1036               includeAntRuntime="false"
1037               includeJavaRuntime="false"
1038               executable="${javac7}"
1039               fork="true">
1040    
1041          <include name="jsr166e/**/*.java"/>
1042          <compilerarg line="${build.args}"/>
1043          <compilerarg value="-XDignore.symbol.file=true"/>
1044          <compilerarg value="-Xlint:all"/>
1045    
1046        <packageset dir="${topsrc.dir}" defaultexcludes="yes">      </javac>
1047        <include name="jsr166x"/>  
1048        </packageset>    </target>
1049    
1050    
1051    
1052      <target name="jsr166ejar"
1053              depends="jsr166ecompile"
1054              description="Builds library jar from compiled sources">
1055    
1056        <mkdir dir="${build.jsr166elib.dir}"/>
1057    
1058        <jar destfile="${jsr166eproduct.jar}" index="true">
1059          <fileset dir="${build.jsr166e.dir}"/>
1060        </jar>
1061    
1062      </target>
1063    
1064    
1065    
1066      <target name="jsr166edocs"
1067              description="Builds javadocs with custom tags to build folder">
1068    
1069        <delete dir="${build.jsr166ejavadocs.dir}"/>
1070        <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1071    
1072        <javadoc destdir="${build.jsr166ejavadocs.dir}"
1073                 packagenames="jsr166e,jsr166e.extra"
1074                 link="${jdkapi7docs.url}"
1075                 source="1.7"
1076                 sourcepath="${topsrc.dir}:${jdk7src.dir}"
1077                 executable="${javadoc7}"
1078                 additionalparam="-XDignore.symbol.file=true" >
1079          <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1080            <include name="jsr166e/**/*.java"/>
1081          </fileset>
1082      </javadoc>      </javadoc>
1083    
1084    </target>    </target>
1085    
   <target name="jsr166xdist-jar"  
           depends="jsr166xclean, jsr166xjar">  
1086    
1087      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>    <target name="jsr166edist"
1088              depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1089              description="Puts all distributable products in single hierarchy"/>
1090    
1091    
1092    
1093      <target name="jsr166eclean"
1094              description="Removes all build products">
1095    
1096        <delete dir="${build.jsr166e.dir}"/>
1097        <delete dir="${build.jsr166elib.dir}"/>
1098    
1099      </target>
1100    
1101    
1102    
1103      <target name="jsr166edist-clean"
1104              description="Removes all build and distribution products">
1105    
1106      </target>
1107    
1108      <target name="jsr166edist-docs"
1109              description="Builds javadocs without custom tags to dist folder">
1110    
1111        <delete dir="${dist.jsr166ejavadocs.dir}"/>
1112        <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1113    
1114        <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1115                 packagenames="jsr166e,jsr166e.extra"
1116                 link="${jdkapidocs.url}"
1117                 source="1.7"
1118                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
1119                 additionalparam="-XDignore.symbol.file=true" />
1120    
1121      </target>
1122    
1123      <target name="jsr166edist-jar"
1124              depends="jsr166eclean, jsr166ejar">
1125    
1126        <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1127    
1128    </target>    </target>
1129    

Legend:
Removed from v.1.72  
changed lines
  Added in v.1.99

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