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

Diff of /jsr166/build.xml

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

revision 1.36 by tim, Thu May 29 17:29:08 2003 UTC revision 1.85 by jsr166, Sat May 28 00:57:34 2011 UTC
# Line 21  Line 21 
21    
22    
23    <!-- Compilation options -->    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>    <property name="build.sourcelevel"    value="1.6"/>
   <property name="build.docsourcelevel" value="1.4"/>  
25    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
28    
29    <!-- Build locations -->    <!-- Build locations -->
30    <property name="build.dir"            location="build"/>    <property name="build.dir"                   location="build"/>
31    <property name="build.classes.dir"    location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
32    <property name="build.emulation.dir"  location="${build.dir}/emulation"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
34    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.lib.dir"               location="${build.dir}/lib"/>
35    <property name="build.ant.dir"        location="${build.dir}/ant"/>    <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
37    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>  
41      <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42      <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43      <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44    
45      <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
46      <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47      <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48    
49    <!-- Source locations -->    <!-- Source locations -->
50    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
   <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>  
51    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
52    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
53    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54      <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
55    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
56    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
57      <property name="topsrc.dir"           location="${basedir}/src"/>
58      <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59      <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60      <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61      <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
62    <!-- Distribution locations -->    <!-- Distribution locations -->
63    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64      <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65      <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66      <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
67    
68    <!-- Jar locations -->    <!-- Jar locations -->
69    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
70      <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71      <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72      <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
   <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>  
   
   
74    
75    <!-- Files excluded from emulation and dist-docs -->    <!-- Bootclasspath argument -->
76    <patternset id="emulation.excludes">    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
     <exclude name="java/util/Random.*"/>  
     <exclude name="sun/misc/Unsafe.*"/>  
   </patternset>  
77    
78      <!-- Test classpath -->
79      <path id="test.classpath">
80        <pathelement location="${build.testcases.dir}"/>
81        <pathelement location="${junit.jar}"/>
82      </path>
83    
84      <!-- ALoops classpath -->
85      <path id="loops.classpath">
86        <pathelement location="${build.loops.dir}"/>
87      </path>
88    
89    
90    <!-- Main targets -->    <!-- Main targets -->
91    
92      <target name="dists"
93              depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94              description="Builds all public jars and docs"/>
95    
96    <target name="compile"    <target name="compile"
97            depends="init, configure-compiler, prepare-src"            depends="init, configure-compiler"
98            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
99    
     <property name="prepare.src.dir" value="${src.dir}"/>  
   
100      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
101    
102      <javac srcdir="${prepare.src.dir}"      <javac srcdir="${src.dir}"
103            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
104              debug="${build.debug}"              debug="${build.debug}"
105         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 85  Line 107 
107             source="${build.sourcelevel}"             source="${build.sourcelevel}"
108               fork="true">               fork="true">
109    
110        <bootclasspath refid="javac.bootclasspath"/>        <include name="**/*.java"/>
111        <compilerarg line="${build.javac.args}"/>        <compilerarg value="-XDignore.symbol.file=true"/>
112    
113    <!--
114          <exclude name="java/lang/**"/>
115          <compilerarg line="${build.args}"/>
116          <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117    -->
118    
119      </javac>      </javac>
120    
121    </target>    </target>
122    
123    
   <target name="jar"  
           depends="configure-emulation, init-jar, native-jar, emulation-jar"  
           description="Builds library jar from compiled sources"/>  
   
   
   <target name="test"  
           depends="init, configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
124    
125    <target name="checkstyle"    <target name="jar"
126            depends="filter-src"            depends="compile"
127            description="Reports on style errors in Java source (verbose, mostly chaff)">            description="Builds library jar from compiled sources">
128    
129      <taskdef resource="checkstyletask.properties"      <mkdir dir="${build.lib.dir}"/>
             classpath="${lib.dir}/checkstyle-all-2.4.jar"/>  
130    
131      <checkstyle>      <jar destfile="${product.jar}">
132        <formatter type="plain"/>  <!-- also available: type="xml" -->        <fileset dir="${build.classes.dir}"/>
133        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>      </jar>
     </checkstyle>  
134    
135    </target>    </target>
136    
137    
   <target name="doccheck"  
           depends="filter-src"  
           description="Reports on javadoc style errors (not working yet)">  
   
     <delete dir="${build.doccheck.dir}"/>  
     <mkdir dir="${build.doccheck.dir}"/>  
138    
139      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"    <target name="test"
140           docletpath="${lib.dir}/doccheck.jar"            depends="init, configure-tests, report-tests"
141              destdir="${build.doccheck.dir}">            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
       <packageset dir="${build.filter.src.dir}"/>  
     </javadoc>  
142    
   </target>  
143    
144    
145    <target name="docs"    <target name="docs"
           depends="filter-src"  
146            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs with custom tags to build folder">
147    
148      <delete dir="${build.javadocs.dir}"/>      <delete dir="${build.javadocs.dir}"/>
149      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${build.javadocs.dir}"/>
150    
151      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${build.javadocs.dir}"
152                  link="http://java.sun.com/j2se/1.4.1/docs/api"                  link="http://download.oracle.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"              overview="${src.dir}/intro.html"
154                source="${build.docsourcelevel}">              sourcepath="${src.dir}:${jdksrc.dir}"
155        >
       <tag name="revised" description="Last revised:"/>  
       <tag name="spec"    description="Specified by:"/>  
       <tag name="editor"  description="Last edited by:"/>  
       <tag name="fixme"   description="FIX ME:"/>  
156    
157        <packageset dir="${build.filter.src.dir}"/>        <packageset dir="${src.dir}"/>
158    
159      </javadoc>      </javadoc>
160    
161    </target>    </target>
162    
163    
   <target name="strip"  
           depends="init, configure-compiler"  
           description="Strip generics from java source (not working yet)">  
   
     <mkdir dir="${build.stripped.dir}"/>  
164    
165      <!--    <target name="dist"
166       # javac -s doesn't reliably generate compilable code. It generates            depends="init, dist-clean, dist-jar, dist-docs"
167       # bridge methods (marked as "synthetic") that can have identical            description="Puts all distributable products in single hierarchy"/>
      # signatures to existing methods except for the return value.  
      -->  
     <javac srcdir="${src.dir}"  
           destdir="${build.stripped.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
168    
       <bootclasspath refid="javac.bootclasspath"/>  
       <compilerarg line="${build.javac.args} -s"/>  
169    
170      </javac>    <target name="release"
171              depends="dist"
172              description="Puts entire CVS tree, plus distribution productions, in a jar">
173    
174        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
175    
176        <jar basedir="${basedir}" destfile="${release.jar}">
177          <!-- <exclude name="build/**"/> -->
178          <exclude name="${release.jar}"/>
179          <exclude name="user.properties"/>
180          <exclude name="etc/notes/**"/>
181          <exclude name="src/emulation/**"/>
182          <exclude name="**/SyntaxTest.java"/>
183          <exclude name="**/SuperfluousAbstract.java"/>
184        </jar>
185    
186    </target>    </target>
187    
188    
   <target name="dist"  
           depends="init, dist-clean, dist-jar, dist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
189    
190    <target name="clean"    <target name="clean"
191            description="Removes all build products">            description="Removes all build products">
# Line 200  Line 197 
197    </target>    </target>
198    
199    
200    
201    <target name="dist-clean"    <target name="dist-clean"
202            description="Removes all build and distribution products">            description="Removes all build and distribution products">
203    
# Line 208  Line 206 
206    </target>    </target>
207    
208    
209    
210    <target name="dist-docs"    <target name="dist-docs"
           depends="filter-src"  
211            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs without custom tags to dist folder">
212    
213      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
214      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
215    
216      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${dist.javadocs.dir}"
217                  link="http://java.sun.com/j2se/1.4.1/docs/api"              link="http://download.oracle.com/javase/6/docs/api/"
218              overview="${src.dir}/intro.html"              overview="${src.dir}/intro.html"
               source="${build.docsourcelevel}">  
   
       <packageset dir="${build.filter.src.dir}"/>  
219    
220                sourcepath="${src.dir}:${jdksrc.dir}"
221         >
222    <!--
223          <packageset dir="${src.dir}" defaultexcludes="yes">
224          <include name="java/util/concurrent"/>
225          <include name="java/util/concurrent/atomic"/>
226          <include name="java/util/concurrent/locks"/>
227          </packageset>
228    -->
229          <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230          <include name="main/java/util/concurrent/*.java"/>
231          <include name="main/java/util/concurrent/atomic/*.java"/>
232          <include name="main/java/util/concurrent/locks/*.java"/>
233          <include name="main/java/util/*.java"/>
234    <!--
235          <include name="main/java/util/concurrent/*.html"/>
236          <include name="main/java/util/concurrent/atomic/*.html"/>
237          <include name="main/java/util/concurrent/locks/*.html"/>
238          <include name="main/java/util/*.html"/>
239    -->
240    <!--      <include name="jsr166x/*.java"/> -->
241          </fileset>
242      </javadoc>      </javadoc>
243    
244    </target>    </target>
# Line 236  Line 253 
253      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
254      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
255      <echo>Building JSR-166 version ${version}</echo>      <echo>Building JSR-166 version ${version}</echo>
256        <echo>java.home is ${java.home}</echo>
257    
258    </target>    </target>
259    
260    
261    <target name="init-jar">    <target name="dist-jar"
262              depends="clean, jar">
     <mkdir dir="${build.lib.dir}"/>  
   
   </target>  
   
   
   <target name="native-jar"  
           depends="compile"  
           unless="build.emulation.true">  
263    
264      <jar destfile="${product.jar}">      <copy file="${product.jar}" todir="${dist.dir}"/>
       <fileset dir="${build.classes.dir}"/>  
     </jar>  
265    
266    </target>    </target>
267    
268    
269    <target name="compile-emulation"    <target name="compile-tests"
270            depends="init, configure-compiler"            depends="jar">
           if="build.emulation.true">  
271    
272      <mkdir dir="${build.emulation.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
273    
274      <javac srcdir="${emulation.src.dir}"      <javac srcdir="${tck.src.dir}"
275            destdir="${build.emulation.dir}"            destdir="${build.testcases.dir}"
276              debug="${build.debug}"              debug="${build.debug}"
277         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
278        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
279             source="${build.sourcelevel}"             source="${build.sourcelevel}"
280               fork="true">               fork="true">
281    
282        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg value="${bootclasspath.args}"/>
283        <compilerarg line="${build.javac.args}"/>        <compilerarg line="${build.args}"/>
284          <compilerarg value="-XDignore.symbol.file=true"/>
     </javac>  
   
   </target>  
   
   
   <target name="emulation-jar"  
           depends="compile-emulation"  
           if="build.emulation.true">  
   
   
     <jar destfile="${product.jar}" duplicate="add">  
       <fileset dir="${build.classes.dir}">  
         <patternset refid="emulation.excludes"/>  
       </fileset>  
       <fileset dir="${build.emulation.dir}"/>  
     </jar>  
285    
286    </target>        <classpath refid="test.classpath"/>
   
   
   <target name="dist-jar"  
           depends="clean, jar">  
   
     <copy file="${product.jar}" todir="${dist.dir}"/>  
   
   </target>  
   
   
   <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>  
   
     <!-- Not needed now, used for doccheck filtering:  
     <property name="generic.declarations"  
              value="public interface E {} public interface T {} public interface K {} public interface V {}"  
     />  
     -->  
   
     <copy todir="${build.filter.src.dir}">  
       <fileset dir="${src.dir}">  
         <exclude name="**/*.html"/>  
         <patternset refid="emulation.excludes"/>  
       </fileset>  
       <filterchain>  
287    
288          <!--      </javac>
          # 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>  
   
   
         <!--  
          # This filter uncomments lines beginning with "//@" so that  
          # javadoc can see imports that are needed to resolve links  
          # but that shouldn't be in the compiled code.  
          -->  
   
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
           <param name="matching"    value="^//@.*$"/>  
           <param name="pattern"     value="^//@"/>  
           <param name="replacement" value=""/>  
         </filterreader>  
   
   
         <!--  
          # The next 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.  
          #  
          # Currently commented out because doccheck doesn't work. :-(  
          -->  
   
         <!--  
         <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>  
         -->  
289    
290        </filterchain>      <javac srcdir="${test.src.dir}"
291      </copy>            destdir="${build.testcases.dir}"
292                debug="${build.debug}"
293           debuglevel="${build.debuglevel}"
294          deprecation="${build.deprecation}"
295               source="${build.sourcelevel}"
296                 fork="true">
297    
298    </target>        <include name="jsr166/test/**"/>
299    
300          <compilerarg value="${bootclasspath.args}"/>
301          <compilerarg line="${build.args}"/>
302          <compilerarg value="-XDignore.symbol.file=true"/>
303    
304    <target name="compile-tests"        <classpath refid="test.classpath"/>
           depends="jar">  
305    
306      <mkdir dir="${build.testcases.dir}"/>      </javac>
307    
308      <javac srcdir="${test.src.dir}"  <!--
309        <javac srcdir="${jtreg.src.dir}"
310            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
311              debug="${build.debug}"              debug="${build.debug}"
312         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 419  Line 314 
314             source="${build.sourcelevel}"             source="${build.sourcelevel}"
315               fork="true">               fork="true">
316    
317          <compilerarg value="${bootclasspath.args}"/>
318          <compilerarg line="${build.args}"/>
319          <compilerarg value="-XDignore.symbol.file=true"/>
320    
321        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
       <bootclasspath refid="javac.bootclasspath"/>  
       <compilerarg line="${build.javac.args}"/>  
322    
323      </javac>      </javac>
324    -->
325    
326    </target>    </target>
327    
# Line 443  Line 341 
341                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
342                     fork="true">                     fork="true">
343    
344        <jvmarg value="${test.bootclasspath.arg}"/>        <jvmarg value="${bootclasspath.args}"/>
345          <jvmarg value="-server"/>
346          <jvmarg value="-showversion"/>
347    
348          <classpath refid="test.classpath"/>
349    
350        <formatter type="xml"/>        <formatter type="xml"/>
351    
352        <batchtest todir="${build.reports.dir}">        <batchtest todir="${build.reports.dir}" unless="no.test.tck">
353            <fileset dir="${tck.src.dir}">
354              <include name="**/${testcase}Test.java"/>
355            </fileset>
356          </batchtest>
357    
358          <batchtest todir="${build.reports.dir}" if="do.test.old">
359          <fileset dir="${test.src.dir}">          <fileset dir="${test.src.dir}">
360              <include name="jsr166/test/**/${testcase}Test.java"/>
361            </fileset>
362          </batchtest>
363    
364    <!--
365          <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
366            <fileset dir="${jtreg.src.dir}">
367            <include name="**/${testcase}Test.java"/>            <include name="**/${testcase}Test.java"/>
368          </fileset>          </fileset>
369        </batchtest>        </batchtest>
370    -->
371    
372      </junit>      </junit>
373    
# Line 461  Line 377 
377    <target name="report-tests"    <target name="report-tests"
378            depends="run-tests">            depends="run-tests">
379    
380      <!-- Sets junit.report.format to frames if Xalan is present,      <!-- Sets junit.report.format to frames if redirection is present,
381           otherwise sets it to noframes. -->           otherwise sets it to noframes. -->
382      <available property="junit.report.format"      <available property="junit.report.format"
383                    value="frames"                    value="frames"
# Line 473  Line 389 
389        <fileset dir="${build.reports.dir}">        <fileset dir="${build.reports.dir}">
390          <include name="TEST-*.xml"/>          <include name="TEST-*.xml"/>
391        </fileset>        </fileset>
392        <report styledir="${stylesheet.dir}"        <report format="${junit.report.format}" todir="${build.reports.dir}"
                 format="${junit.report.format}"  
                  todir="${build.reports.dir}"  
393        />        />
394      </junitreport>      </junitreport>
395    
# Line 486  Line 400 
400    
401    <target name="configure-compiler">    <target name="configure-compiler">
402    
403      <property name="gjc.version"      <property name="unchecked.option" value="-Xlint:unchecked"/>
              value="2.0"/>  
404    
405      <condition property="build.novariance" value="-novariance">      <condition property="warnunchecked.arg" value="${unchecked.option}">
406        <and>        <istrue value="${build.warnunchecked}"/>
         <equals arg1="${gjc.version}" arg2="2.0"/>  
         <or>  
           <not><isset property="gjc.novariance"/></not>  
           <istrue value="${gjc.novariance}"/>  
         </or>  
       </and>  
407      </condition>      </condition>
408    
409      <property name="build.novariance"      <property name="warnunchecked.arg" value=""/>
              value=""/>  
410    
     <property name="gjc.dir"  
              value="${lib.dir}/gjc"/>  
411    
412      <property name="javac.jar"      <!-- Common options in javac invocations -->
413            location="${gjc.dir}/${gjc.version}/javac.jar"/>      <property name="build.args" value="${warnunchecked.arg}"/>
414    
415      <property name="collect.jar"    </target>
           location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>  
416    
417    
418      <condition property="build.warnunchecked" value="-warnunchecked">    <target name="configure-tests"
419        <istrue value="${gjc.warnunchecked}"/>         depends="configure-compiler">
     </condition>  
420    
421      <property name="build.warnunchecked" value=""/>      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
422        <available property="junit.available"
423                   classname="junit.framework.Protectable"/>
424    
425      <condition property="prepare.src.dir" value="${build.dir}/prepare-src">      <!-- Xalan -->
426        <istrue value="${build.nothreads}"/>      <available property="xalan.available"
427      </condition>                 classname="org.apache.xalan.Version"/>
428    
429    
430        <!-- Ant 1.6beta and later don't need or want this check -->
431      <!--      <!--
432       ! Bootclasspath munging for source compilation.      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
433       -->            unless="junit.available"/>
434    
435      <path id="javac.bootclasspath.prefix">      <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
436        <!-- <pathelement location="${src.dir}"/> -->            unless="xalan.available"/>
437        <pathelement location="${javac.jar}"/>      -->
     </path>  
   
     <path id="javac.bootclasspath">  
       <!-- <pathelement location="${src.dir}"/> -->  
       <pathelement location="${collect.jar}"/>  
       <pathelement location="${rt.jar}"/>  
     </path>  
   
     <!-- Flatten bootclasspath prefix into a platform-appropriate string -->  
     <property name="javac.bootclasspath.prefix"  
              refid="javac.bootclasspath.prefix"/>  
   
     <!-- Turn the flattened bootclasspath prefix into a javac argument -->  
     <property name="build.bootclasspath.arg"  
              value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>  
   
     <!-- Flatten bootclasspath for trace message -->  
     <property name="javac.bootclasspath"  
              refid="javac.bootclasspath"/>  
438    
439      <!-- Common options in javac invocations -->    </target>
440      <property name="build.javac.args"  
441               value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>  
442      <!-- Various demos and test programs -->
443    
444    
445      <target name="loops" depends="init, configure-compiler"
446              description="Benchmark from Doug Lea's AQS paper">
447    
448      <echo>javac ${build.javac.args}</echo>      <mkdir dir="${build.loops.dir}"/>
449      <echo>bootclasspath=${javac.bootclasspath}</echo>  
450        <javac srcdir="${loops.src.dir}"
451              destdir="${build.loops.dir}"
452                debug="${build.debug}"
453           debuglevel="${build.debuglevel}"
454          deprecation="${build.deprecation}"
455               source="${build.sourcelevel}"
456                 fork="true">
457    
458          <compilerarg line="${build.args}"/>
459          <classpath refid="loops.classpath"/>
460          <compilerarg value="-XDignore.symbol.file=true"/>
461    
462        </javac>
463    
464        <java classname="ALoops" fork="true">
465          <classpath refid="loops.classpath"/>
466        </java>
467    
468    </target>    </target>
469    
470    
471    <target name="prepare-src"    <!-- jsr166x -->
           depends="configure-compiler"  
           if="prepare.src.dir">  
472    
473      <mkdir dir="${prepare.src.dir}"/>  
474      <copy todir="${prepare.src.dir}">    <target name="jsr166xcompile"
475        <fileset dir="${src.dir}">            depends="init, configure-compiler"
476          <exclude name="java/lang/**"/>            description="Compiles jsr166x sources">
477        </fileset>  
478      </copy>      <mkdir dir="${build.jsr166x.dir}"/>
479    
480        <javac srcdir="${jsr166xsrc.dir}"
481              destdir="${build.jsr166x.dir}"
482                debug="${build.debug}"
483           debuglevel="${build.debuglevel}"
484          deprecation="${build.deprecation}"
485               source="${build.sourcelevel}"
486                 fork="true">
487    
488          <include name="**/*.java"/>
489          <compilerarg line="${build.args}"/>
490          <compilerarg value="-XDignore.symbol.file=true"/>
491    
492        </javac>
493    
494    </target>    </target>
495    
496    
   <target name="configure-emulation">  
497    
498      <condition property="build.emulation.true">    <target name="jsr166xjar"
499        <or>            depends="jsr166xcompile"
500          <and>            description="Builds library jar from compiled sources">
501            <os family="windows"/>  
502            <not>      <mkdir dir="${build.jsr166xlib.dir}"/>
503              <isset property="build.emulation"/>  
504            </not>      <jar destfile="${jsr166xproduct.jar}">
505          </and>        <fileset dir="${build.jsr166x.dir}"/>
506          <istrue value="${build.emulation}"/>      </jar>
       </or>  
     </condition>  
507    
508    </target>    </target>
509    
510    
   <target name="configure-tests">  
511    
512      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->    <target name="jsr166xdocs"
513      <available property="junit.available"            description="Builds javadocs with custom tags to build folder">
                classname="junit.framework.Protectable"/>  
514    
515      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"      <delete dir="${build.jsr166xjavadocs.dir}"/>
516            unless="junit.available"/>      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
517    
518        <javadoc destdir="${build.jsr166xjavadocs.dir}"
519                 packagenames="jsr166x"
520                 link="http://download.oracle.com/javase/6/docs/api/"
521                 source="${build.sourcelevel}"
522                 sourcepath="${topsrc.dir}:${jdksrc.dir}" />
523    
524      <!--    </target>
525       ! Bootclasspath munging for testing, so JUnit can test our local  
526       ! modifications to java.*.  
527       -->    <target name="jsr166xdist"
528              depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
529              description="Puts all distributable products in single hierarchy"/>
530    
531    
532    
533      <target name="jsr166xclean"
534              description="Removes all build products">
535    
536        <delete dir="${build.jsr166x.dir}"/>
537        <delete dir="${build.jsr166xlib.dir}"/>
538    
539      </target>
540    
541    
542    
543      <target name="jsr166xdist-clean"
544              description="Removes all build and distribution products">
545    
546      </target>
547    
548    
549    
550      <target name="jsr166xdist-docs"
551              description="Builds javadocs without custom tags to dist folder">
552    
553        <delete dir="${dist.jsr166xjavadocs.dir}"/>
554        <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
555    
556        <javadoc destdir="${dist.jsr166xjavadocs.dir}"
557                 packagenames="jsr166x"
558                 link="http://download.oracle.com/javase/6/docs/api/"
559                 source="${build.sourcelevel}"
560                 sourcepath="${topsrc.dir}:${jdksrc.dir}" />
561    
562      </target>
563    
564      <target name="jsr166xdist-jar"
565              depends="jsr166xclean, jsr166xjar">
566    
567        <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
568    
569      </target>
570    
571      <!-- jsr166y -->
572    
573    
574      <target name="jsr166ycompile"
575              depends="init, configure-compiler"
576              description="Compiles jsr166y sources">
577    
578        <mkdir dir="${build.jsr166y.dir}"/>
579    
580        <javac srcdir="${jsr166ysrc.dir}"
581              destdir="${build.jsr166y.dir}"
582                debug="${build.debug}"
583           debuglevel="${build.debuglevel}"
584          deprecation="${build.deprecation}"
585               source="${build.sourcelevel}"
586                 fork="true">
587    
588          <include name="**/*.java"/>
589          <compilerarg line="${build.args}"/>
590          <compilerarg value="-XDignore.symbol.file=true"/>
591          <compilerarg value="${bootclasspath.args}"/>
592    
593    <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
594    
595        </javac>
596    
597      </target>
598    
599    
600    
601      <target name="jsr166yjar"
602              depends="jsr166ycompile"
603              description="Builds library jar from compiled sources">
604    
605        <mkdir dir="${build.jsr166ylib.dir}"/>
606    
607        <jar destfile="${jsr166yproduct.jar}" index="true">
608          <fileset dir="${build.jsr166y.dir}"/>
609        </jar>
610    
611      </target>
612    
613    
614    
615      <target name="jsr166ydocs"
616              description="Builds javadocs with custom tags to build folder">
617    
618        <delete dir="${build.jsr166yjavadocs.dir}"/>
619        <mkdir dir="${build.jsr166yjavadocs.dir}"/>
620    
621        <javadoc destdir="${build.jsr166yjavadocs.dir}"
622                 packagenames="jsr166y"
623                 link="http://download.oracle.com/javase/6/docs/api/"
624                 source="${build.sourcelevel}"
625                 sourcepath="${topsrc.dir}:${jdksrc.dir}" />
626    
627      </target>
628    
     <path id="test.classpath">  
       <pathelement location="${product.jar}"/>  
       <pathelement location="${build.testcases.dir}"/>  
       <pathelement location="${junit.jar}"/>  
     </path>  
629    
630      <!-- Flatten test classpath into a platform-appropriate string -->    <target name="jsr166ydist"
631      <property name="test.classpath" refid="test.classpath"/>            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
632              description="Puts all distributable products in single hierarchy"/>
633    
634    
635    
636      <target name="jsr166yclean"
637              description="Removes all build products">
638    
639      <!-- Turn the flattened test classpath into a javac argument -->      <delete dir="${build.jsr166y.dir}"/>
640      <property name="test.bootclasspath.arg"      <delete dir="${build.jsr166ylib.dir}"/>
              value='-Xbootclasspath/p:${test.classpath}'/>  
641    
642    </target>    </target>
643    
644    
645    
646    <!-- Anthill targets -->    <target name="jsr166ydist-clean"
647              description="Removes all build and distribution products">
648    
649    <target name="anthill-build"    </target>
           depends="jar, test, docs, dist-docs"/>  
650    
651    <target name="anthill-publish">    <target name="jsr166ydist-docs"
652              description="Builds javadocs without custom tags to dist folder">
653    
654      <copy todir="${deployDir}/docs/private">      <delete dir="${dist.jsr166yjavadocs.dir}"/>
655        <fileset dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
     </copy>  
656    
657      <copy todir="${deployDir}/docs/public">      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
658        <fileset dir="${dist.javadocs.dir}"/>               packagenames="jsr166y"
659      </copy>               link="http://download.oracle.com/javase/6/docs/api/"
660                 source="${build.sourcelevel}"
661                 sourcepath="${topsrc.dir}:${jdksrc.dir}" />
662    
663      </target>
664    
665      <copy tofile="${deployDir}/index.html"    <target name="jsr166ydist-jar"
666            file="${basedir}/etc/anthill-index.html"/>            depends="jsr166yclean, jsr166yjar">
667    
668      <copy todir="${deployDir}/notes">      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
       <fileset dir="${basedir}/etc/notes"/>  
     </copy>  
669    
670    </target>    </target>
671    
672      <!-- extra166y -->
673    
674    
675      <target name="extra166ycompile"
676              depends="init, configure-compiler, jsr166ycompile"
677              description="Compiles extra166y sources">
678    
679        <mkdir dir="${build.extra166y.dir}"/>
680    
681        <javac srcdir="${extra166ysrc.dir}"
682              destdir="${build.extra166y.dir}"
683                debug="${build.debug}"
684                classpath="${jsr166yproduct.jar}"
685           debuglevel="${build.debuglevel}"
686          deprecation="${build.deprecation}"
687               source="${build.sourcelevel}"
688                 fork="true">
689    
690          <include name="**/*.java"/>
691          <compilerarg line="${build.args}"/>
692          <compilerarg value="-XDignore.symbol.file=true"/>
693          <compilerarg value="${bootclasspath.args}"/>
694    
695    <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
696    
697        </javac>
698    
699      </target>
700    
701    
702    
703      <target name="extra166yjar"
704              depends="extra166ycompile"
705              description="Builds library jar from compiled sources">
706    
707        <mkdir dir="${build.extra166ylib.dir}"/>
708    
709        <jar destfile="${extra166yproduct.jar}" index="true">
710          <fileset dir="${build.extra166y.dir}"/>
711        </jar>
712    
713      </target>
714    
715    
716    
717      <target name="extra166ydocs"
718              description="Builds javadocs with custom tags to build folder">
719    
720        <delete dir="${build.extra166yjavadocs.dir}"/>
721        <mkdir dir="${build.extra166yjavadocs.dir}"/>
722    
723        <javadoc destdir="${build.extra166yjavadocs.dir}"
724                 packagenames="extra166y"
725                 link="http://download.oracle.com/javase/6/docs/api/"
726                 source="${build.sourcelevel}"
727                 sourcepath="${topsrc.dir}:${jdksrc.dir}" />
728    
729      </target>
730    
731    
732      <target name="extra166ydist"
733              depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
734              description="Puts all distributable products in single hierarchy"/>
735    
736    
737    
738      <target name="extra166yclean"
739              description="Removes all build products">
740    
741        <delete dir="${build.extra166y.dir}"/>
742        <delete dir="${build.extra166ylib.dir}"/>
743    
744      </target>
745    
746    
747    
748      <target name="extra166ydist-clean"
749              description="Removes all build and distribution products">
750    
751      </target>
752    
753      <target name="extra166ydist-docs"
754              description="Builds javadocs without custom tags to dist folder">
755    
756        <delete dir="${dist.extra166yjavadocs.dir}"/>
757        <mkdir dir="${dist.extra166yjavadocs.dir}"/>
758    
759        <javadoc destdir="${dist.extra166yjavadocs.dir}"
760                 packagenames="extra166y"
761                 link="http://download.oracle.com/javase/6/docs/api/"
762                 source="${build.sourcelevel}"
763                 sourcepath="${topsrc.dir}:${jdksrc.dir}" />
764    
765      </target>
766    
767      <target name="extra166ydist-jar"
768              depends="extra166yclean, extra166yjar">
769    
770        <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
771    
772      </target>
773    
774  </project>  </project>

Legend:
Removed from v.1.36  
changed lines
  Added in v.1.85

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