[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.70, Wed Aug 11 10:57:33 2004 UTC revision 1.106, Sat Jan 19 22:23: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.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"/>
# Line 30  Line 44 
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"/>
   <property name="build.j1.dir"         location="${build.dir}/j1"/>  
47    <property name="build.loops.dir"      location="${build.dir}/loops"/>    <property name="build.loops.dir"      location="${build.dir}/loops"/>
48    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.lib.dir"        location="${build.dir}/lib"/>
   <property name="build.ant.dir"        location="${build.dir}/ant"/>  
49    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
50    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.reports.dir"    location="${build.dir}/reports"/>
51    <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>  
52    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54    <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55      <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56      <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57    
58    <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
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="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140      <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141      <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142      <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
143      <property name="extra166y.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    
170    <!-- J1 classpath -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
171    <path id="j1.classpath">    <!-- TODO: How do we get &trade to work? -->
172      <pathelement location="${build.j1.dir}"/>    <!-- TODO: Why isn't @jls a "standard" tag? -->
173      <pathelement location="${junit.jar}"/>    <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174      <pathelement location="${concurrent.jar}"/>    <property name="javadoc.jls.cite" value="The Java Language Specification"/>
175    </path>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
   
176    
177    <!-- Main targets -->    <!-- Main targets -->
178    
179      <target name="dists"
180              depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
181              description="Builds all public jars and docs"/>
182    
183    <target name="compile"    <target name="compile"
184            depends="init, configure-compiler"            depends="configure-compiler"
185            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
186    
187      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
188    
# Line 104  Line 191 
191              debug="${build.debug}"              debug="${build.debug}"
192         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
193        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
194             source="${build.sourcelevel}"             classpath=""
195               includeAntRuntime="false"
196               includeJavaRuntime="false"
197               executable="${javac8}"
198               fork="true">               fork="true">
199    
200        <include name="**/*.java"/>        <include name="**/*.java"/>
201          <compilerarg line="${build.args}"/>
202          <compilerarg value="-XDignore.symbol.file=true"/>
203          <compilerarg value="-Xlint:all"/>
204    
205    <!--
206        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
207        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
208          <compilerarg line="-Xlint -Xmaxwarns 1000"/>
209    -->
210    
211      </javac>      </javac>
212    
# Line 132  Line 229 
229    
230    
231    <target name="test"    <target name="test"
232            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
233            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)" />
234    
235    
236    
237    <target name="docs"    <target name="docs"
238            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
   
     <delete dir="${build.javadocs.dir}"/>  
     <mkdir dir="${build.javadocs.dir}"/>  
   
     <javadoc destdir="${build.javadocs.dir}"  
                 link="http://java.sun.com/j2se/1.4.1/docs/api"  
             overview="${src.dir}/intro.html"  
               source="${build.sourcelevel}">  
   
       <tag name="revised" description="Last revised:"/>  
       <tag name="spec"    description="Specified by:"/>  
   
       <packageset dir="${src.dir}"/>  
   
     </javadoc>  
   
   </target>  
239    
240        <delete dir="${dist.javadocs.dir}"/>
241        <mkdir dir="${dist.javadocs.dir}"/>
242    
243        <!-- the packagenames="none" hack below prevents scanning the -->
244        <!-- sourcepath for packages -->
245    
246    <target name="doccheck"      <javadoc destdir="${dist.javadocs.dir}"
247            depends="filter-doccheck"               packagenames="none"
248            description="Reports on javadoc style errors">               link="${jdkapi8docs.url}"
249                 overview="${src.dir}/intro.html"
250      <delete dir="${build.doccheck.dir}"/>               sourcepath="${src.dir}:${jdk8src.dir}"
251      <mkdir dir="${build.doccheck.dir}"/>               classpath=""
252                 executable="${javadoc8}">
253      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"        <arg value="-XDignore.symbol.file=true"/>
254           docletpath="${lib.dir}/doccheck.jar"        <arg value="-tag"/>
255              destdir="${build.doccheck.dir}">        <arg value="${javadoc.jls.option}"/>
256        <packageset dir="${build.dc-filter.dir}"/>        <fileset dir="${src.dir}" defaultexcludes="yes">
257            <include name="**/*.java"/>
258          </fileset>
259      </javadoc>      </javadoc>
260    
     <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"/>  
   
261    </target>    </target>
262    
263    
264    
265    <target name="dist"    <target name="dist"
266            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, docs"
267            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
268    
269    
   
270    <target name="release"    <target name="release"
271            depends="dist"            depends="dist"
272            description="Puts entire CVS tree, plus distribution productions, in a jar">            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 247  Line 307 
307    
308    
309    
   <target name="dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.javadocs.dir}"/>  
     <mkdir dir="${dist.javadocs.dir}"/>  
   
     <javadoc destdir="${dist.javadocs.dir}"  
                 link="http://java.sun.com/j2se/1.4.2/docs/api"  
             overview="${src.dir}/intro.html"  
               source="${build.sourcelevel}">  
   
       <packageset dir="${src.dir}"/>  
   
     </javadoc>  
   
   </target>  
   
   
   
310    <!-- Internal targets -->    <!-- Internal targets -->
311    
312    
   <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>  
   
   
313    <target name="dist-jar"    <target name="dist-jar"
314            depends="clean, jar">            depends="clean, jar">
315    
# Line 287  Line 318 
318    </target>    </target>
319    
320    
   <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>  
   
   
321    <target name="compile-tests"    <target name="compile-tests"
322            depends="jar">            depends="jar">
323    
# Line 413  Line 333 
333    
334        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
335        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
336          <compilerarg value="-XDignore.symbol.file=true"/>
337    
338        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
339    
# Line 430  Line 351 
351    
352        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
353        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
354          <compilerarg value="-XDignore.symbol.file=true"/>
355    
356        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
357    
# Line 446  Line 368 
368    
369        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
370        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
371          <compilerarg value="-XDignore.symbol.file=true"/>
372    
373        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
374    
# Line 518  Line 441 
441        <fileset dir="${build.reports.dir}">        <fileset dir="${build.reports.dir}">
442          <include name="TEST-*.xml"/>          <include name="TEST-*.xml"/>
443        </fileset>        </fileset>
444        <report styledir="${stylesheet.dir}"        <report format="${junit.report.format}" todir="${build.reports.dir}"
                 format="${junit.report.format}"  
                  todir="${build.reports.dir}"  
445        />        />
446      </junitreport>      </junitreport>
447    
# Line 570  Line 491 
491    </target>    </target>
492    
493    
494      <!-- Various demos and test programs -->
495    
   <!-- Anthill targets -->  
496    
497    <target name="anthill-build">    <target name="loops" depends="configure-compiler"
498              description="Benchmark from Doug Lea's AQS paper">
499    
500      <!-- Override this in user.properties -->      <mkdir dir="${build.loops.dir}"/>
     <property name="tiger.home" location="e:/j2sdk1.5.0"/>  
501    
502      <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">      <javac srcdir="${loops.src.dir}"
503        <arg value="-Xmx256000000"/>            destdir="${build.loops.dir}"
504        <!-- classpath of new JVM -->              debug="${build.debug}"
505        <arg value="-classpath"/> <arg path="${java.class.path}"/>         debuglevel="${build.debuglevel}"
506        <!-- location of Ant home directory -->        deprecation="${build.deprecation}"
507        <arg value="-Dant.home=${ant.home}"/>             source="${build.sourcelevel}"
508        <!-- the Ant main class -->               fork="true">
       <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>  
509    
510    </target>        <compilerarg line="${build.args}"/>
511          <classpath refid="loops.classpath"/>
512          <compilerarg value="-XDignore.symbol.file=true"/>
513    
514        </javac>
515    
516        <java classname="ALoops" fork="true">
517          <classpath refid="loops.classpath"/>
518        </java>
519    
520    <!-- Various demos and test programs -->    </target>
521    
522    
523    <target name="sample" depends="init, configure-compiler"    <!-- jsr166 4jdk7 -->
           description="Standalone demo program">  
524    
     <mkdir dir="${build.testcases.dir}"/>  
525    
526      <javac srcdir="${test.src.dir}"    <target name="4jdk7compile"
527            destdir="${build.testcases.dir}"            depends="configure-compiler"
528              description="Compiles src/jdk7 sources, targeting jdk7">
529    
530        <mkdir dir="${build.4jdk7.classes.dir}"/>
531    
532        <javac srcdir="${4jdk7src.dir}"
533               destdir="${build.4jdk7.classes.dir}"
534              debug="${build.debug}"              debug="${build.debug}"
535         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
536        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
537             source="${build.sourcelevel}"             source="1.6"
538               classpath=""
539               bootclasspath="${bootclasspath6}"
540               includeAntRuntime="false"
541               includeJavaRuntime="false"
542               executable="${javac7}"
543               fork="true">               fork="true">
544    
545        <include name="jsr166/test/Sample.java"/>        <include name="**/*.java"/>
546          <compilerarg line="${build.args}"/>
547          <compilerarg value="-XDignore.symbol.file=true"/>
548          <compilerarg value="-Xlint:all"/>
549    
550      </javac>      </javac>
551    
552      <copy todir="${build.testcases.dir}">      <mkdir dir="${build.4jdk7.lib.dir}"/>
       <fileset dir="${test.src.dir}">  
         <include name="**/*.properties"/>  
       </fileset>  
     </copy>  
553    
554        <jar destfile="${4jdk7product.jar}" index="true">
555          <fileset dir="${build.4jdk7.classes.dir}"/>
556        </jar>
557    
558      <java classname="jsr166.test.Sample" fork="true">      <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
       <classpath refid="test.classpath"/>  
       <!-- <jvmarg value="-ea"/> -->  
       <!-- <jvmarg value="-server"/> -->  
       <!-- <arg value="1000"/> -->  
     </java>  
   </target>  
   
   
   <target name="loops" depends="init, configure-compiler"  
           description="Benchmark from Doug Lea's AQS paper">  
   
     <mkdir dir="${build.loops.dir}"/>  
559    
560      <javac srcdir="${loops.src.dir}"      <javac srcdir="${tck.src.dir}"
561            destdir="${build.loops.dir}"             destdir="${build.4jdk7.tck.classes.dir}"
562              debug="${build.debug}"              debug="${build.debug}"
563         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
564        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
565             source="${build.sourcelevel}"             source="1.6"
566               classpath="${junit.jar}"
567               bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
568               includeAntRuntime="false"
569               includeJavaRuntime="false"
570               executable="${javac7}"
571               fork="true">               fork="true">
572    
573          <include name="**/*.java"/>
574        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
575        <classpath refid="loops.classpath"/>        <compilerarg value="-XDignore.symbol.file=true"/>
576          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577    
578      </javac>      </javac>
579    
580      <java classname="ALoops" fork="true">    </target>
581        <classpath refid="loops.classpath"/>  
     </java>  
582    
583      <target name="4jdk7-test-tck"
584              depends="4jdk7compile"
585              description="Runs tck tests for jsr166-4jdk7 directly">
586        <run-tck-tests
587          jvm="${java7}"
588          tck.classes="${build.4jdk7.tck.classes.dir}"
589          product.jar="${4jdk7product.jar}"/>
590    </target>    </target>
591    
592    
593    <target name="compile-j1" depends="init, configure-compiler">    <target name="4jdk7-test-tck-junit"
594              depends="4jdk7compile"
595              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
596    
597      <mkdir dir="${build.j1.dir}"/>      <junit printsummary="true"
598               showoutput="true"
599               errorProperty="junit.failed"
600               failureProperty="junit.failed"
601               includeantruntime="true"
602               jvm="${java7}"
603               fork="true">
604    
605      <javac srcdir="${j1.src.dir}"        <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
606            destdir="${build.j1.dir}"        <jvmarg value="-server"/>
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}" >  
607    
608        <include name="**/*.java"/>        <classpath>
609        <exclude name="**/dijkstra/**"/>          <pathelement location="${junit.jar}"/>
610            <pathelement location="${build.4jdk7.tck.classes.dir}"/>
611          </classpath>
612    
613        <compilerarg line="${build.args}"/>        <formatter type="brief"/>
       <classpath refid="j1.classpath"/>  
614    
615      </javac>        <test name="JSR166TestCase" haltonfailure="no">
616          </test>
617    
618        </junit>
619      </target>
620    
621    
622      <target name="4jdk7docs"
623              description="Builds javadocs for src/jdk7 to dist dir">
624    
625        <delete dir="${dist.4jdk7.docs.dir}"/>
626        <mkdir dir="${dist.4jdk7.docs.dir}"/>
627    
628        <javadoc destdir="${dist.4jdk7.docs.dir}"
629                 packagenames="none"
630                 link="${jdkapi7docs.url}"
631                 overview="${4jdk7src.dir}/intro.html"
632                 sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
633                 classpath=""
634                 executable="${javadoc7}">
635          <arg value="-XDignore.symbol.file=true"/>
636          <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
637            <include name="**/*.java"/>
638          </fileset>
639        </javadoc>
640    
641    </target>    </target>
642    
643    
644    <target name="sw" depends="compile-j1"    <target name="4jdk7dist"
645            description="Runs the SwingWorker demo">            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
646              description="Puts all distributable products in single hierarchy"/>
647    
648    
     <!--  
     <java classname="jsr166.swing.SwingWorkerDemo" fork="true">  
       <classpath refid="j1.classpath"/>  
     </java>  
     -->  
649    
650      <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>    <target name="4jdk7clean"
651              description="Removes all build products">
652    
653      <exec dir="${build.j1.dir}" executable="appletviewer.exe">      <delete dir="${build.4jdk7.dir}"/>
       <arg value="${build.j1.dir}/SwingWorker.html"/>  
     </exec>  
654    
655    </target>    </target>
656    
   <target name="j1" depends="compile-j1"  
           description="Runs a standalone JavaOne program">  
657    
     <java classname="${j1.test}" fork="true">  
       <classpath refid="j1.classpath"/>  
       <jvmarg value="-client"/>  
658    
659        <!-- TestPseudoRandom args -->    <target name="4jdk7dist-clean"
660        <arg value="2"/>            description="Removes all build and distribution products">
       <arg value="25"/>  
       <arg value="100000"/>  
661    
662        <!-- WebCrawler args -->    </target>
       <!--  
       <arg value="jsr166.webcrawler.WebCrawler3"/>  
       <arg value="http://www.priorartisans.com"/>  
       <arg value="25"/>  
       -->  
663    
664      </java>    <target name="4jdk7dist-jar"
665              depends="4jdk7clean, 4jdk7compile">
666    
667        <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
668    
669    </target>    </target>
670    
671      <!-- jsr166x -->
672    
   <target name="test-j1" depends="compile-j1"  
           description="Runs testcases from the JavaOne source directories">  
673    
674      <junit printsummary="true"    <target name="jsr166xcompile"
675               showoutput="true"            depends="configure-compiler"
676            errorProperty="junit.failed"            description="Compiles jsr166x sources to build dir">
677          failureProperty="junit.failed"  
678                      dir="${build.j1.dir}"      <mkdir dir="${build.jsr166x.dir}"/>
679    
680        <javac srcdir="${topsrc.dir}"
681               destdir="${build.jsr166x.dir}"
682               debug="${build.debug}"
683               debuglevel="${build.debuglevel}"
684               deprecation="${build.deprecation}"
685               classpath=""
686               source="1.5"
687               bootclasspath="${bootclasspath6}"
688               includeAntRuntime="false"
689               includeJavaRuntime="false"
690               executable="${javac7}"
691                     fork="true">                     fork="true">
692    
693        <!-- <jvmarg value="-server"/> -->        <include name="jsr166x/**/*.java"/>
694        <classpath refid="j1.classpath"/>        <compilerarg line="${build.args}"/>
695        <formatter type="xml"/>        <compilerarg value="-XDignore.symbol.file=true"/>
696          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
697    
698        <batchtest todir="${build.j1.dir}">      </javac>
         <fileset dir="${j1.src.dir}">  
           <include name="**/*Test.java"/>  
         </fileset>  
       </batchtest>  
699    
700      </junit>    </target>
701    
     <available property="junit.report.format"  
                   value="frames"  
               classname="org.apache.xalan.lib.Redirect"/>  
     <property name="junit.report.format" value="noframes"/>  
702    
     <junitreport todir="${build.j1.dir}">  
       <fileset dir="${build.j1.dir}">  
         <include name="TEST-*.xml"/>  
       </fileset>  
       <report styledir="${stylesheet.dir}"  
                 format="${junit.report.format}"  
                  todir="${build.j1.dir}"  
       />  
     </junitreport>  
703    
704      <fail message="Test Cases Failed" if="junit.failed"/>    <target name="jsr166xjar"
705              depends="jsr166xcompile"
706              description="Builds library jar from compiled sources">
707    
708        <mkdir dir="${build.jsr166xlib.dir}"/>
709    
710        <jar destfile="${jsr166x.jar}">
711          <fileset dir="${build.jsr166x.dir}"/>
712        </jar>
713    
714    </target>    </target>
715    
716    
717    
718    <!-- C++ and JNI definitions and demos -->    <target name="jsr166xdocs"
719              description="Builds javadocs to dist dir">
720    
721    <target name="configure-cpp">      <delete dir="${build.jsr166xjavadocs.dir}"/>
722        <mkdir dir="${build.jsr166xjavadocs.dir}"/>
723    
724      <!-- Define tasks and types -->      <javadoc destdir="${build.jsr166xjavadocs.dir}"
725                 packagenames="jsr166x"
726                 link="${jdkapidocs.url}"
727                 source="${build.sourcelevel}"
728                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
729                 additionalparam="-XDignore.symbol.file=true" />
730    
731      <path id="cpptasks.path">    </target>
       <pathelement location="${lib.dir}/cpptasks.jar"/>  
     </path>  
     <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>  
     <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>  
732    
     <!-- Set platform property for JNI includes -->  
733    
734      <condition property="platform" value="linux">    <target name="jsr166xdist"
735        <os name="Linux"/>            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
736      </condition>            description="Puts all distributable products in single hierarchy"/>
737      <condition property="platform" value="win32">  
738        <os family="windows"/>  
739      </condition>  
740      <condition property="platform" value="solaris">    <target name="jsr166xclean"
741        <os name="SunOS"/>            description="Removes all build products">
742      </condition>  
743        <delete dir="${build.jsr166x.dir}"/>
744        <delete dir="${build.jsr166xlib.dir}"/>
745    
746      </target>
747    
748    
749    
750      <target name="jsr166xdist-clean"
751              description="Removes all build and distribution products">
752    
753    </target>    </target>
754    
755    
   <target name="cppdemo" depends="configure-cpp">  
756    
757      <mkdir dir="${build.dir}"/>    <target name="jsr166xdist-docs"
758              description="Builds javadocs to dist dir">
759    
760      <cc multithreaded="true"      <delete dir="${dist.jsr166xjavadocs.dir}"/>
761                   name="g++"      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
                objdir="${build.dir}"  
               outfile="${build.dir}/CppDemo">  
       <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>  
       <libset libs="stdc++"/>  
     </cc>  
762    
763      <exec executable="${build.dir}/CppDemo">      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
764        <arg line="count in word frequency of word in command line count"/>               packagenames="jsr166x"
765      </exec>               link="${jdkapidocs.url}"
766                 source="${build.sourcelevel}"
767                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
768                 additionalparam="-XDignore.symbol.file=true" />
769    
770    </target>    </target>
771    
772      <target name="jsr166xdist-jar"
773              depends="jsr166xclean, jsr166xjar">
774    
775    <target name="jnidemo" depends="init, configure-compiler, configure-cpp">      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
776    
777      <mkdir dir="${build.testcases.dir}"/>    </target>
778    
779      <javac srcdir="${test.src.dir}"    <!-- jsr166y -->
780            destdir="${build.testcases.dir}"  
781    
782      <target name="jsr166ycompile"
783              depends="configure-compiler"
784              description="Compiles jsr166y sources">
785    
786        <mkdir dir="${build.jsr166y.dir}"/>
787    
788        <javac srcdir="${topsrc.dir}"
789               destdir="${build.jsr166y.dir}"
790              debug="${build.debug}"              debug="${build.debug}"
791         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
792        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
793             source="${build.sourcelevel}"             source="1.6"
794               classpath=""
795               bootclasspath="${bootclasspath6}"
796               includeAntRuntime="false"
797               includeJavaRuntime="false"
798               executable="${javac7}"
799               fork="true">               fork="true">
800        <compilerarg value="${bootclasspath.args}"/>  
801          <include name="jsr166y/**/*.java"/>
802        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
803        <classpath refid="test.classpath"/>        <compilerarg value="-XDignore.symbol.file=true"/>
804        <include name="JniDemo.java"/>        <compilerarg value="-Xlint:all"/>
805      </javac>      </javac>
806      </target>
807    
808      <javah destdir="${build.testcases.dir}"  
809        classpathref="test.classpath">    <target name="jsr166yjar"
810        <class name="JniDemo"/>            depends="jsr166ycompile"
811      </javah>            description="Builds library jar from compiled sources">
812    
813      <cc multithreaded="true"      <mkdir dir="${build.jsr166ylib.dir}"/>
814                   name="g++"  
815                 objdir="${build.dir}"      <jar destfile="${jsr166y.jar}" index="true">
816                outfile="${build.dir}/JniDemo"        <fileset dir="${build.jsr166y.dir}"/>
817                outtype="shared">      </jar>
   
       <compiler>  
         <defineset>  
           <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>  
818    
819    </target>    </target>
820    
821    
822    
823    <!-- Backward compatibility, work in progress (some files not checked in) -->    <target name="jsr166ydocs"
824              description="Builds javadocs to dist dir">
825    
826        <delete dir="${build.jsr166yjavadocs.dir}"/>
827        <mkdir dir="${build.jsr166yjavadocs.dir}"/>
828    
829        <javadoc destdir="${build.jsr166yjavadocs.dir}"
830                 packagenames="jsr166y"
831                 link="${jdkapidocs.url}"
832                 source="${build.sourcelevel}"
833                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
834                 additionalparam="-XDignore.symbol.file=true" />
835    
836    <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>    </target>
   <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>  
   <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>  
   <property name="pretiger.sourcelevel" value="1.4"/>  
837    
   <target name="defang"  
        depends="init"  
    description="Generates pre-Tiger compatible source">  
838    
839      <delete dir="${pretiger.src.dir}"/>    <target name="jsr166ydist"
840      <mkdir dir="${pretiger.src.dir}"/>            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
841              description="Puts all distributable products in single hierarchy"/>
842    
843      <exec executable="perl">  
844        <arg file="etc/defang.pl"/>  
845        <!-- <arg value="-v"/> -->    <target name="jsr166yclean"
846        <arg value="-s"/> <arg file="${src.dir}"/>            description="Removes all build products">
847        <arg value="-t"/> <arg file="${pretiger.src.dir}"/>  
848      </exec>      <delete dir="${build.jsr166y.dir}"/>
849        <delete dir="${build.jsr166ylib.dir}"/>
850    
851      </target>
852    
853    
854    
855      <target name="jsr166ydist-clean"
856              description="Removes all build and distribution products">
857    
858      </target>
859    
860      <target name="jsr166ydist-docs"
861              description="Builds javadocs to dist dir">
862    
863        <delete dir="${dist.jsr166yjavadocs.dir}"/>
864        <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
865    
866        <javadoc destdir="${dist.jsr166yjavadocs.dir}"
867                 packagenames="jsr166y"
868                 link="${jdkapidocs.url}"
869                 source="${build.sourcelevel}"
870                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
871                 additionalparam="-XDignore.symbol.file=true" />
872    
873      </target>
874    
875      <target name="jsr166ydist-jar"
876              depends="jsr166yclean, jsr166yjar">
877    
878        <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
879    
880    </target>    </target>
881    
   <target name="compile-pretiger"  
           depends="init, configure-compiler, defang"  
           description="Compiles pre-Tiger sources to build folder">  
882    
883      <mkdir dir="${build.pretiger.dir}"/>    <!-- extra166y -->
884    
885      <javac srcdir="${pretiger.src.dir}"  
886            destdir="${build.pretiger.dir}"    <target name="extra166ycompile"
887              depends="configure-compiler, jsr166yjar"
888              description="Compiles extra166y sources">
889    
890        <mkdir dir="${build.extra166y.dir}"/>
891    
892        <javac srcdir="${topsrc.dir}"
893               destdir="${build.extra166y.dir}"
894              debug="${build.debug}"              debug="${build.debug}"
895         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
896        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
897             source="${pretiger.sourcelevel}"             classpath=""
898               source="1.6"
899               bootclasspath="${jsr166y.jar}:${bootclasspath6}"
900               includeAntRuntime="false"
901               includeJavaRuntime="false"
902               executable="${javac7}"
903               fork="true">               fork="true">
904    
905          <include name="extra166y/**/*.java"/>
906        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
907        <exclude name="**/Thread.java"/>        <compilerarg value="-XDignore.symbol.file=true"/>
908          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
909    
910      </javac>      </javac>
911    
912    </target>    </target>
913    
   <target name="pretiger" depends="compile-pretiger">  
914    
     <mkdir dir="${build.lib.dir}"/>  
915    
916      <jar destfile="${pretiger.jar}">    <target name="extra166yjar"
917        <fileset dir="${build.pretiger.dir}">            depends="extra166ycompile"
918        </fileset>            description="Builds library jar from compiled sources">
919    
920        <mkdir dir="${build.extra166ylib.dir}"/>
921    
922        <jar destfile="${extra166y.jar}" index="true">
923          <fileset dir="${build.extra166y.dir}"/>
924      </jar>      </jar>
925    
926    </target>    </target>
927    
   <!-- jsr166x -->  
928    
929    
930    <target name="jsr166xcompile"    <target name="extra166ydocs"
931            depends="init, configure-compiler"            description="Builds javadocs with custom tags to build dir">
           description="Compiles jsr166x sources">  
932    
933      <mkdir dir="${build.jsr166x.dir}"/>      <delete dir="${build.extra166yjavadocs.dir}"/>
934        <mkdir dir="${build.extra166yjavadocs.dir}"/>
935    
936      <javac srcdir="${jsr166xsrc.dir}"      <javadoc destdir="${build.extra166yjavadocs.dir}"
937            destdir="${build.jsr166x.dir}"               packagenames="extra166y"
938                 link="${jdkapidocs.url}"
939                 source="${build.sourcelevel}"
940                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
941                 additionalparam="-XDignore.symbol.file=true" />
942    
943      </target>
944    
945    
946      <target name="extra166ydist"
947              depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
948              description="Puts all distributable products in single hierarchy"/>
949    
950    
951    
952      <target name="extra166yclean"
953              description="Removes all build products">
954    
955        <delete dir="${build.extra166y.dir}"/>
956        <delete dir="${build.extra166ylib.dir}"/>
957    
958      </target>
959    
960    
961    
962      <target name="extra166ydist-clean"
963              description="Removes all build and distribution products">
964    
965      </target>
966    
967      <target name="extra166ydist-docs"
968              description="Builds javadocs to dist dir">
969    
970        <delete dir="${dist.extra166yjavadocs.dir}"/>
971        <mkdir dir="${dist.extra166yjavadocs.dir}"/>
972    
973        <javadoc destdir="${dist.extra166yjavadocs.dir}"
974                 packagenames="extra166y"
975                 link="${jdkapidocs.url}"
976                 source="${build.sourcelevel}"
977                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
978                 additionalparam="-XDignore.symbol.file=true" />
979    
980      </target>
981    
982      <target name="extra166ydist-jar"
983              depends="extra166yclean, extra166yjar">
984    
985        <copy file="${extra166y.jar}" todir="${dist.dir}"/>
986    
987      </target>
988    
989      <!-- jsr166e -->
990    
991      <target name="jsr166ecompile"
992              depends="configure-compiler"
993              description="Compiles jsr166e sources">
994    
995        <mkdir dir="${build.jsr166e.dir}"/>
996    
997        <javac srcdir="${topsrc.dir}"
998               destdir="${build.jsr166e.dir}"
999              debug="${build.debug}"              debug="${build.debug}"
1000         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
1001        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
1002             source="${build.sourcelevel}"             source="1.7"
1003               classpath=""
1004               includeAntRuntime="false"
1005               includeJavaRuntime="false"
1006               executable="${javac7}"
1007               fork="true">               fork="true">
1008    
1009        <include name="**/*.java"/>        <include name="jsr166e/**/*.java"/>
1010        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1011          <compilerarg value="-XDignore.symbol.file=true"/>
1012          <compilerarg value="-Xlint:all"/>
1013    
1014      </javac>      </javac>
1015    
# Line 977  Line 1017 
1017    
1018    
1019    
1020    <target name="jsr166xjar"    <target name="jsr166ejar"
1021            depends="jsr166xcompile"            depends="jsr166ecompile"
1022            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1023    
1024      <mkdir dir="${build.jsr166xlib.dir}"/>      <mkdir dir="${build.jsr166elib.dir}"/>
1025    
1026      <jar destfile="${jsr166xproduct.jar}">      <jar destfile="${jsr166e.jar}" index="true">
1027        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
1028      </jar>      </jar>
1029    
1030    </target>    </target>
1031    
1032    
1033    
1034    <target name="jsr166xdocs"    <target name="jsr166edocs"
1035            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs with custom tags to build dir">
   
     <delete dir="${build.jsr166xjavadocs.dir}"/>  
     <mkdir dir="${build.jsr166xjavadocs.dir}"/>  
   
     <javadoc destdir="${build.jsr166xjavadocs.dir}"  
                 link="http://java.sun.com/j2se/1.5.0/docs/api/"  
     >  
       <packageset dir="${topsrc.dir}" defaultexcludes="yes">  
       <include name="jsr166x"/>  
       </packageset>  
1036    
1037        <delete dir="${build.jsr166ejavadocs.dir}"/>
1038        <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1039    
1040        <javadoc destdir="${build.jsr166ejavadocs.dir}"
1041                 packagenames="jsr166e,jsr166e.extra"
1042                 link="${jdkapi7docs.url}"
1043                 source="1.7"
1044                 sourcepath="${topsrc.dir}:${jdk7src.dir}"
1045                 executable="${javadoc7}"
1046                 additionalparam="-XDignore.symbol.file=true" >
1047          <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1048            <include name="jsr166e/**/*.java"/>
1049          </fileset>
1050      </javadoc>      </javadoc>
1051    
1052    </target>    </target>
1053    
1054    
1055    <target name="jsr166xdist"    <target name="jsr166edist"
1056            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1057            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1058    
1059    
1060    
1061    <target name="jsr166xclean"    <target name="jsr166eclean"
1062            description="Removes all build products">            description="Removes all build products">
1063    
1064      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
1065      <delete dir="${build.jsr166xlib.dir}"/>      <delete dir="${build.jsr166elib.dir}"/>
1066    
1067    </target>    </target>
1068    
1069    
1070    
1071    <target name="jsr166xdist-clean"    <target name="jsr166edist-clean"
1072            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1073    
1074    </target>    </target>
1075    
1076      <target name="jsr166edist-docs"
1077              description="Builds javadocs to dist dir">
1078    
1079        <delete dir="${dist.jsr166ejavadocs.dir}"/>
1080        <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1081    
1082    <target name="jsr166xdist-docs"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1083            description="Builds javadocs without custom tags to dist folder">               packagenames="jsr166e,jsr166e.extra"
1084                 link="${jdkapidocs.url}"
1085      <delete dir="${dist.jsr166xjavadocs.dir}"/>               source="1.7"
1086      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>               sourcepath="${topsrc.dir}:${jdksrc.dir}"
1087                 additionalparam="-XDignore.symbol.file=true" />
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
                 link="http://java.sun.com/j2se/1.5.0/docs/api/"  
               source="${build.sourcelevel}">  
   
       <packageset dir="${topsrc.dir}" defaultexcludes="yes">  
       <include name="jsr166x"/>  
       </packageset>  
   
     </javadoc>  
1088    
1089    </target>    </target>
1090    
1091    <target name="jsr166xdist-jar"    <target name="jsr166edist-jar"
1092            depends="jsr166xclean, jsr166xjar">            depends="jsr166eclean, jsr166ejar">
1093    
1094      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1095    
1096    </target>    </target>
1097    

Legend:
Removed from v.1.70  
changed lines
  Added in v.1.106

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8