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.90 by dl, Fri Jul 15 13:21:07 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.jsr166e.dir"           location="${build.dir}/jsr166e"/>
46 >  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
47 >  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
48 >
49 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
50 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
51 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
52  
53    <!-- Source locations -->
54    <property name="src.dir"              location="${basedir}/src/main"/>
55    <property name="test.src.dir"         location="${basedir}/src/test"/>
56 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
57 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
56 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
57 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
58 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
59    <property name="lib.dir"              location="${basedir}/lib"/>
60    <property name="dist.dir"             location="${basedir}/dist"/>
61 <
61 >  <property name="topsrc.dir"           location="${basedir}/src"/>
62 >  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
63 >  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
64 >  <property name="jsr166esrc.dir"       location="${basedir}/src/jsr166e"/>
65 >  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
66 >  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
67    <!-- Distribution locations -->
68 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
68 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
69 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
70 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
71 >  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
72 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
73  
74    <!-- Jar locations -->
75    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
76 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
77 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
78 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
79 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
80    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
81 <  
81 >
82    <!-- Bootclasspath argument -->
83    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
84  
# Line 63 | Line 88
88      <pathelement location="${junit.jar}"/>
89    </path>
90  
91 +  <!-- ALoops classpath -->
92 +  <path id="loops.classpath">
93 +    <pathelement location="${build.loops.dir}"/>
94 +  </path>
95  
96  
97    <!-- Main targets -->
98  
99 +  <target name="dists"
100 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
101 +          description="Builds all public jars and docs"/>
102  
103    <target name="compile"
104 <          depends="init, configure-compiler, prepare-src"
104 >          depends="init, configure-compiler"
105            description="Compiles main sources to build folder">
106  
107      <mkdir dir="${build.classes.dir}"/>
108  
109 <    <javac srcdir="${prepare.src.dir}"
109 >    <javac srcdir="${src.dir}"
110            destdir="${build.classes.dir}"
111              debug="${build.debug}"
112         debuglevel="${build.debuglevel}"
# Line 82 | Line 114
114             source="${build.sourcelevel}"
115               fork="true">
116  
117 +      <include name="**/*.java"/>
118 +      <compilerarg value="-XDignore.symbol.file=true"/>
119 +
120 + <!--
121 +      <exclude name="java/lang/**"/>
122        <compilerarg line="${build.args}"/>
123 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
124 + -->
125  
126      </javac>
127  
# Line 116 | Line 155
155      <delete dir="${build.javadocs.dir}"/>
156      <mkdir dir="${build.javadocs.dir}"/>
157  
158 <    <javadoc destdir="${build.javadocs.dir}"
159 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
121 <            overview="${src.dir}/intro.html"
122 <              source="${build.sourcelevel}">
123 <
124 <      <tag name="revised" description="Last revised:"/>
125 <      <tag name="spec"    description="Specified by:"/>
126 <
127 <      <packageset dir="${src.dir}"/>
158 >    <!-- the packagenames="none" hack below prevents scanning the -->
159 >    <!-- sourcepath for packages -->
160  
161 +    <javadoc destdir="${build.javadocs.dir}"
162 +             packagenames="none"
163 +             link="http://download.oracle.com/javase/7/docs/api/"
164 +             overview="${src.dir}/intro.html"
165 +             sourcepath="${src.dir}:${jdksrc.dir}"
166 +             additionalparam="-XDignore.symbol.file=true" >
167 +      <fileset dir="${src.dir}" defaultexcludes="yes">
168 +      <include name="**/*.java"/>
169 +      </fileset>
170      </javadoc>
171  
172    </target>
173  
174  
175  
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
176    <target name="dist"
177            depends="init, dist-clean, dist-jar, dist-docs"
178            description="Puts all distributable products in single hierarchy"/>
179  
180  
182
181    <target name="release"
182            depends="dist"
183            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 226 | Line 224
224      <delete dir="${dist.javadocs.dir}"/>
225      <mkdir dir="${dist.javadocs.dir}"/>
226  
227 <    <javadoc destdir="${dist.javadocs.dir}"
228 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
231 <            overview="${src.dir}/intro.html"
232 <              source="${build.sourcelevel}">
233 <
234 <      <packageset dir="${src.dir}"/>
227 >    <!-- the packagenames="none" hack below prevents scanning the -->
228 >    <!-- sourcepath for packages -->
229  
230 +    <javadoc destdir="${dist.javadocs.dir}"
231 +             packagenames="none"
232 +             link="http://download.oracle.com/javase/7/docs/api/"
233 +             overview="${src.dir}/intro.html"
234 +             sourcepath="${src.dir}:${jdksrc.dir}"
235 +             additionalparam="-XDignore.symbol.file=true" >
236 +      <fileset dir="${src.dir}" defaultexcludes="yes">
237 +      <include name="**/*.java"/>
238 +      </fileset>
239      </javadoc>
240  
241    </target>
# Line 260 | Line 263
263    </target>
264  
265  
266 <  <target name="compile-ant-filter"
267 <          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>
266 >  <target name="compile-tests"
267 >          depends="jar">
268  
269 <  </target>
269 >    <mkdir dir="${build.testcases.dir}"/>
270  
271 +    <javac srcdir="${tck.src.dir}"
272 +          destdir="${build.testcases.dir}"
273 +            debug="${build.debug}"
274 +       debuglevel="${build.debuglevel}"
275 +      deprecation="${build.deprecation}"
276 +           source="${build.sourcelevel}"
277 +             fork="true">
278  
279 <  <target name="filter-doccheck"
280 <          depends="filter-src">
281 <
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>
279 >      <compilerarg value="${bootclasspath.args}"/>
280 >      <compilerarg line="${build.args}"/>
281 >      <compilerarg value="-XDignore.symbol.file=true"/>
282  
283 <    <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 <    />
283 >      <classpath refid="test.classpath"/>
284  
285 <    <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>
285 >    </javac>
286  
287 <      </filterchain>
288 <    </copy>
287 >    <javac srcdir="${test.src.dir}"
288 >          destdir="${build.testcases.dir}"
289 >            debug="${build.debug}"
290 >       debuglevel="${build.debuglevel}"
291 >      deprecation="${build.deprecation}"
292 >           source="${build.sourcelevel}"
293 >             fork="true">
294  
295 <  </target>
295 >      <include name="jsr166/test/**"/>
296  
297 +      <compilerarg value="${bootclasspath.args}"/>
298 +      <compilerarg line="${build.args}"/>
299 +      <compilerarg value="-XDignore.symbol.file=true"/>
300  
301 <  <target name="compile-tests"
376 <          depends="jar">
301 >      <classpath refid="test.classpath"/>
302  
303 <    <mkdir dir="${build.testcases.dir}"/>
303 >    </javac>
304  
305 <    <javac srcdir="${test.src.dir}/tck"
305 > <!--
306 >    <javac srcdir="${jtreg.src.dir}"
307            destdir="${build.testcases.dir}"
308              debug="${build.debug}"
309         debuglevel="${build.debuglevel}"
# Line 387 | Line 313
313  
314        <compilerarg value="${bootclasspath.args}"/>
315        <compilerarg line="${build.args}"/>
316 <      
316 >      <compilerarg value="-XDignore.symbol.file=true"/>
317 >
318        <classpath refid="test.classpath"/>
319  
320      </javac>
321 + -->
322  
323    </target>
324  
# Line 411 | Line 339
339                     fork="true">
340  
341        <jvmarg value="${bootclasspath.args}"/>
342 <      
342 >      <jvmarg value="-server"/>
343 >      <jvmarg value="-showversion"/>
344 >
345        <classpath refid="test.classpath"/>
346  
347        <formatter type="xml"/>
348  
349 <      <batchtest todir="${build.reports.dir}">
350 <        <fileset dir="${test.src.dir}/tck">
351 <          <include name="${testcase}Test.java"/>
349 >      <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}">
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"/>
365 +        </fileset>
366 +      </batchtest>
367 + -->
368 +
369      </junit>
370  
371    </target>
# Line 442 | Line 386
386        <fileset dir="${build.reports.dir}">
387          <include name="TEST-*.xml"/>
388        </fileset>
389 <      <report styledir="${stylesheet.dir}"
446 <                format="${junit.report.format}"
447 <                 todir="${build.reports.dir}"
389 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
390        />
391      </junitreport>
392  
# Line 462 | Line 404
404      </condition>
405  
406      <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}"/>
407  
408  
409      <!-- Common options in javac invocations -->
# Line 476 | Line 412
412    </target>
413  
414  
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
415    <target name="configure-tests"
416         depends="configure-compiler">
417  
# Line 501 | Line 423
423      <available property="xalan.available"
424                 classname="org.apache.xalan.Version"/>
425  
426 <              
426 >
427      <!-- Ant 1.6beta and later don't need or want this check -->
428 <    <!--    
428 >    <!--
429      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
430            unless="junit.available"/>
431  
# Line 514 | Line 436
436    </target>
437  
438  
439 +  <!-- Various demos and test programs -->
440 +
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 +      <compilerarg value="-XDignore.symbol.file=true"/>
458 +
459 +    </javac>
460  
461 <  <!-- Anthill targets -->
461 >    <java classname="ALoops" fork="true">
462 >      <classpath refid="loops.classpath"/>
463 >    </java>
464  
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>
465    </target>
540  
541  <target name="do-anthill-build"
542          depends="jar, test, docs, dist-docs"/>
466  
544  <target name="anthill-publish">
467  
468 <    <copy todir="${deployDir}/docs/private">
469 <      <fileset dir="${build.javadocs.dir}"/>
470 <    </copy>
468 >  <!-- jsr166x -->
469 >
470 >
471 >  <target name="jsr166xcompile"
472 >          depends="init, configure-compiler"
473 >          description="Compiles jsr166x sources">
474 >
475 >    <mkdir dir="${build.jsr166x.dir}"/>
476  
477 <    <copy todir="${deployDir}/docs/public">
478 <      <fileset dir="${dist.javadocs.dir}"/>
479 <    </copy>
477 >    <javac srcdir="${jsr166xsrc.dir}"
478 >          destdir="${build.jsr166x.dir}"
479 >            debug="${build.debug}"
480 >       debuglevel="${build.debuglevel}"
481 >      deprecation="${build.deprecation}"
482 >           source="${build.sourcelevel}"
483 >             fork="true">
484  
485 <    <copy tofile="${deployDir}/index.html"
486 <          file="${basedir}/etc/anthill-index.html"/>
485 >      <include name="**/*.java"/>
486 >      <compilerarg line="${build.args}"/>
487 >      <compilerarg value="-XDignore.symbol.file=true"/>
488  
489 <    <copy todir="${deployDir}/notes">
558 <      <fileset dir="${basedir}/etc/notes"/>
559 <    </copy>
489 >    </javac>
490  
491    </target>
492  
493  
494  
495 <  <!-- Backward compatibility, work in progress -->
495 >  <target name="jsr166xjar"
496 >          depends="jsr166xcompile"
497 >          description="Builds library jar from compiled sources">
498  
499 +    <mkdir dir="${build.jsr166xlib.dir}"/>
500  
501 <  <target name="compat" depends="jar">
502 <  
503 <    <mkdir dir="${build.testcases.dir}"/>
504 <    
505 <    <javac srcdir="${test.src.dir}"
506 <          destdir="${build.testcases.dir}"
501 >    <jar destfile="${jsr166xproduct.jar}">
502 >      <fileset dir="${build.jsr166x.dir}"/>
503 >    </jar>
504 >
505 >  </target>
506 >
507 >
508 >
509 >  <target name="jsr166xdocs"
510 >          description="Builds javadocs with custom tags to build folder">
511 >
512 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
513 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
514 >
515 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
516 >             packagenames="jsr166x"
517 >             link="http://download.oracle.com/javase/7/docs/api/"
518 >             source="${build.sourcelevel}"
519 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
520 >             additionalparam="-XDignore.symbol.file=true" />
521 >
522 >  </target>
523 >
524 >
525 >  <target name="jsr166xdist"
526 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
527 >          description="Puts all distributable products in single hierarchy"/>
528 >
529 >
530 >
531 >  <target name="jsr166xclean"
532 >          description="Removes all build products">
533 >
534 >    <delete dir="${build.jsr166x.dir}"/>
535 >    <delete dir="${build.jsr166xlib.dir}"/>
536 >
537 >  </target>
538 >
539 >
540 >
541 >  <target name="jsr166xdist-clean"
542 >          description="Removes all build and distribution products">
543 >
544 >  </target>
545 >
546 >
547 >
548 >  <target name="jsr166xdist-docs"
549 >          description="Builds javadocs without custom tags to dist folder">
550 >
551 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
552 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
553 >
554 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
555 >             packagenames="jsr166x"
556 >             link="http://download.oracle.com/javase/7/docs/api/"
557 >             source="${build.sourcelevel}"
558 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
559 >             additionalparam="-XDignore.symbol.file=true" />
560 >
561 >  </target>
562 >
563 >  <target name="jsr166xdist-jar"
564 >          depends="jsr166xclean, jsr166xjar">
565 >
566 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
567 >
568 >  </target>
569 >
570 >  <!-- jsr166y -->
571 >
572 >
573 >  <target name="jsr166ycompile"
574 >          depends="init, configure-compiler"
575 >          description="Compiles jsr166y sources">
576 >
577 >    <mkdir dir="${build.jsr166y.dir}"/>
578 >
579 >    <javac srcdir="${jsr166ysrc.dir}"
580 >          destdir="${build.jsr166y.dir}"
581              debug="${build.debug}"
582         debuglevel="${build.debuglevel}"
583        deprecation="${build.deprecation}"
584             source="${build.sourcelevel}"
585               fork="true">
586 <            
586 >
587 >      <include name="**/*.java"/>
588 >      <compilerarg line="${build.args}"/>
589 >      <compilerarg value="-XDignore.symbol.file=true"/>
590        <compilerarg value="${bootclasspath.args}"/>
591 +
592 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
593 +
594 +    </javac>
595 +
596 +  </target>
597 +
598 +
599 +
600 +  <target name="jsr166yjar"
601 +          depends="jsr166ycompile"
602 +          description="Builds library jar from compiled sources">
603 +
604 +    <mkdir dir="${build.jsr166ylib.dir}"/>
605 +
606 +    <jar destfile="${jsr166yproduct.jar}" index="true">
607 +      <fileset dir="${build.jsr166y.dir}"/>
608 +    </jar>
609 +
610 +  </target>
611 +
612 +
613 +
614 +  <target name="jsr166ydocs"
615 +          description="Builds javadocs with custom tags to build folder">
616 +
617 +    <delete dir="${build.jsr166yjavadocs.dir}"/>
618 +    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
619 +
620 +    <javadoc destdir="${build.jsr166yjavadocs.dir}"
621 +             packagenames="jsr166y"
622 +             link="http://download.oracle.com/javase/7/docs/api/"
623 +             source="${build.sourcelevel}"
624 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
625 +             additionalparam="-XDignore.symbol.file=true" />
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/7/docs/api/"
660 +             source="${build.sourcelevel}"
661 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
662 +             additionalparam="-XDignore.symbol.file=true" />
663 +
664 +  </target>
665 +
666 +  <target name="jsr166ydist-jar"
667 +          depends="jsr166yclean, jsr166yjar">
668 +
669 +    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
670 +
671 +  </target>
672 +
673 +
674 +  <!-- extra166y -->
675 +
676 +
677 +  <target name="extra166ycompile"
678 +          depends="init, configure-compiler, jsr166ycompile"
679 +          description="Compiles extra166y sources">
680 +
681 +    <mkdir dir="${build.extra166y.dir}"/>
682 +
683 +    <javac srcdir="${extra166ysrc.dir}"
684 +          destdir="${build.extra166y.dir}"
685 +            debug="${build.debug}"
686 +            classpath="${jsr166yproduct.jar}"
687 +       debuglevel="${build.debuglevel}"
688 +      deprecation="${build.deprecation}"
689 +           source="${build.sourcelevel}"
690 +             fork="true">
691 +
692 +      <include name="**/*.java"/>
693        <compilerarg line="${build.args}"/>
694 <      
695 <      <classpath refid="test.classpath"/>
696 <      
697 <      <include name="Compatibility.java"/>
698 <      
694 >      <compilerarg value="-XDignore.symbol.file=true"/>
695 >      <compilerarg value="${bootclasspath.args}"/>
696 >
697 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
698 >
699      </javac>
700 <    
701 <            
702 <    <java classname="Compatibility" fork="true">
703 <      <jvmarg value="${bootclasspath.args}"/>
704 <      <classpath refid="test.classpath"/>
705 <    </java>
700 >
701 >  </target>
702 >
703 >
704 >
705 >  <target name="extra166yjar"
706 >          depends="extra166ycompile"
707 >          description="Builds library jar from compiled sources">
708 >
709 >    <mkdir dir="${build.extra166ylib.dir}"/>
710 >
711 >    <jar destfile="${extra166yproduct.jar}" index="true">
712 >      <fileset dir="${build.extra166y.dir}"/>
713 >    </jar>
714 >
715 >  </target>
716 >
717 >
718 >
719 >  <target name="extra166ydocs"
720 >          description="Builds javadocs with custom tags to build folder">
721 >
722 >    <delete dir="${build.extra166yjavadocs.dir}"/>
723 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
724 >
725 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
726 >             packagenames="extra166y"
727 >             link="http://download.oracle.com/javase/7/docs/api/"
728 >             source="${build.sourcelevel}"
729 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
730 >             additionalparam="-XDignore.symbol.file=true" />
731 >
732 >  </target>
733 >
734 >
735 >  <target name="extra166ydist"
736 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
737 >          description="Puts all distributable products in single hierarchy"/>
738 >
739 >
740 >
741 >  <target name="extra166yclean"
742 >          description="Removes all build products">
743 >
744 >    <delete dir="${build.extra166y.dir}"/>
745 >    <delete dir="${build.extra166ylib.dir}"/>
746 >
747 >  </target>
748 >
749 >
750 >
751 >  <target name="extra166ydist-clean"
752 >          description="Removes all build and distribution products">
753 >
754 >  </target>
755 >
756 >  <target name="extra166ydist-docs"
757 >          description="Builds javadocs without custom tags to dist folder">
758 >
759 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
760 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
761 >
762 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
763 >             packagenames="extra166y"
764 >             link="http://download.oracle.com/javase/7/docs/api/"
765 >             source="${build.sourcelevel}"
766 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
767 >             additionalparam="-XDignore.symbol.file=true" />
768 >
769 >  </target>
770 >
771 >  <target name="extra166ydist-jar"
772 >          depends="extra166yclean, extra166yjar">
773 >
774 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
775 >
776    </target>
777  
778 +  <!-- jsr166e -->
779  
780  
781 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
782 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
783 <  <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">
781 >  <target name="jsr166ecompile"
782 >          depends="init, configure-compiler"
783 >          description="Compiles jsr166e sources">
784  
785 <    <mkdir dir="${build.pretiger.dir}"/>
785 >    <mkdir dir="${build.jsr166e.dir}"/>
786  
787 <    <javac srcdir="${pretiger.src.dir}"
788 <          destdir="${build.pretiger.dir}"
787 >    <javac srcdir="${jsr166esrc.dir}"
788 >          destdir="${build.jsr166e.dir}"
789              debug="${build.debug}"
790         debuglevel="${build.debuglevel}"
791        deprecation="${build.deprecation}"
792 <           source="${pretiger.sourcelevel}"
792 >           source="1.7"
793               fork="true">
794  
795 +      <include name="**/*.java"/>
796        <compilerarg line="${build.args}"/>
797 <      <exclude name="**/Thread.java"/>
797 >      <compilerarg value="-XDignore.symbol.file=true"/>
798 >      <compilerarg value="${bootclasspath.args}"/>
799 >
800 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
801  
802      </javac>
803  
804    </target>
639  
640  <target name="pretiger" depends="compile-pretiger">
805  
806 <    <mkdir dir="${build.lib.dir}"/>
807 <    
808 <    <jar destfile="${pretiger.jar}">
809 <      <fileset dir="${build.pretiger.dir}">
810 <      </fileset>
806 >
807 >
808 >  <target name="jsr166ejar"
809 >          depends="jsr166ecompile"
810 >          description="Builds library jar from compiled sources">
811 >
812 >    <mkdir dir="${build.jsr166elib.dir}"/>
813 >
814 >    <jar destfile="${jsr166eproduct.jar}" index="true">
815 >      <fileset dir="${build.jsr166e.dir}"/>
816      </jar>
817 <    
817 >
818 >  </target>
819 >
820 >
821 >
822 >  <target name="jsr166edocs"
823 >          description="Builds javadocs with custom tags to build folder">
824 >
825 >    <delete dir="${build.jsr166ejavadocs.dir}"/>
826 >    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
827 >
828 >    <javadoc destdir="${build.jsr166ejavadocs.dir}"
829 >             packagenames="jsr166e,jsr166e.extra"
830 >             link="http://download.oracle.com/javase/7/docs/api/"
831 >             source="1.7"
832 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
833 >             additionalparam="-XDignore.symbol.file=true" />
834 >
835 >  </target>
836 >
837 >
838 >  <target name="jsr166edist"
839 >          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
840 >          description="Puts all distributable products in single hierarchy"/>
841 >
842 >
843 >
844 >  <target name="jsr166eclean"
845 >          description="Removes all build products">
846 >
847 >    <delete dir="${build.jsr166e.dir}"/>
848 >    <delete dir="${build.jsr166elib.dir}"/>
849 >
850 >  </target>
851 >
852 >
853 >
854 >  <target name="jsr166edist-clean"
855 >          description="Removes all build and distribution products">
856 >
857 >  </target>
858 >
859 >  <target name="jsr166edist-docs"
860 >          description="Builds javadocs without custom tags to dist folder">
861 >
862 >    <delete dir="${dist.jsr166ejavadocs.dir}"/>
863 >    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
864 >
865 >    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
866 >             packagenames="jsr166e,jsr166e.extra"
867 >             link="http://download.oracle.com/javase/7/docs/api/"
868 >             source="1.7"
869 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
870 >             additionalparam="-XDignore.symbol.file=true" />
871 >
872 >  </target>
873 >
874 >  <target name="jsr166edist-jar"
875 >          depends="jsr166eclean, jsr166ejar">
876 >
877 >    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
878 >
879    </target>
880  
881   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines