ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.26 by dl, Tue May 27 16:21:52 2003 UTC vs.
Revision 1.27 by tim, Wed May 28 00:33:17 2003 UTC

# Line 3 | Line 3
3    <description>
4      Build file for JSR-166
5  
6 <    JUnit 1.8 must be in ${ant.home}/lib for the test target to work.
6 >    JUnit 3.8 or better must be in ${ant.home}/lib for the test target to work.
7    </description>
8  
9  
# Line 27 | Line 27 | ant [target], where target is one of:
27      </echo>
28    </target>
29  
30 +  <!-- User-specific settings -->
31    <property file="user.properties"/>
32 <  <property name="testcase" value="*"/>
32 >
33 >  <!-- Set build.warnings in user.properties to turn on -warnunchecked -->
34 >  <!-- <property name="build.warnings" value=""/> -->
35 >
36  
37    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.5"/>
# Line 36 | Line 40 | ant [target], where target is one of:
40    <property name="build.debug"          value="true"/>
41    <property name="build.debuglevel"     value="source,lines,vars"/>
42    <property name="build.deprecation"    value="false"/>
39  <!--
40  <property name="build.warnings"       value="true"/>
41  -->
43  
44    <!-- Build locations -->
45    <property name="build.dir"            location="build"/>
46    <property name="build.classes.dir"    location="${build.dir}/classes"/>
47 +  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
48    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
49    <property name="build.lib.dir"        location="${build.dir}/lib"/>
50    <property name="build.ant.dir"        location="${build.dir}/ant"/>
# Line 54 | Line 56 | ant [target], where target is one of:
56  
57    <!-- Source locations -->
58    <property name="src.dir"              location="${basedir}/src/main"/>
59 +  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
60    <property name="test.src.dir"         location="${basedir}/src/test"/>
61    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
62    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
# Line 70 | Line 73 | ant [target], where target is one of:
73    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
74    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
75  
76 <  <property name="javac.args"           value='-J-Xbootclasspath/p:$[src.dir]:${javac.jar}'/>
76 >
77 >  <!--
78 >   ! Bootclasspath munging for source compilation.
79 >   -->
80 >
81 >  <path id="javac.bootclasspath.prepend">
82 >    <!-- <pathelement location="${src.dir}"/> -->
83 >    <pathelement location="${javac.jar}"/>
84 >  </path>
85  
86    <path id="javac.bootclasspath">
87 <    <pathelement location="${src.dir}"/>
87 >    <!-- <pathelement location="${src.dir}"/> -->
88      <pathelement location="${collect.jar}"/>
89      <pathelement location="${rt.jar}"/>
90    </path>
91  
92 +  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
93 +  <property name="javac.bootclasspath.prepend" refid="javac.bootclasspath.prepend"/>
94 +
95 +  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
96 +  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prepend}'/>
97 +
98 +
99 +  <!--
100 +   ! Bootclasspath munging for testing, so JUnit can test our local
101 +   ! modifications to java.*.
102 +   -->
103 +
104    <path id="test.classpath">
105      <pathelement location="${product.jar}"/>
106 +    <pathelement location="${build.testcases.dir}"/>
107 +    <pathelement location="${junit.jar}"/>
108    </path>
109  
110 +  <!-- Flatten test classpath into a platform-appropriate string -->
111 +  <property name="test.classpath" refid="test.classpath"/>
112 +
113 +  <!-- Turn the flattened test classpath into a javac argument -->
114 +  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
115 +
116 +
117  
118    <!-- Main targets -->
119  
120    <target name="compile" depends="init"
121 <          description="Compiles all sources to build folder">
121 >          description="Compiles main sources to build folder">
122 >
123      <mkdir dir="${build.classes.dir}"/>
124 +
125      <javac srcdir="${src.dir}"
126            destdir="${build.classes.dir}"
127              debug="${build.debug}"
# Line 100 | Line 134 | ant [target], where target is one of:
134        <compilerarg line="${javac.args} ${build.warnings.option}"/>
135  
136      </javac>
137 +
138    </target>
139  
140  
141 <  <target name="jar" depends="compile"
107 <          description="Builds library jar from compiled sources">
108 <    <mkdir dir="${build.lib.dir}"/>
109 <    <jar basedir="${build.classes.dir}"
110 <        destfile="${product.jar}"
111 <    />
112 <  </target>
141 >  <target name="jar" depends="native-jar, emulation-jar"/>
142  
143  
144    <target name="test" depends="init, check-junit, report-tests"
145 <          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
145 >          description="Runs all tests (requires JUnit 3.8+ in ${ant.home}/lib)"
146 >  />
147  
148  
149    <target name="checkstyle" depends="filter-src"
150            description="Reports on style errors in Java source (verbose, mostly chaff)">
151 +
152      <taskdef resource="checkstyletask.properties"
153              classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
154  
# Line 125 | Line 156 | ant [target], where target is one of:
156        <formatter type="plain"/>  <!-- also available: type="xml" -->
157        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
158      </checkstyle>
159 +
160    </target>
161  
162  
163    <target name="doccheck" depends="filter-src"
164            description="Reports on javadoc style errors (not working yet)">
165 +
166      <delete dir="${build.doccheck.dir}"/>
167      <mkdir dir="${build.doccheck.dir}"/>
168 +
169      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
170           docletpath="${lib.dir}/doccheck.jar"
171              destdir="${build.doccheck.dir}">
172        <packageset dir="${build.filter.src.dir}"/>
173      </javadoc>
174 +
175    </target>
176  
177  
178    <target name="docs" depends="filter-src"
179            description="Builds javadocs with custom tags to build folder">
180 +
181      <delete dir="${build.javadocs.dir}"/>
182      <mkdir dir="${build.javadocs.dir}"/>
183 +
184      <javadoc destdir="${build.javadocs.dir}"
185                  link="http://java.sun.com/j2se/1.4.1/docs/api"
186              overview="${src.dir}/intro.html"
# Line 156 | Line 193 | ant [target], where target is one of:
193        <packageset dir="${build.filter.src.dir}"/>
194  
195      </javadoc>
196 +
197    </target>
198  
199  
# Line 165 | Line 203 | ant [target], where target is one of:
203     # signatures to existing methods except for the return value.
204     -->
205    <target name="strip" depends="init">
206 +
207      <mkdir dir="${build.stripped.dir}"/>
208 +
209      <javac srcdir="${src.dir}"
210            destdir="${build.stripped.dir}"
211              debug="${build.debug}"
# Line 178 | Line 218 | ant [target], where target is one of:
218        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
219  
220      </javac>
221 +
222    </target>
223  
224  
# Line 187 | Line 228 | ant [target], where target is one of:
228  
229    <target name="clean"
230            description="Removes all build products">
231 +
232      <delete dir="${build.dir}"/>
233      <delete dir="${build.classes.dir}"/>
234      <delete dir="${build.lib.dir}"/>
235 +
236    </target>
237  
238  
239    <target name="dist-clean"
240            description="Removes all build and distribution products">
241 +
242      <delete dir="${dist.dir}"/>
243 +
244    </target>
245  
246  
247    <!-- Anthill targets -->
248  
249    <!-- Should really run the tests instead of just the jar target -->
250 <  <target name="anthill-build" depends="jar, docs, dist-docs"/>
250 >  <target name="anthill-build" depends="jar, test, docs, dist-docs"/>
251  
252    <target name="anthill-publish">
253      <copy todir="${deployDir}/docs/private">
# Line 222 | Line 267 | ant [target], where target is one of:
267    <!-- Internal targets -->
268  
269    <target name="set-warnings-if" if="build.warnings">
270 +
271      <property name="build.warnings.option" value="-warnunchecked"/>
272 +
273    </target>
274  
275  
276    <target name="set-warnings-unless" unless="build.warnings">
277 +
278      <property name="build.warnings.option" value=""/>
279 +
280    </target>
281  
282  
283    <target name="init" depends="set-warnings-if, set-warnings-unless">
284 +
285      <!-- Version is kept in a separate file -->
286      <loadfile property="version" srcFile="version.properties"/>
287      <echo>Building JSR-166 version ${version}</echo>
288 +
289 +  </target>
290 +
291 +
292 +  <target name="native-jar" depends="compile"
293 +          description="Builds library jar from compiled sources">
294 +
295 +    <mkdir dir="${build.lib.dir}"/>
296 +
297 +    <jar destfile="${product.jar}">
298 +      <fileset dir="${build.classes.dir}"/>
299 +    </jar>
300 +
301 +  </target>
302 +
303 +
304 +  <target name="compile-emulation" depends="init"
305 +          if="build.emulation"
306 +          description="Compiles emulation sources to build folder">
307 +
308 +    <mkdir dir="${build.emulation.dir}"/>
309 +
310 +    <javac srcdir="${emulation.src.dir}"
311 +          destdir="${build.emulation.dir}"
312 +            debug="${build.debug}"
313 +       debuglevel="${build.debuglevel}"
314 +      deprecation="${build.deprecation}"
315 +           source="${build.sourcelevel}"
316 +             fork="true">
317 +
318 +      <bootclasspath refid="javac.bootclasspath"/>
319 +      <compilerarg line="${javac.args} ${build.warnings.option}"/>
320 +
321 +    </javac>
322 +
323 +  </target>
324 +
325 +
326 +  <target name="emulation-jar" depends="native-jar, compile-emulation"
327 +          if="build.emulation">
328 +
329 +    <jar destfile="${product.jar}" update="true" duplicate="add">
330 +      <fileset dir="${build.emulation.dir}"/>
331 +    </jar>
332 +
333    </target>
334  
335  
336    <target name="dist-jar" depends="clean, jar">
337 +
338      <copy file="${product.jar}" todir="${dist.dir}"/>
339 +
340    </target>
341  
342  
343    <target name="dist-docs" depends="filter-src"
344            description="Builds javadocs without custom tags to dist folder">
345 +
346      <delete dir="${dist.javadocs.dir}"/>
347      <mkdir dir="${dist.javadocs.dir}"/>
348 +
349      <javadoc destdir="${dist.javadocs.dir}"
350                  link="http://java.sun.com/j2se/1.4.1/docs/api"
351              overview="${src.dir}/intro.html"
# Line 255 | Line 354 | ant [target], where target is one of:
354        <packageset dir="${build.filter.src.dir}"/>
355  
356      </javadoc>
357 +
358    </target>
359  
360  
361    <target name="compile-ant-filter" depends="init">
362 +
363      <mkdir dir="${build.ant.dir}"/>
364 +
365      <javac srcdir="${ant.src.dir}"
366            destdir="${build.ant.dir}"
367             source="1.4"
368      />
369 +
370    </target>
371  
372  
373    <target name="filter-src" depends="compile-ant-filter">
374 +
375      <mkdir dir="${build.filter.src.dir}"/>
376 +
377      <copy todir="${build.filter.src.dir}">
378        <fileset dir="${src.dir}">
379          <include name="**/*.java"/>
380 +        <exclude name="**/Random.java"/>
381 +        <exclude name="**/Unsafe.java"/>
382        </fileset>
383        <filterchain>
384          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 305 | Line 412 | ant [target], where target is one of:
412          </filterreader>
413        </filterchain>
414      </copy>
415 +
416    </target>
417  
418  
419    <target name="compile-tests" depends="jar">
420 +
421      <mkdir dir="${build.testcases.dir}"/>
422 +
423      <javac srcdir="${test.src.dir}"
424            destdir="${build.testcases.dir}"
425              debug="${build.debug}"
# Line 323 | Line 433 | ant [target], where target is one of:
433        <classpath refid="test.classpath"/>
434  
435      </javac>
436 +
437    </target>
438  
439  
440    <target name="run-tests" depends="compile-tests">
441 +
442 +    <!-- May be overridden by user.properties -->
443 +    <property name="testcase" value="*"/>
444 +
445      <mkdir dir="${build.reports.dir}"/>
446 +
447      <junit printsummary="true"
448               showoutput="true"
449            errorProperty="junit.failed"
# Line 335 | Line 451 | ant [target], where target is one of:
451                      dir="${build.reports.dir}"
452                     fork="true">
453  
454 <      <!--
339 <       ! This nastiness is so JUnit can test classes we are inserting
340 <       ! into the java.* packages.
341 <       -->
342 <      <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
454 >      <jvmarg value="${test.javac.args}"/>
455  
456        <formatter type="xml"/>
457  
# Line 350 | Line 462 | ant [target], where target is one of:
462        </batchtest>
463  
464      </junit>
465 +
466    </target>
467  
468  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines