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.59 by tim, Sun Dec 7 20:49:10 2003 UTC vs.
Revision 1.85 by jsr166, Sat May 28 00:57:34 2011 UTC

# Line 21 | Line 21
21  
22  
23    <!-- Compilation options -->
24 <  <property name="build.sourcelevel"    value="1.5"/>
24 >  <property name="build.sourcelevel"    value="1.6"/>
25    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>
28  
29    <!-- Build locations -->
30 <  <property name="build.dir"            location="build"/>
31 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
32 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
33 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
34 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
35 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
36 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
37 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
38 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
39 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
40 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
30 >  <property name="build.dir"                   location="build"/>
31 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
32 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
34 >  <property name="build.lib.dir"               location="${build.dir}/lib"/>
35 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
37 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40 >
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 -->
50    <property name="src.dir"              location="${basedir}/src/main"/>
51    <property name="test.src.dir"         location="${basedir}/src/test"/>
52 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
53 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
52 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
53 >  <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"/>
56    <property name="dist.dir"             location="${basedir}/dist"/>
57 <
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 -->
63 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
63 >  <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 -->
69    <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"/>
74 <  
74 >
75    <!-- Bootclasspath argument -->
76    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77  
# Line 63 | Line 81
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 -->
91  
92 +  <target name="dists"
93 +          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94 +          description="Builds all public jars and docs"/>
95  
96    <target name="compile"
97 <          depends="init, configure-compiler, prepare-src"
97 >          depends="init, configure-compiler"
98            description="Compiles main sources to build folder">
99  
100      <mkdir dir="${build.classes.dir}"/>
101  
102 <    <javac srcdir="${prepare.src.dir}"
102 >    <javac srcdir="${src.dir}"
103            destdir="${build.classes.dir}"
104              debug="${build.debug}"
105         debuglevel="${build.debuglevel}"
# Line 82 | Line 107
107             source="${build.sourcelevel}"
108               fork="true">
109  
110 +      <include name="**/*.java"/>
111 +      <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>
120  
# Line 117 | Line 149
149      <mkdir dir="${build.javadocs.dir}"/>
150  
151      <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
152 >                link="http://download.oracle.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.sourcelevel}">
155 <
124 <      <tag name="revised" description="Last revised:"/>
125 <      <tag name="spec"    description="Specified by:"/>
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >
156  
157        <packageset dir="${src.dir}"/>
158  
# Line 132 | Line 162
162  
163  
164  
135  <target name="checkstyle"
136          depends="filter-src"
137          description="Reports on style errors in Java source (verbose, mostly chaff)">
138
139    <taskdef resource="checkstyletask.properties"
140            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
141
142    <mkdir dir="${build.checkstyle.dir}"/>
143    
144    <checkstyle config="etc/checkstyle/sun_checks.xml"
145       failOnViolation="false">
146      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
147      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
148    </checkstyle>
149    
150    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
151          out="${build.checkstyle.dir}/checkstyle-report.html"
152        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
153
154  </target>
155
156
157
158  <target name="doccheck"
159          depends="filter-doccheck"
160          description="Reports on javadoc style errors">
161
162    <delete dir="${build.doccheck.dir}"/>
163    <mkdir dir="${build.doccheck.dir}"/>
164
165    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
166         docletpath="${lib.dir}/doccheck.jar"
167            destdir="${build.doccheck.dir}">
168      <packageset dir="${build.dc-filter.dir}"/>
169    </javadoc>
170
171    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
172
173  </target>
174
175  
176
165    <target name="dist"
166            depends="init, dist-clean, dist-jar, dist-docs"
167            description="Puts all distributable products in single hierarchy"/>
168  
169  
182
170    <target name="release"
171            depends="dist"
172            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 227 | Line 214
214      <mkdir dir="${dist.javadocs.dir}"/>
215  
216      <javadoc destdir="${dist.javadocs.dir}"
217 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
217 >            link="http://download.oracle.com/javase/6/docs/api/"
218              overview="${src.dir}/intro.html"
232              source="${build.sourcelevel}">
233
234      <packageset dir="${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>
243  
244    </target>
# Line 260 | Line 266
266    </target>
267  
268  
269 <  <target name="compile-ant-filter"
270 <          depends="init">
265 <
266 <    <mkdir dir="${build.ant.dir}"/>
267 <
268 <    <javac srcdir="${ant.src.dir}"
269 <          destdir="${build.ant.dir}"
270 <           source="1.4"
271 <    />
272 <
273 <  </target>
274 <
275 <
276 <  <target name="filter-src"
277 <          depends="compile-ant-filter">
278 <
279 <    <mkdir dir="${build.filter.src.dir}"/>
280 <
281 <    <copy todir="${build.filter.src.dir}">
282 <      <fileset dir="${src.dir}">
283 <        <include name="**/*.html"/>
284 <      </fileset>
285 <    </copy>
286 <
287 <    <copy todir="${build.filter.src.dir}">
288 <      <fileset dir="${src.dir}">
289 <        <exclude name="**/*.html"/>
290 <        <!-- Files excluded from dist-docs -->
291 <        <exclude name="java/util/Random.*"/>
292 <        <exclude name="sun/misc/Unsafe.*"/>
293 <      </fileset>
294 <      <!--
295 <      <filterchain>
296 <      -->
297 <
298 <        <!--
299 <         # This filter gets rid of angle-bracketed type parameters
300 <         # so that javadoc can run on the result. The following
301 <         # heuristic seems to work:
302 <         #
303 <         # For all lines not starting with space(s)-asterisk-space(s),
304 <         #   replace <something> with a space, where there may be more
305 <         #   than one right angle bracket at the end, and "something"
306 <         #   must not contain parens or pipes. (This may need some
307 <         #   tweaking.)
308 <         -->
309 <
310 <        <!--
311 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
312 <                      classpath="${build.ant.dir}">
313 <          <param name="notmatching" value="^\s+\*\s.*$"/>
314 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
315 <          <param name="replacement" value=" "/>
316 <        </filterreader>
317 <        -->
318 <
319 <      <!--
320 <      </filterchain>
321 <      -->
322 <    </copy>
269 >  <target name="compile-tests"
270 >          depends="jar">
271  
272 <  </target>
272 >    <mkdir dir="${build.testcases.dir}"/>
273  
274 +    <javac srcdir="${tck.src.dir}"
275 +          destdir="${build.testcases.dir}"
276 +            debug="${build.debug}"
277 +       debuglevel="${build.debuglevel}"
278 +      deprecation="${build.deprecation}"
279 +           source="${build.sourcelevel}"
280 +             fork="true">
281  
282 <  <target name="filter-doccheck"
283 <          depends="filter-src">
284 <
330 <    <mkdir dir="${build.dc-filter.dir}"/>
331 <
332 <    <copy todir="${build.dc-filter.dir}">
333 <      <fileset dir="${build.filter.src.dir}">
334 <        <include name="**/*.html"/>
335 <      </fileset>
336 <    </copy>
282 >      <compilerarg value="${bootclasspath.args}"/>
283 >      <compilerarg line="${build.args}"/>
284 >      <compilerarg value="-XDignore.symbol.file=true"/>
285  
286 <    <property name="generic.declarations"
339 <             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
340 <    />
286 >      <classpath refid="test.classpath"/>
287  
288 <    <copy todir="${build.dc-filter.dir}">
343 <      <fileset dir="${build.filter.src.dir}">
344 <        <exclude name="**/*.html"/>
345 <      </fileset>
346 <      <filterchain>
347 <        <!--
348 <         # These two filters try to make the source look like
349 <         # something that doccheck can process. The first removes
350 <         # -source 1.4 assertions and the second adds in a bunch
351 <         # of single letter public nested marker interfaces so that
352 <         # the generic type parameters are recognized.
353 <         -->
354 <
355 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
356 <                      classpath="${build.ant.dir}">
357 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
358 <          <param name="pattern"     value="assert"/>
359 <          <param name="replacement" value="//assert"/>
360 <        </filterreader>
361 <
362 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
363 <                      classpath="${build.ant.dir}">
364 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
365 <          <param name="pattern"     value="$"/>
366 <          <param name="replacement" value=" ${generic.declarations}"/>
367 <        </filterreader>
288 >    </javac>
289  
290 <      </filterchain>
291 <    </copy>
290 >    <javac srcdir="${test.src.dir}"
291 >          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>
298 >      <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"
376 <          depends="jar">
304 >      <classpath refid="test.classpath"/>
305  
306 <    <mkdir dir="${build.testcases.dir}"/>
306 >    </javac>
307  
308 <    <javac srcdir="${test.src.dir}/tck"
308 > <!--
309 >    <javac srcdir="${jtreg.src.dir}"
310            destdir="${build.testcases.dir}"
311              debug="${build.debug}"
312         debuglevel="${build.debuglevel}"
# Line 387 | Line 316
316  
317        <compilerarg value="${bootclasspath.args}"/>
318        <compilerarg line="${build.args}"/>
319 <      
319 >      <compilerarg value="-XDignore.symbol.file=true"/>
320 >
321        <classpath refid="test.classpath"/>
322  
323      </javac>
324 + -->
325  
326    </target>
327  
# Line 411 | Line 342
342                     fork="true">
343  
344        <jvmarg value="${bootclasspath.args}"/>
345 <      
345 >      <jvmarg value="-server"/>
346 >      <jvmarg value="-showversion"/>
347 >
348        <classpath refid="test.classpath"/>
349  
350        <formatter type="xml"/>
351  
352 <      <batchtest todir="${build.reports.dir}">
353 <        <fileset dir="${test.src.dir}/tck">
354 <          <include name="${testcase}Test.java"/>
352 >      <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}">
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"/>
368          </fileset>
369        </batchtest>
370 + -->
371  
372      </junit>
373  
# Line 442 | Line 389
389        <fileset dir="${build.reports.dir}">
390          <include name="TEST-*.xml"/>
391        </fileset>
392 <      <report styledir="${stylesheet.dir}"
446 <                format="${junit.report.format}"
447 <                 todir="${build.reports.dir}"
392 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
393        />
394      </junitreport>
395  
# Line 462 | Line 407
407      </condition>
408  
409      <property name="warnunchecked.arg" value=""/>
465    
466    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
467      <istrue value="${build.nothreads}"/>
468    </condition>
469    
470    <property name="prepare.src.dir" value="${src.dir}"/>
410  
411  
412      <!-- Common options in javac invocations -->
# Line 476 | Line 415
415    </target>
416  
417  
479  <target name="prepare-src"
480          depends="configure-compiler"
481          if="prepare.src.dir">
482
483    <mkdir dir="${prepare.src.dir}"/>
484    <copy todir="${prepare.src.dir}">
485      <fileset dir="${src.dir}">
486        <exclude name="java/lang/**"/>
487      </fileset>
488    </copy>
489
490  </target>
491
492
418    <target name="configure-tests"
419         depends="configure-compiler">
420  
# Line 501 | Line 426
426      <available property="xalan.available"
427                 classname="org.apache.xalan.Version"/>
428  
429 <              
429 >
430      <!-- Ant 1.6beta and later don't need or want this check -->
431 <    <!--    
431 >    <!--
432      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
433            unless="junit.available"/>
434  
# Line 514 | Line 439
439    </target>
440  
441  
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 +    <mkdir dir="${build.loops.dir}"/>
449 +
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 <  <!-- Anthill targets -->
462 >    </javac>
463 >
464 >    <java classname="ALoops" fork="true">
465 >      <classpath refid="loops.classpath"/>
466 >    </java>
467  
520  <target name="anthill-build">
521  
522    <!-- Override this in user.properties -->
523    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
524    
525    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
526      <arg value="-Xmx256000000"/>
527      <!-- classpath of new JVM -->
528      <arg value="-classpath"/> <arg path="${java.class.path}"/>
529      <!-- location of Ant home directory -->
530      <arg value="-Dant.home=${ant.home}"/>
531      <!-- the Ant main class -->
532      <arg value="org.apache.tools.ant.Main"/>
533      <!-- The build file -->
534      <arg value="-buildfile"/>  <arg value="build.xml"/>
535      <!-- the target to build on the new Ant instance -->
536      <arg value="-DJAVA_HOME=${tiger.home}"/>
537      <arg value="do-anthill-build"/>
538    </exec>
468    </target>
540  
541  <target name="do-anthill-build"
542          depends="jar, test, docs, dist-docs"/>
469  
544  <target name="anthill-publish">
470  
471 <    <copy todir="${deployDir}/docs/private">
472 <      <fileset dir="${build.javadocs.dir}"/>
473 <    </copy>
471 >  <!-- jsr166x -->
472 >
473 >
474 >  <target name="jsr166xcompile"
475 >          depends="init, configure-compiler"
476 >          description="Compiles jsr166x sources">
477 >
478 >    <mkdir dir="${build.jsr166x.dir}"/>
479  
480 <    <copy todir="${deployDir}/docs/public">
481 <      <fileset dir="${dist.javadocs.dir}"/>
482 <    </copy>
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 <    <copy tofile="${deployDir}/index.html"
489 <          file="${basedir}/etc/anthill-index.html"/>
488 >      <include name="**/*.java"/>
489 >      <compilerarg line="${build.args}"/>
490 >      <compilerarg value="-XDignore.symbol.file=true"/>
491  
492 <    <copy todir="${deployDir}/notes">
558 <      <fileset dir="${basedir}/etc/notes"/>
559 <    </copy>
492 >    </javac>
493  
494    </target>
495  
496  
497  
498 <  <!-- Backward compatibility, work in progress -->
498 >  <target name="jsr166xjar"
499 >          depends="jsr166xcompile"
500 >          description="Builds library jar from compiled sources">
501  
502 +    <mkdir dir="${build.jsr166xlib.dir}"/>
503  
504 <  <target name="compat" depends="jar">
505 <  
506 <    <mkdir dir="${build.testcases.dir}"/>
507 <    
508 <    <javac srcdir="${test.src.dir}"
509 <          destdir="${build.testcases.dir}"
504 >    <jar destfile="${jsr166xproduct.jar}">
505 >      <fileset dir="${build.jsr166x.dir}"/>
506 >    </jar>
507 >
508 >  </target>
509 >
510 >
511 >
512 >  <target name="jsr166xdocs"
513 >          description="Builds javadocs with custom tags to build folder">
514 >
515 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
516 >    <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 >
526 >
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 <      <compilerarg value="${bootclasspath.args}"/>
587 >
588 >      <include name="**/*.java"/>
589        <compilerarg line="${build.args}"/>
590 <      
591 <      <classpath refid="test.classpath"/>
592 <      
593 <      <include name="Compatibility.java"/>
594 <      
590 >      <compilerarg value="-XDignore.symbol.file=true"/>
591 >      <compilerarg value="${bootclasspath.args}"/>
592 >
593 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
594 >
595      </javac>
596 <    
597 <            
598 <    <java classname="Compatibility" fork="true">
599 <      <jvmarg value="${bootclasspath.args}"/>
600 <      <classpath refid="test.classpath"/>
601 <    </java>
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 >
629 >
630 >  <target name="jsr166ydist"
631 >          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 >    <delete dir="${build.jsr166y.dir}"/>
640 >    <delete dir="${build.jsr166ylib.dir}"/>
641 >
642 >  </target>
643 >
644 >
645 >
646 >  <target name="jsr166ydist-clean"
647 >          description="Removes all build and distribution products">
648 >
649 >  </target>
650 >
651 >  <target name="jsr166ydist-docs"
652 >          description="Builds javadocs without custom tags to dist folder">
653 >
654 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
655 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
656 >
657 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
658 >             packagenames="jsr166y"
659 >             link="http://download.oracle.com/javase/6/docs/api/"
660 >             source="${build.sourcelevel}"
661 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
662 >
663 >  </target>
664 >
665 >  <target name="jsr166ydist-jar"
666 >          depends="jsr166yclean, jsr166yjar">
667 >
668 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
669 >
670    </target>
671  
672 +  <!-- extra166y -->
673  
674  
675 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
676 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
677 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
601 <  <property name="pretiger.sourcelevel" value="1.4"/>
602 <  
603 <  <target name="defang"
604 <       depends="init"
605 <   description="Generates pre-Tiger compatible source">
606 <  
607 <    <delete dir="${pretiger.src.dir}"/>
608 <    <mkdir dir="${pretiger.src.dir}"/>
609 <  
610 <    <exec executable="perl">
611 <      <arg file="etc/defang.pl"/>
612 <      <!-- <arg value="-v"/> -->
613 <      <arg value="-s"/> <arg file="${src.dir}"/>
614 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
615 <    </exec>
616 <    
617 <  </target>
618 <
619 <  <target name="compile-pretiger"
620 <          depends="init, configure-compiler, defang"
621 <          description="Compiles pre-Tiger sources to build folder">
675 >  <target name="extra166ycompile"
676 >          depends="init, configure-compiler, jsr166ycompile"
677 >          description="Compiles extra166y sources">
678  
679 <    <mkdir dir="${build.pretiger.dir}"/>
679 >    <mkdir dir="${build.extra166y.dir}"/>
680  
681 <    <javac srcdir="${pretiger.src.dir}"
682 <          destdir="${build.pretiger.dir}"
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="${pretiger.sourcelevel}"
687 >           source="${build.sourcelevel}"
688               fork="true">
689  
690 +      <include name="**/*.java"/>
691        <compilerarg line="${build.args}"/>
692 <      <exclude name="**/Thread.java"/>
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>
639  
640  <target name="pretiger" depends="compile-pretiger">
700  
701 <    <mkdir dir="${build.lib.dir}"/>
702 <    
703 <    <jar destfile="${pretiger.jar}">
704 <      <fileset dir="${build.pretiger.dir}">
705 <      </fileset>
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 <    
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>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines