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

Diff of /jsr166/build.xml

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

revision 1.46 by tim, Sat Jul 26 13:17:51 2003 UTC revision 1.83 by dl, Sat Nov 13 13:20:12 2010 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 dist-docs and emulation jar -->    <!-- Bootclasspath argument -->
76    <patternset id="unsafe.exclusion">    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
     <exclude name="java/util/Random.*"/>  
     <exclude name="sun/misc/Unsafe.*"/>  
   </patternset>  
   
   <!-- Files excludes from emulation jar -->  
   <patternset id="atomic.exclusion">  
     <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>  
     <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>  
     <exclude name="java/util/concurrent/atomic/AtomicLong*"/>  
     <exclude name="java/util/concurrent/atomic/AtomicReference*"/>  
   </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="${src.dir}"
     <echo>javac ${gjc.args}</echo>  
     <echo>bootclasspath=${compile.bootclasspath}</echo>  
 -->  
   
     <javac srcdir="${prepare.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 98  Line 107 
107             source="${build.sourcelevel}"             source="${build.sourcelevel}"
108               fork="true">               fork="true">
109    
110        <compilerarg    line="${gjc.args}"/>        <include name="**/*.java"/>
111        <bootclasspath refid="compile.bootclasspath"/>        <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"/>  
   
124    
125    <target name="test"    <target name="jar"
126            depends="init, configure-tests, report-tests"            depends="compile"
127            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />            description="Builds library jar from compiled sources">
   
   
   <target name="checkstyle"  
           depends="filter-src"  
           description="Reports on style errors in Java source (verbose, mostly chaff)">  
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}"/>  
   
     <!--  
      # javac -s doesn't reliably generate compilable code. It generates  
      # bridge methods (marked as "synthetic") that can have identical  
      # 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">  
   
       <compilerarg    line="${gjc.args} -s"/>  
       <bootclasspath refid="compile.bootclasspath"/>  
   
     </javac>  
   
   </target>  
   
164    
165    <target name="dist"    <target name="dist"
166            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
167            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
168    
169    
170    <target name="release"    <target name="release"
171            depends="dist"            depends="dist"
172            description="Puts entire CVS tree, plus distribution productions, in a jar">            description="Puts entire CVS tree, plus distribution productions, in a jar">
173    
 <!--  
     #keep build dir? - dl  
     <delete dir="${build.dir}"/>  
 -->  
174      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
175    
176      <jar basedir="${basedir}" destfile="${release.jar}">      <jar basedir="${basedir}" destfile="${release.jar}">
177          <!-- <exclude name="build/**"/> -->
178        <exclude name="${release.jar}"/>        <exclude name="${release.jar}"/>
179        <exclude name="user.properties"/>        <exclude name="user.properties"/>
180        <exclude name="etc/notes/**"/>        <exclude name="etc/notes/**"/>
181        <exclude name="lib/gjc/2.1/**"/>        <exclude name="src/emulation/**"/>
182        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
183          <exclude name="**/SuperfluousAbstract.java"/>
184      </jar>      </jar>
185    
186    </target>    </target>
187    
188    
189    
190    <target name="clean"    <target name="clean"
191            description="Removes all build products">            description="Removes all build products">
192    
# Line 232  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 240  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 268  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        <compilerarg    line="${gjc.args}"/>        <compilerarg value="${bootclasspath.args}"/>
283        <bootclasspath refid="compile.bootclasspath"/>        <compilerarg line="${build.args}"/>
   
     </javac>  
   
   </target>  
   
284    
285    <target name="emulation-jar"        <classpath refid="test.classpath"/>
           depends="compile-emulation"  
           if="build.emulation.true">  
286    
287        </javac>
288    
289      <jar destfile="${product.jar}" duplicate="add">      <javac srcdir="${test.src.dir}"
290        <fileset dir="${build.classes.dir}">            destdir="${build.testcases.dir}"
291          <patternset refid="atomic.exclusion"/>              debug="${build.debug}"
292          <patternset refid="unsafe.exclusion"/>         debuglevel="${build.debuglevel}"
293        </fileset>        deprecation="${build.deprecation}"
294        <fileset dir="${build.emulation.dir}"/>             source="${build.sourcelevel}"
295      </jar>               fork="true">
   
   </target>  
   
   
   <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="unsafe.exclusion"/>  
       </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>  
   
   
         <!--  
          # 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>  
         -->  
   
       </filterchain>  
     </copy>  
296    
297    </target>        <include name="jsr166/test/**"/>
298    
299          <compilerarg value="${bootclasspath.args}"/>
300          <compilerarg line="${build.args}"/>
301    
302    <target name="compile-tests"        <classpath refid="test.classpath"/>
           depends="jar">  
303    
304      <mkdir dir="${build.testcases.dir}"/>      </javac>
305    
306  <!--  <!--
307      <echo>javac ${gjc.args}</echo>      <javac srcdir="${jtreg.src.dir}"
     <echo>bootclasspath=${test.compile.bootclasspath}</echo>  
     <echo>classpath="${test.classpath}"</echo>  
 -->  
   
     <javac srcdir="${test.src.dir}"  
308            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
309              debug="${build.debug}"              debug="${build.debug}"
310         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 458  Line 312 
312             source="${build.sourcelevel}"             source="${build.sourcelevel}"
313               fork="true">               fork="true">
314    
315        <compilerarg    line="${gjc.args}"/>        <compilerarg value="${bootclasspath.args}"/>
316        <bootclasspath refid="test.compile.bootclasspath"/>        <compilerarg line="${build.args}"/>
317        <classpath     refid="test.classpath"/>  
318          <classpath refid="test.classpath"/>
319    
320      </javac>      </javac>
321    -->
322    
323    </target>    </target>
324    
# Line 482  Line 338 
338                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
339                     fork="true">                     fork="true">
340    
341        <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>        <jvmarg value="${bootclasspath.args}"/>
342          <jvmarg value="-server"/>
343          <jvmarg value="-showversion"/>
344    
345          <classpath refid="test.classpath"/>
346    
347        <formatter type="xml"/>        <formatter type="xml"/>
348    
349        <batchtest todir="${build.reports.dir}">        <batchtest todir="${build.reports.dir}" unless="no.test.tck">
350            <fileset dir="${tck.src.dir}">
351              <include name="**/${testcase}Test.java"/>
352            </fileset>
353          </batchtest>
354    
355          <batchtest todir="${build.reports.dir}" if="do.test.old">
356          <fileset dir="${test.src.dir}">          <fileset dir="${test.src.dir}">
357              <include name="jsr166/test/**/${testcase}Test.java"/>
358            </fileset>
359          </batchtest>
360    
361    <!--
362          <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
363            <fileset dir="${jtreg.src.dir}">
364            <include name="**/${testcase}Test.java"/>            <include name="**/${testcase}Test.java"/>
365          </fileset>          </fileset>
366        </batchtest>        </batchtest>
367    -->
368    
369      </junit>      </junit>
370    
# Line 500  Line 374 
374    <target name="report-tests"    <target name="report-tests"
375            depends="run-tests">            depends="run-tests">
376    
377      <!-- Sets junit.report.format to frames if Xalan is present,      <!-- Sets junit.report.format to frames if redirection is present,
378           otherwise sets it to noframes. -->           otherwise sets it to noframes. -->
379      <available property="junit.report.format"      <available property="junit.report.format"
380                    value="frames"                    value="frames"
# Line 512  Line 386 
386        <fileset dir="${build.reports.dir}">        <fileset dir="${build.reports.dir}">
387          <include name="TEST-*.xml"/>          <include name="TEST-*.xml"/>
388        </fileset>        </fileset>
389        <report styledir="${stylesheet.dir}"        <report format="${junit.report.format}" todir="${build.reports.dir}"
                 format="${junit.report.format}"  
                  todir="${build.reports.dir}"  
390        />        />
391      </junitreport>      </junitreport>
392    
# Line 525  Line 397 
397    
398    <target name="configure-compiler">    <target name="configure-compiler">
399    
400      <property name="gjc.version"      <property name="unchecked.option" value="-Xlint:unchecked"/>
              value="2.2"/>  
401    
402      <condition property="novariance.arg" value="-novariance">      <condition property="warnunchecked.arg" value="${unchecked.option}">
403        <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>  
404      </condition>      </condition>
405    
406      <property name="novariance.arg"      <property name="warnunchecked.arg" value=""/>
              value=""/>  
407    
     <property name="gjc.dir"  
              value="${lib.dir}/gjc"/>  
408    
409      <property name="javac.jar"      <!-- Common options in javac invocations -->
410            location="${gjc.dir}/${gjc.version}/javac.jar"/>      <property name="build.args" value="${warnunchecked.arg}"/>
411    
412      <property name="collect.jar"    </target>
           location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>  
413    
414    
415      <condition property="warnunchecked.arg" value="-warnunchecked">    <target name="configure-tests"
416        <istrue value="${gjc.warnunchecked}"/>         depends="configure-compiler">
     </condition>  
417    
418      <property name="warnunchecked.arg" value=""/>      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
419        <available property="junit.available"
420                   classname="junit.framework.Protectable"/>
421    
422      <condition property="prepare.src.dir" value="${build.dir}/prepare-src">      <!-- Xalan -->
423        <istrue value="${build.nothreads}"/>      <available property="xalan.available"
424      </condition>                 classname="org.apache.xalan.Version"/>
425    
426    
427        <!-- Ant 1.6beta and later don't need or want this check -->
428      <!--      <!--
429       ! Bootclasspath munging for source compilation.      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
430       -->            unless="junit.available"/>
431    
432      <path id="pre.bootclasspath">      <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
433        <pathelement location="${javac.jar}"/>            unless="xalan.available"/>
434      </path>      -->
   
     <path id="compile.bootclasspath">  
       <pathelement location="${build.classes.dir}"/>  
       <pathelement location="${collect.jar}"/>  
       <pathelement location="${rt.jar}"/>  
     </path>  
   
     <!-- Flatten paths into platform-appropriate strings -->  
     <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>  
     <property name="compile.bootclasspath" refid="compile.bootclasspath"/>  
435    
436      </target>
437    
438      <!-- Common options in javac invocations -->  
439      <property name="gjc.args"    <!-- Various demos and test programs -->
440               value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"  
441      />  
442      <target name="loops" depends="init, configure-compiler"
443              description="Benchmark from Doug Lea's AQS paper">
444    
445        <mkdir dir="${build.loops.dir}"/>
446    
447        <javac srcdir="${loops.src.dir}"
448              destdir="${build.loops.dir}"
449                debug="${build.debug}"
450           debuglevel="${build.debuglevel}"
451          deprecation="${build.deprecation}"
452               source="${build.sourcelevel}"
453                 fork="true">
454    
455          <compilerarg line="${build.args}"/>
456          <classpath refid="loops.classpath"/>
457    
458        </javac>
459    
460        <java classname="ALoops" fork="true">
461          <classpath refid="loops.classpath"/>
462        </java>
463    
464    </target>    </target>
465    
466    
467    <target name="prepare-src"    <!-- jsr166x -->
468            depends="configure-compiler"  
469            if="prepare.src.dir">  
470      <target name="jsr166xcompile"
471      <mkdir dir="${prepare.src.dir}"/>            depends="init, configure-compiler"
472      <copy todir="${prepare.src.dir}">            description="Compiles jsr166x sources">
473        <fileset dir="${src.dir}">  
474          <exclude name="java/lang/**"/>      <mkdir dir="${build.jsr166x.dir}"/>
475        </fileset>  
476      </copy>      <javac srcdir="${jsr166xsrc.dir}"
477              destdir="${build.jsr166x.dir}"
478                debug="${build.debug}"
479           debuglevel="${build.debuglevel}"
480          deprecation="${build.deprecation}"
481               source="${build.sourcelevel}"
482                 fork="true">
483    
484          <include name="**/*.java"/>
485          <compilerarg line="${build.args}"/>
486    
487        </javac>
488    
489    </target>    </target>
490    
491    
   <target name="configure-emulation">  
492    
493      <condition property="build.emulation.true">    <target name="jsr166xjar"
494        <or>            depends="jsr166xcompile"
495          <and>            description="Builds library jar from compiled sources">
496            <os family="windows"/>  
497            <not>      <mkdir dir="${build.jsr166xlib.dir}"/>
498              <isset property="build.emulation"/>  
499            </not>      <jar destfile="${jsr166xproduct.jar}">
500          </and>        <fileset dir="${build.jsr166x.dir}"/>
501          <istrue value="${build.emulation}"/>      </jar>
       </or>  
     </condition>  
502    
503    </target>    </target>
504    
505    
   <target name="configure-tests"  
        depends="configure-compiler">  
506    
507      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->    <target name="jsr166xdocs"
508      <available property="junit.available"            description="Builds javadocs with custom tags to build folder">
                classname="junit.framework.Protectable"/>  
509    
510      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"      <delete dir="${build.jsr166xjavadocs.dir}"/>
511            unless="junit.available"/>      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
512    
513        <javadoc destdir="${build.jsr166xjavadocs.dir}"
514                 link="http://download.oracle.com/javase/6/docs/api/"
515                sourcepath="${topsrc.dir}:${jdksrc.dir}"
516        >
517          <packageset dir="${topsrc.dir}" defaultexcludes="yes">
518          <include name="jsr166x"/>
519          </packageset>
520    
     <!--  
      ! Bootclasspath munging for testing, so JUnit can test our local  
      ! modifications to java.*.  
      -->  
521    
522      <path id="test.classpath">      </javadoc>
523        <pathelement location="${product.jar}"/>  
524        <pathelement location="${build.testcases.dir}"/>    </target>
525        <pathelement location="${junit.jar}"/>  
526      </path>  
527      <target name="jsr166xdist"
528              depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
529              description="Puts all distributable products in single hierarchy"/>
530    
531    
     <path id="test.compile.bootclasspath">  
       <pathelement location="${javac.jar}"/>  
       <pathelement location="${collect.jar}"/>  
       <pathelement location="${rt.jar}"/>  
     </path>  
532    
533      <path id="test.run.bootclasspath">    <target name="jsr166xclean"
534        <pathelement location="${javac.jar}"/>            description="Removes all build products">
       <path refid="test.classpath"/>  
     </path>  
535    
536      <!-- Flatten test classpaths into platform-appropriate strings -->      <delete dir="${build.jsr166x.dir}"/>
537      <property name="test.classpath"             refid="test.classpath"/>      <delete dir="${build.jsr166xlib.dir}"/>
     <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>  
     <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>  
538    
539    </target>    </target>
540    
541    
542    
543    <!-- Anthill targets -->    <target name="jsr166xdist-clean"
544              description="Removes all build and distribution products">
545    
546    <target name="anthill-build"    </target>
           depends="jar, test, docs, dist-docs"/>  
547    
   <target name="anthill-publish">  
548    
     <copy todir="${deployDir}/docs/private">  
       <fileset dir="${build.javadocs.dir}"/>  
     </copy>  
549    
550      <copy todir="${deployDir}/docs/public">    <target name="jsr166xdist-docs"
551        <fileset dir="${dist.javadocs.dir}"/>            description="Builds javadocs without custom tags to dist folder">
552      </copy>  
553        <delete dir="${dist.jsr166xjavadocs.dir}"/>
554        <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
555    
556      <copy tofile="${deployDir}/index.html"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
557            file="${basedir}/etc/anthill-index.html"/>                  link="http://download.oracle.com/javase/6/docs/api/"
558                  source="${build.sourcelevel}">
559    
560          <packageset dir="${topsrc.dir}" defaultexcludes="yes">
561          <include name="jsr166x"/>
562          </packageset>
563    
564      <copy todir="${deployDir}/notes">      </javadoc>
       <fileset dir="${basedir}/etc/notes"/>  
     </copy>  
565    
566    </target>    </target>
567    
568      <target name="jsr166xdist-jar"
569              depends="jsr166xclean, jsr166xjar">
570    
571    <target name="ng" depends="test">      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
     <java classname="SuperfluousAbstract" fork="true">  
572    
573        <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>    </target>
574    
575      <!-- jsr166y -->
576    
577    
578      <target name="jsr166ycompile"
579              depends="init, configure-compiler"
580              description="Compiles jsr166y sources">
581    
582        <mkdir dir="${build.jsr166y.dir}"/>
583    
584        <javac srcdir="${jsr166ysrc.dir}"
585              destdir="${build.jsr166y.dir}"
586                debug="${build.debug}"
587           debuglevel="${build.debuglevel}"
588          deprecation="${build.deprecation}"
589               source="${build.sourcelevel}"
590                 fork="true">
591    
592          <include name="**/*.java"/>
593          <compilerarg line="${build.args}"/>
594          <compilerarg value="-XDignore.symbol.file=true"/>
595          <compilerarg value="${bootclasspath.args}"/>
596    
597    <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
598    
599        </javac>
600    
601      </target>
602    
603    
604    
605      <target name="jsr166yjar"
606              depends="jsr166ycompile"
607              description="Builds library jar from compiled sources">
608    
609        <mkdir dir="${build.jsr166ylib.dir}"/>
610    
611        <jar destfile="${jsr166yproduct.jar}" index="true">
612          <fileset dir="${build.jsr166y.dir}"/>
613        </jar>
614    
615      </target>
616    
617    
618    
619      <target name="jsr166ydocs"
620              description="Builds javadocs with custom tags to build folder">
621    
622        <delete dir="${build.jsr166yjavadocs.dir}"/>
623        <mkdir dir="${build.jsr166yjavadocs.dir}"/>
624    
625        <javadoc destdir="${build.jsr166yjavadocs.dir}"
626                    link="http://download.oracle.com/javase/6/docs/api/"
627                sourcepath="${topsrc.dir}:${jdksrc.dir}"
628        >
629          <packageset dir="${topsrc.dir}" defaultexcludes="no">
630          <include name="jsr166y"/>
631          </packageset>
632    
633    
634        </javadoc>
635    
636      </target>
637    
638    
639      <target name="jsr166ydist"
640              depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
641              description="Puts all distributable products in single hierarchy"/>
642    
643    
644    
645      <target name="jsr166yclean"
646              description="Removes all build products">
647    
648        <delete dir="${build.jsr166y.dir}"/>
649        <delete dir="${build.jsr166ylib.dir}"/>
650    
651      </target>
652    
653    
654    
655      <target name="jsr166ydist-clean"
656              description="Removes all build and distribution products">
657    
     </java>  
658    </target>    </target>
659    
660      <target name="jsr166ydist-docs"
661              description="Builds javadocs without custom tags to dist folder">
662    
663        <delete dir="${dist.jsr166yjavadocs.dir}"/>
664        <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
665    
666        <javadoc destdir="${dist.jsr166yjavadocs.dir}"
667                    link="http://download.oracle.com/javase/6/docs/api/"
668                  source="${build.sourcelevel}"
669                sourcepath="${topsrc.dir}:${jdksrc.dir}"
670                >
671          <fileset dir="${topsrc.dir}" defaultexcludes="yes">
672          <include name="jsr166y/*.java"/>
673                </fileset>
674        </javadoc>
675    
676      </target>
677    
678      <target name="jsr166ydist-jar"
679              depends="jsr166yclean, jsr166yjar">
680    
681        <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
682    
683      </target>
684    
685      <!-- extra166y -->
686    
687    
688      <target name="extra166ycompile"
689              depends="init, configure-compiler, jsr166ycompile"
690              description="Compiles extra166y sources">
691    
692        <mkdir dir="${build.extra166y.dir}"/>
693    
694        <javac srcdir="${extra166ysrc.dir}"
695              destdir="${build.extra166y.dir}"
696                debug="${build.debug}"
697                classpath="${jsr166yproduct.jar}"
698           debuglevel="${build.debuglevel}"
699          deprecation="${build.deprecation}"
700               source="${build.sourcelevel}"
701                 fork="true">
702    
703          <include name="**/*.java"/>
704          <compilerarg line="${build.args}"/>
705          <compilerarg value="-XDignore.symbol.file=true"/>
706          <compilerarg value="${bootclasspath.args}"/>
707    
708    <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
709    
710        </javac>
711    
712      </target>
713    
714    
715    
716      <target name="extra166yjar"
717              depends="extra166ycompile"
718              description="Builds library jar from compiled sources">
719    
720        <mkdir dir="${build.extra166ylib.dir}"/>
721    
722        <jar destfile="${extra166yproduct.jar}" index="true">
723          <fileset dir="${build.extra166y.dir}"/>
724        </jar>
725    
726      </target>
727    
728    
729    
730      <target name="extra166ydocs"
731              description="Builds javadocs with custom tags to build folder">
732    
733        <delete dir="${build.extra166yjavadocs.dir}"/>
734        <mkdir dir="${build.extra166yjavadocs.dir}"/>
735    
736        <javadoc destdir="${build.extra166yjavadocs.dir}"
737                    link="http://download.oracle.com/javase/6/docs/api/"
738                sourcepath="${topsrc.dir}:${jdksrc.dir}"
739        >
740          <packageset dir="${topsrc.dir}" defaultexcludes="no">
741          <include name="extra166y"/>
742          </packageset>
743    
744    
745        </javadoc>
746    
747      </target>
748    
749    
750      <target name="extra166ydist"
751              depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
752              description="Puts all distributable products in single hierarchy"/>
753    
754    
755    
756      <target name="extra166yclean"
757              description="Removes all build products">
758    
759        <delete dir="${build.extra166y.dir}"/>
760        <delete dir="${build.extra166ylib.dir}"/>
761    
762      </target>
763    
764    
765    
766      <target name="extra166ydist-clean"
767              description="Removes all build and distribution products">
768    
769      </target>
770    
771      <target name="extra166ydist-docs"
772              description="Builds javadocs without custom tags to dist folder">
773    
774        <delete dir="${dist.extra166yjavadocs.dir}"/>
775        <mkdir dir="${dist.extra166yjavadocs.dir}"/>
776    
777        <javadoc destdir="${dist.extra166yjavadocs.dir}"
778                    link="http://download.oracle.com/javase/6/docs/api/"
779                  source="${build.sourcelevel}"
780                sourcepath="${topsrc.dir}:${jdksrc.dir}"
781                >
782          <fileset dir="${topsrc.dir}" defaultexcludes="yes">
783          <include name="extra166y/*.java"/>
784                </fileset>
785        </javadoc>
786    
787      </target>
788    
789      <target name="extra166ydist-jar"
790              depends="extra166yclean, extra166yjar">
791    
792        <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
793    
794      </target>
795    
796  </project>  </project>

Legend:
Removed from v.1.46  
changed lines
  Added in v.1.83

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