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.60 by tim, Mon Dec 8 03:10:54 2003 UTC vs.
Revision 1.87 by jsr166, Sat May 28 02:32:19 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="loops.src.dir"        location="${basedir}/src/loops"/>
53    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
47 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
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 64 | 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"
# Line 83 | 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 118 | 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/7/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.sourcelevel}">
155 <
125 <      <tag name="revised" description="Last revised:"/>
126 <      <tag name="spec"    description="Specified by:"/>
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >
156  
157        <packageset dir="${src.dir}"/>
158  
# Line 133 | Line 162
162  
163  
164  
136  <target name="doccheck"
137          depends="filter-doccheck"
138          description="Reports on javadoc style errors">
139
140    <delete dir="${build.doccheck.dir}"/>
141    <mkdir dir="${build.doccheck.dir}"/>
142
143    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
144         docletpath="${lib.dir}/doccheck.jar"
145            destdir="${build.doccheck.dir}">
146      <packageset dir="${build.dc-filter.dir}"/>
147    </javadoc>
148
149    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
150
151  </target>
152
153
154
155  <target name="checkstyle"
156          depends="filter-src"
157          description="Reports on style errors in Java source (verbose, mostly chaff)">
158
159    <taskdef resource="checkstyletask.properties"
160            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
161
162    <mkdir dir="${build.checkstyle.dir}"/>
163    
164    <checkstyle config="etc/checkstyle/sun_checks.xml"
165       failOnViolation="false">
166      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
167      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
168    </checkstyle>
169    
170    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
171          out="${build.checkstyle.dir}/checkstyle-report.html"
172        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
173
174  </target>
175
176  
177
165    <target name="dist"
166            depends="init, dist-clean, dist-jar, dist-docs"
167            description="Puts all distributable products in single hierarchy"/>
168  
169  
183
170    <target name="release"
171            depends="dist"
172            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 227 | Line 213
213      <delete dir="${dist.javadocs.dir}"/>
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"
232 <            overview="${src.dir}/intro.html"
233 <              source="${build.sourcelevel}">
234 <
235 <      <packageset dir="${src.dir}"/>
216 >    <!-- the packagenames="none" hack below prevents scanning the -->
217 >    <!-- sourcepath for packages -->
218  
219 +    <javadoc destdir="${dist.javadocs.dir}"
220 +             packagenames="none"
221 +             link="http://download.oracle.com/javase/7/docs/api/"
222 +             overview="${src.dir}/intro.html"
223 +             sourcepath="${src.dir}:${jdksrc.dir}" >
224 +      <fileset dir="${src.dir}" defaultexcludes="yes">
225 +      <include name="**/*.java"/>
226 +      </fileset>
227      </javadoc>
228  
229    </target>
# Line 261 | Line 251
251    </target>
252  
253  
264  <target name="compile-ant-filter"
265          depends="init">
266
267    <mkdir dir="${build.ant.dir}"/>
268
269    <javac srcdir="${ant.src.dir}"
270          destdir="${build.ant.dir}"
271           source="1.4"
272    />
273
274  </target>
275
276
277  <target name="filter-src"
278          depends="compile-ant-filter">
279
280    <mkdir dir="${build.filter.src.dir}"/>
281
282    <copy todir="${build.filter.src.dir}">
283      <fileset dir="${src.dir}">
284        <include name="**/*.html"/>
285      </fileset>
286    </copy>
287
288    <copy todir="${build.filter.src.dir}">
289      <fileset dir="${src.dir}">
290        <exclude name="**/*.html"/>
291        <!-- Files excluded from dist-docs -->
292        <exclude name="java/util/Random.*"/>
293        <exclude name="sun/misc/Unsafe.*"/>
294      </fileset>
295      <!--
296      <filterchain>
297      -->
298
299        <!--
300         # This filter gets rid of angle-bracketed type parameters
301         # so that javadoc can run on the result. The following
302         # heuristic seems to work:
303         #
304         # For all lines not starting with space(s)-asterisk-space(s),
305         #   replace <something> with a space, where there may be more
306         #   than one right angle bracket at the end, and "something"
307         #   must not contain parens or pipes. (This may need some
308         #   tweaking.)
309         -->
310
311        <!--
312        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
313                      classpath="${build.ant.dir}">
314          <param name="notmatching" value="^\s+\*\s.*$"/>
315          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
316          <param name="replacement" value=" "/>
317        </filterreader>
318        -->
319
320      <!--
321      </filterchain>
322      -->
323    </copy>
324
325  </target>
326
327
328  <target name="filter-doccheck"
329          depends="filter-src">
330
331    <mkdir dir="${build.dc-filter.dir}"/>
332
333    <copy todir="${build.dc-filter.dir}">
334      <fileset dir="${build.filter.src.dir}">
335        <include name="**/*.html"/>
336      </fileset>
337    </copy>
338
339    <property name="generic.declarations"
340             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 {}"
341    />
342
343    <copy todir="${build.dc-filter.dir}">
344      <fileset dir="${build.filter.src.dir}">
345        <exclude name="**/*.html"/>
346      </fileset>
347      <filterchain>
348        <!--
349         # These two filters try to make the source look like
350         # something that doccheck can process. The first removes
351         # -source 1.4 assertions and the second adds in a bunch
352         # of single letter public nested marker interfaces so that
353         # the generic type parameters are recognized.
354         -->
355
356        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
357                      classpath="${build.ant.dir}">
358          <param name="matching"    value="^\s*assert[\s ].*$"/>
359          <param name="pattern"     value="assert"/>
360          <param name="replacement" value="//assert"/>
361        </filterreader>
362
363        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
364                      classpath="${build.ant.dir}">
365          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
366          <param name="pattern"     value="$"/>
367          <param name="replacement" value=" ${generic.declarations}"/>
368        </filterreader>
369
370      </filterchain>
371    </copy>
372
373  </target>
374
375
254    <target name="compile-tests"
255            depends="jar">
256  
# Line 388 | Line 266
266  
267        <compilerarg value="${bootclasspath.args}"/>
268        <compilerarg line="${build.args}"/>
269 <      
269 >      <compilerarg value="-XDignore.symbol.file=true"/>
270 >
271        <classpath refid="test.classpath"/>
272  
273      </javac>
# Line 402 | Line 281
281               fork="true">
282  
283        <include name="jsr166/test/**"/>
284 <      
284 >
285 >      <compilerarg value="${bootclasspath.args}"/>
286 >      <compilerarg line="${build.args}"/>
287 >      <compilerarg value="-XDignore.symbol.file=true"/>
288 >
289 >      <classpath refid="test.classpath"/>
290 >
291 >    </javac>
292 >
293 > <!--
294 >    <javac srcdir="${jtreg.src.dir}"
295 >          destdir="${build.testcases.dir}"
296 >            debug="${build.debug}"
297 >       debuglevel="${build.debuglevel}"
298 >      deprecation="${build.deprecation}"
299 >           source="${build.sourcelevel}"
300 >             fork="true">
301 >
302        <compilerarg value="${bootclasspath.args}"/>
303        <compilerarg line="${build.args}"/>
304 <      
304 >      <compilerarg value="-XDignore.symbol.file=true"/>
305 >
306        <classpath refid="test.classpath"/>
307  
308      </javac>
309 + -->
310  
311    </target>
312  
# Line 429 | Line 327
327                     fork="true">
328  
329        <jvmarg value="${bootclasspath.args}"/>
330 <      
330 >      <jvmarg value="-server"/>
331 >      <jvmarg value="-showversion"/>
332 >
333        <classpath refid="test.classpath"/>
334  
335        <formatter type="xml"/>
336  
337 <      <batchtest todir="${build.reports.dir}">
337 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
338          <fileset dir="${tck.src.dir}">
339            <include name="**/${testcase}Test.java"/>
340          </fileset>
341 +      </batchtest>
342 +
343 +      <batchtest todir="${build.reports.dir}" if="do.test.old">
344          <fileset dir="${test.src.dir}">
345            <include name="jsr166/test/**/${testcase}Test.java"/>
346          </fileset>
347        </batchtest>
348  
349 + <!--
350 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
351 +        <fileset dir="${jtreg.src.dir}">
352 +          <include name="**/${testcase}Test.java"/>
353 +        </fileset>
354 +      </batchtest>
355 + -->
356 +
357      </junit>
358  
359    </target>
# Line 463 | Line 374
374        <fileset dir="${build.reports.dir}">
375          <include name="TEST-*.xml"/>
376        </fileset>
377 <      <report styledir="${stylesheet.dir}"
467 <                format="${junit.report.format}"
468 <                 todir="${build.reports.dir}"
377 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
378        />
379      </junitreport>
380  
# Line 502 | Line 411
411      <available property="xalan.available"
412                 classname="org.apache.xalan.Version"/>
413  
414 <              
414 >
415      <!-- Ant 1.6beta and later don't need or want this check -->
416 <    <!--    
416 >    <!--
417      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
418            unless="junit.available"/>
419  
# Line 515 | Line 424
424    </target>
425  
426  
427 +  <!-- Various demos and test programs -->
428 +
429 +
430 +  <target name="loops" depends="init, configure-compiler"
431 +          description="Benchmark from Doug Lea's AQS paper">
432 +
433 +    <mkdir dir="${build.loops.dir}"/>
434 +
435 +    <javac srcdir="${loops.src.dir}"
436 +          destdir="${build.loops.dir}"
437 +            debug="${build.debug}"
438 +       debuglevel="${build.debuglevel}"
439 +      deprecation="${build.deprecation}"
440 +           source="${build.sourcelevel}"
441 +             fork="true">
442 +
443 +      <compilerarg line="${build.args}"/>
444 +      <classpath refid="loops.classpath"/>
445 +      <compilerarg value="-XDignore.symbol.file=true"/>
446 +
447 +    </javac>
448 +
449 +    <java classname="ALoops" fork="true">
450 +      <classpath refid="loops.classpath"/>
451 +    </java>
452 +
453 +  </target>
454 +
455 +
456 +  <!-- jsr166x -->
457 +
458 +
459 +  <target name="jsr166xcompile"
460 +          depends="init, configure-compiler"
461 +          description="Compiles jsr166x sources">
462 +
463 +    <mkdir dir="${build.jsr166x.dir}"/>
464 +
465 +    <javac srcdir="${jsr166xsrc.dir}"
466 +          destdir="${build.jsr166x.dir}"
467 +            debug="${build.debug}"
468 +       debuglevel="${build.debuglevel}"
469 +      deprecation="${build.deprecation}"
470 +           source="${build.sourcelevel}"
471 +             fork="true">
472 +
473 +      <include name="**/*.java"/>
474 +      <compilerarg line="${build.args}"/>
475 +      <compilerarg value="-XDignore.symbol.file=true"/>
476  
477 <  <!-- Anthill targets -->
477 >    </javac>
478  
521  <target name="anthill-build">
522  
523    <!-- Override this in user.properties -->
524    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
525    
526    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
527      <arg value="-Xmx256000000"/>
528      <!-- classpath of new JVM -->
529      <arg value="-classpath"/> <arg path="${java.class.path}"/>
530      <!-- location of Ant home directory -->
531      <arg value="-Dant.home=${ant.home}"/>
532      <!-- the Ant main class -->
533      <arg value="org.apache.tools.ant.Main"/>
534      <!-- The build file -->
535      <arg value="-buildfile"/>  <arg value="build.xml"/>
536      <!-- the target to build on the new Ant instance -->
537      <arg value="-DJAVA_HOME=${tiger.home}"/>
538      <arg value="do-anthill-build"/>
539    </exec>
479    </target>
541  
542  <target name="do-anthill-build"
543          depends="jar, test, docs, dist-docs"/>
480  
545  <target name="anthill-publish">
481  
547    <copy todir="${deployDir}/docs/private">
548      <fileset dir="${build.javadocs.dir}"/>
549    </copy>
482  
483 <    <copy todir="${deployDir}/docs/public">
484 <      <fileset dir="${dist.javadocs.dir}"/>
485 <    </copy>
483 >  <target name="jsr166xjar"
484 >          depends="jsr166xcompile"
485 >          description="Builds library jar from compiled sources">
486  
487 <    <copy tofile="${deployDir}/index.html"
556 <          file="${basedir}/etc/anthill-index.html"/>
487 >    <mkdir dir="${build.jsr166xlib.dir}"/>
488  
489 <    <copy todir="${deployDir}/notes">
490 <      <fileset dir="${basedir}/etc/notes"/>
491 <    </copy>
489 >    <jar destfile="${jsr166xproduct.jar}">
490 >      <fileset dir="${build.jsr166x.dir}"/>
491 >    </jar>
492  
493    </target>
494  
495  
496  
497 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
497 >  <target name="jsr166xdocs"
498 >          description="Builds javadocs with custom tags to build folder">
499  
500 +    <delete dir="${build.jsr166xjavadocs.dir}"/>
501 +    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
502  
503 <  <target name="compat" depends="jar">
504 <  
505 <    <mkdir dir="${build.testcases.dir}"/>
506 <    
507 <    <javac srcdir="${test.src.dir}"
508 <          destdir="${build.testcases.dir}"
503 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
504 >             packagenames="jsr166x"
505 >             link="http://download.oracle.com/javase/7/docs/api/"
506 >             source="${build.sourcelevel}"
507 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
508 >
509 >  </target>
510 >
511 >
512 >  <target name="jsr166xdist"
513 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
514 >          description="Puts all distributable products in single hierarchy"/>
515 >
516 >
517 >
518 >  <target name="jsr166xclean"
519 >          description="Removes all build products">
520 >
521 >    <delete dir="${build.jsr166x.dir}"/>
522 >    <delete dir="${build.jsr166xlib.dir}"/>
523 >
524 >  </target>
525 >
526 >
527 >
528 >  <target name="jsr166xdist-clean"
529 >          description="Removes all build and distribution products">
530 >
531 >  </target>
532 >
533 >
534 >
535 >  <target name="jsr166xdist-docs"
536 >          description="Builds javadocs without custom tags to dist folder">
537 >
538 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
539 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
540 >
541 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
542 >             packagenames="jsr166x"
543 >             link="http://download.oracle.com/javase/7/docs/api/"
544 >             source="${build.sourcelevel}"
545 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
546 >
547 >  </target>
548 >
549 >  <target name="jsr166xdist-jar"
550 >          depends="jsr166xclean, jsr166xjar">
551 >
552 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
553 >
554 >  </target>
555 >
556 >  <!-- jsr166y -->
557 >
558 >
559 >  <target name="jsr166ycompile"
560 >          depends="init, configure-compiler"
561 >          description="Compiles jsr166y sources">
562 >
563 >    <mkdir dir="${build.jsr166y.dir}"/>
564 >
565 >    <javac srcdir="${jsr166ysrc.dir}"
566 >          destdir="${build.jsr166y.dir}"
567              debug="${build.debug}"
568         debuglevel="${build.debuglevel}"
569        deprecation="${build.deprecation}"
570             source="${build.sourcelevel}"
571               fork="true">
572 <            
573 <      <compilerarg value="${bootclasspath.args}"/>
572 >
573 >      <include name="**/*.java"/>
574        <compilerarg line="${build.args}"/>
575 <      
576 <      <classpath refid="test.classpath"/>
577 <      
578 <      <include name="Compatibility.java"/>
579 <      
575 >      <compilerarg value="-XDignore.symbol.file=true"/>
576 >      <compilerarg value="${bootclasspath.args}"/>
577 >
578 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
579 >
580      </javac>
581 <    
582 <            
583 <    <java classname="Compatibility" fork="true">
584 <      <jvmarg value="${bootclasspath.args}"/>
585 <      <classpath refid="test.classpath"/>
586 <    </java>
581 >
582 >  </target>
583 >
584 >
585 >
586 >  <target name="jsr166yjar"
587 >          depends="jsr166ycompile"
588 >          description="Builds library jar from compiled sources">
589 >
590 >    <mkdir dir="${build.jsr166ylib.dir}"/>
591 >
592 >    <jar destfile="${jsr166yproduct.jar}" index="true">
593 >      <fileset dir="${build.jsr166y.dir}"/>
594 >    </jar>
595 >
596 >  </target>
597 >
598 >
599 >
600 >  <target name="jsr166ydocs"
601 >          description="Builds javadocs with custom tags to build folder">
602 >
603 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
604 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
605 >
606 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
607 >             packagenames="jsr166y"
608 >             link="http://download.oracle.com/javase/7/docs/api/"
609 >             source="${build.sourcelevel}"
610 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
611 >
612 >  </target>
613 >
614 >
615 >  <target name="jsr166ydist"
616 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
617 >          description="Puts all distributable products in single hierarchy"/>
618 >
619 >
620 >
621 >  <target name="jsr166yclean"
622 >          description="Removes all build products">
623 >
624 >    <delete dir="${build.jsr166y.dir}"/>
625 >    <delete dir="${build.jsr166ylib.dir}"/>
626 >
627 >  </target>
628 >
629 >
630 >
631 >  <target name="jsr166ydist-clean"
632 >          description="Removes all build and distribution products">
633 >
634 >  </target>
635 >
636 >  <target name="jsr166ydist-docs"
637 >          description="Builds javadocs without custom tags to dist folder">
638 >
639 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
640 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
641 >
642 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
643 >             packagenames="jsr166y"
644 >             link="http://download.oracle.com/javase/7/docs/api/"
645 >             source="${build.sourcelevel}"
646 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
647 >
648    </target>
649  
650 +  <target name="jsr166ydist-jar"
651 +          depends="jsr166yclean, jsr166yjar">
652 +
653 +    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
654 +
655 +  </target>
656  
657 +  <!-- extra166y -->
658  
599  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
600  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
601  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
602  <property name="pretiger.sourcelevel" value="1.4"/>
603  
604  <target name="defang"
605       depends="init"
606   description="Generates pre-Tiger compatible source">
607  
608    <delete dir="${pretiger.src.dir}"/>
609    <mkdir dir="${pretiger.src.dir}"/>
610  
611    <exec executable="perl">
612      <arg file="etc/defang.pl"/>
613      <!-- <arg value="-v"/> -->
614      <arg value="-s"/> <arg file="${src.dir}"/>
615      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
616    </exec>
617    
618  </target>
619
620  <target name="compile-pretiger"
621          depends="init, configure-compiler, defang"
622          description="Compiles pre-Tiger sources to build folder">
659  
660 <    <mkdir dir="${build.pretiger.dir}"/>
660 >  <target name="extra166ycompile"
661 >          depends="init, configure-compiler, jsr166ycompile"
662 >          description="Compiles extra166y sources">
663  
664 <    <javac srcdir="${pretiger.src.dir}"
665 <          destdir="${build.pretiger.dir}"
664 >    <mkdir dir="${build.extra166y.dir}"/>
665 >
666 >    <javac srcdir="${extra166ysrc.dir}"
667 >          destdir="${build.extra166y.dir}"
668              debug="${build.debug}"
669 +            classpath="${jsr166yproduct.jar}"
670         debuglevel="${build.debuglevel}"
671        deprecation="${build.deprecation}"
672 <           source="${pretiger.sourcelevel}"
672 >           source="${build.sourcelevel}"
673               fork="true">
674  
675 +      <include name="**/*.java"/>
676        <compilerarg line="${build.args}"/>
677 <      <exclude name="**/Thread.java"/>
677 >      <compilerarg value="-XDignore.symbol.file=true"/>
678 >      <compilerarg value="${bootclasspath.args}"/>
679 >
680 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
681  
682      </javac>
683  
684    </target>
640  
641  <target name="pretiger" depends="compile-pretiger">
685  
686 <    <mkdir dir="${build.lib.dir}"/>
687 <    
688 <    <jar destfile="${pretiger.jar}">
689 <      <fileset dir="${build.pretiger.dir}">
690 <      </fileset>
686 >
687 >
688 >  <target name="extra166yjar"
689 >          depends="extra166ycompile"
690 >          description="Builds library jar from compiled sources">
691 >
692 >    <mkdir dir="${build.extra166ylib.dir}"/>
693 >
694 >    <jar destfile="${extra166yproduct.jar}" index="true">
695 >      <fileset dir="${build.extra166y.dir}"/>
696      </jar>
697 <    
697 >
698 >  </target>
699 >
700 >
701 >
702 >  <target name="extra166ydocs"
703 >          description="Builds javadocs with custom tags to build folder">
704 >
705 >    <delete dir="${build.extra166yjavadocs.dir}"/>
706 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
707 >
708 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
709 >             packagenames="extra166y"
710 >             link="http://download.oracle.com/javase/7/docs/api/"
711 >             source="${build.sourcelevel}"
712 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
713 >
714 >  </target>
715 >
716 >
717 >  <target name="extra166ydist"
718 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
719 >          description="Puts all distributable products in single hierarchy"/>
720 >
721 >
722 >
723 >  <target name="extra166yclean"
724 >          description="Removes all build products">
725 >
726 >    <delete dir="${build.extra166y.dir}"/>
727 >    <delete dir="${build.extra166ylib.dir}"/>
728 >
729 >  </target>
730 >
731 >
732 >
733 >  <target name="extra166ydist-clean"
734 >          description="Removes all build and distribution products">
735 >
736 >  </target>
737 >
738 >  <target name="extra166ydist-docs"
739 >          description="Builds javadocs without custom tags to dist folder">
740 >
741 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
742 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
743 >
744 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
745 >             packagenames="extra166y"
746 >             link="http://download.oracle.com/javase/7/docs/api/"
747 >             source="${build.sourcelevel}"
748 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
749 >
750 >  </target>
751 >
752 >  <target name="extra166ydist-jar"
753 >          depends="extra166yclean, extra166yjar">
754 >
755 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
756 >
757    </target>
758  
759   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines