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.72 by dl, Fri May 20 16:29:57 2005 UTC vs.
Revision 1.75 by jsr166, Tue Sep 18 12:46:40 2007 UTC

# Line 30 | Line 30
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.j1.dir"         location="${build.dir}/j1"/>
33    <property name="build.loops.dir"      location="${build.dir}/loops"/>
34    <property name="build.lib.dir"        location="${build.dir}/lib"/>
36  <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"/>
39  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
40  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
42  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
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    <!-- Source locations -->
46    <property name="src.dir"              location="${basedir}/src/main"/>
47    <property name="test.src.dir"         location="${basedir}/src/test"/>
50  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
48    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
49    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
50    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
51    <property name="lib.dir"              location="${basedir}/lib"/>
52    <property name="dist.dir"             location="${basedir}/dist"/>
53    <property name="topsrc.dir"           location="${basedir}/src"/>
54    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
55 +  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
56  
57    <!-- Distribution locations -->
58    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
59    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
60 +  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
61  
62    <!-- Jar locations -->
63    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
64    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
65 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
66    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
69  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
67  
68    <!-- Bootclasspath argument -->
69    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 82 | Line 79
79      <pathelement location="${build.loops.dir}"/>
80    </path>
81  
85  <!-- J1 classpath -->
86  <path id="j1.classpath">
87    <pathelement location="${build.classes.dir}"/>
88    <pathelement location="${build.j1.dir}"/>
89    <pathelement location="${junit.jar}"/>
90
91    <!-- Include dl.u.c for BoundedBuffer comparison -->
92    <pathelement location="${concurrent.jar}"/>
93  </path>
94
82  
83    <!-- Main targets -->
84  
# Line 111 | Line 98
98               fork="true">
99  
100        <include name="**/*.java"/>
101 +      <compilerarg value="-XDignore.symbol.file"/>
102 +
103   <!--
104        <exclude name="java/lang/**"/>
116 -->
105        <compilerarg line="${build.args}"/>
106 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
107 + -->
108  
109      </javac>
110  
# Line 149 | Line 139
139      <mkdir dir="${build.javadocs.dir}"/>
140  
141      <javadoc destdir="${build.javadocs.dir}"
142 <                link="http://java.sun.com/j2se/1.5.0/docs/api"
142 >                link="http://java.sun.com/javase/6/docs/api/"
143              overview="${src.dir}/intro.html"
144 <            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
144 >            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
145      >          
146  
147        <packageset dir="${src.dir}"/>
# Line 162 | Line 152
152  
153  
154  
165  <target name="doccheck"
166          depends="filter-doccheck"
167          description="Reports on javadoc style errors">
168
169    <delete dir="${build.doccheck.dir}"/>
170    <mkdir dir="${build.doccheck.dir}"/>
171
172    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
173         docletpath="${lib.dir}/doccheck.jar"
174            destdir="${build.doccheck.dir}">
175      <packageset dir="${build.dc-filter.dir}"/>
176    </javadoc>
177
178    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
179
180  </target>
181
182
183
184  <target name="checkstyle"
185          depends="filter-src"
186          description="Reports on style errors in Java source (verbose, mostly chaff)">
187
188    <taskdef resource="checkstyletask.properties"
189            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
190
191    <mkdir dir="${build.checkstyle.dir}"/>
192
193    <checkstyle config="etc/checkstyle/sun_checks.xml"
194       failOnViolation="false">
195      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
196      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
197    </checkstyle>
198
199    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
200          out="${build.checkstyle.dir}/checkstyle-report.html"
201        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
202
203  </target>
204
205
206
155    <target name="dist"
156            depends="init, dist-clean, dist-jar, dist-docs"
157            description="Puts all distributable products in single hierarchy"/>
# Line 257 | Line 205
205      <mkdir dir="${dist.javadocs.dir}"/>
206  
207      <javadoc destdir="${dist.javadocs.dir}"
208 <              link="http://java.sun.com/j2se/1.5.0/docs/api"
208 >            link="http://java.sun.com/javase/6/docs/api/"
209              overview="${src.dir}/intro.html"
210  
211 <            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
211 >            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
212       >
213 + <!--
214        <packageset dir="${src.dir}" defaultexcludes="yes">
215        <include name="java/util/concurrent"/>
216        <include name="java/util/concurrent/atomic"/>
217        <include name="java/util/concurrent/locks"/>
218        </packageset>
219 + -->
220        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
221 +      <include name="main/java/util/concurrent/*.java"/>
222 +      <include name="main/java/util/concurrent/atomic/*.java"/>
223 +      <include name="main/java/util/concurrent/locks/*.java"/>
224        <include name="main/java/util/*.java"/>
225 + <!--
226 +      <include name="main/java/util/concurrent/*.html"/>
227 +      <include name="main/java/util/concurrent/atomic/*.html"/>
228 +      <include name="main/java/util/concurrent/locks/*.html"/>
229 +      <include name="main/java/util/*.html"/>
230 + -->
231   <!--      <include name="jsr166x/*.java"/> -->
232        </fileset>
233      </javadoc>
# Line 298 | Line 257
257    </target>
258  
259  
301  <target name="compile-ant-filter"
302          depends="init">
303
304    <mkdir dir="${build.ant.dir}"/>
305
306    <javac srcdir="${ant.src.dir}"
307          destdir="${build.ant.dir}"
308           source="1.4"/>
309
310  </target>
311
312
313  <target name="filter-src"
314          depends="compile-ant-filter">
315
316    <mkdir dir="${build.filter.src.dir}"/>
317
318    <copy todir="${build.filter.src.dir}">
319      <fileset dir="${src.dir}">
320        <include name="**/*.html"/>
321      </fileset>
322    </copy>
323
324    <copy todir="${build.filter.src.dir}">
325      <fileset dir="${src.dir}">
326        <exclude name="**/*.html"/>
327        <!-- Files excluded from dist-docs -->
328        <exclude name="java/util/Random.*"/>
329        <exclude name="sun/misc/Unsafe.*"/>
330      </fileset>
331      <!--
332      <filterchain>
333      -->
334
335        <!--
336         # This filter gets rid of angle-bracketed type parameters
337         # so that javadoc can run on the result. The following
338         # heuristic seems to work:
339         #
340         # For all lines not starting with space(s)-asterisk-space(s),
341         #   replace <something> with a space, where there may be more
342         #   than one right angle bracket at the end, and "something"
343         #   must not contain parens or pipes. (This may need some
344         #   tweaking.)
345         -->
346
347        <!--
348        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
349                      classpath="${build.ant.dir}">
350          <param name="notmatching" value="^\s+\*\s.*$"/>
351          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
352          <param name="replacement" value=" "/>
353        </filterreader>
354        -->
355
356      <!--
357      </filterchain>
358      -->
359    </copy>
360
361  </target>
362
363
364  <target name="filter-doccheck"
365          depends="filter-src">
366
367    <mkdir dir="${build.dc-filter.dir}"/>
368
369    <copy todir="${build.dc-filter.dir}">
370      <fileset dir="${build.filter.src.dir}">
371        <include name="**/*.html"/>
372      </fileset>
373    </copy>
374
375    <property name="generic.declarations"
376             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 {}"
377    />
378
379    <copy todir="${build.dc-filter.dir}">
380      <fileset dir="${build.filter.src.dir}">
381        <exclude name="**/*.html"/>
382      </fileset>
383      <filterchain>
384        <!--
385         # These two filters try to make the source look like
386         # something that doccheck can process. The first removes
387         # -source 1.4 assertions and the second adds in a bunch
388         # of single letter public nested marker interfaces so that
389         # the generic type parameters are recognized.
390         -->
391
392        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
393                      classpath="${build.ant.dir}">
394          <param name="matching"    value="^\s*assert[\s ].*$"/>
395          <param name="pattern"     value="assert"/>
396          <param name="replacement" value="//assert"/>
397        </filterreader>
398
399        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
400                      classpath="${build.ant.dir}">
401          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
402          <param name="pattern"     value="$"/>
403          <param name="replacement" value=" ${generic.declarations}"/>
404        </filterreader>
405
406      </filterchain>
407    </copy>
408
409  </target>
410
411
260    <target name="compile-tests"
261            depends="jar">
262  
# Line 529 | Line 377
377        <fileset dir="${build.reports.dir}">
378          <include name="TEST-*.xml"/>
379        </fileset>
380 <      <report styledir="${stylesheet.dir}"
533 <                format="${junit.report.format}"
534 <                 todir="${build.reports.dir}"
380 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
381        />
382      </junitreport>
383  
# Line 581 | Line 427
427    </target>
428  
429  
584
585  <!-- Anthill targets -->
586
587  <target name="anthill-build">
588
589    <!-- Override this in user.properties -->
590    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
591
592    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
593      <arg value="-Xmx256000000"/>
594      <!-- classpath of new JVM -->
595      <arg value="-classpath"/> <arg path="${java.class.path}"/>
596      <!-- location of Ant home directory -->
597      <arg value="-Dant.home=${ant.home}"/>
598      <!-- the Ant main class -->
599      <arg value="org.apache.tools.ant.Main"/>
600      <!-- The build file -->
601      <arg value="-buildfile"/>  <arg value="build.xml"/>
602      <!-- the target to build on the new Ant instance -->
603      <arg value="-DJAVA_HOME=${tiger.home}"/>
604      <arg value="do-anthill-build"/>
605    </exec>
606  </target>
607
608  <target name="do-anthill-build"
609          depends="jar, test, docs, dist-docs"/>
610
611  <target name="anthill-publish">
612
613    <copy todir="${deployDir}/docs/private">
614      <fileset dir="${build.javadocs.dir}"/>
615    </copy>
616
617    <copy todir="${deployDir}/docs/public">
618      <fileset dir="${dist.javadocs.dir}"/>
619    </copy>
620
621    <copy tofile="${deployDir}/index.html"
622          file="${basedir}/etc/anthill-index.html"/>
623
624    <copy todir="${deployDir}/notes">
625      <fileset dir="${basedir}/etc/notes"/>
626    </copy>
627
628  </target>
629
630
631
430    <!-- Various demos and test programs -->
431  
432  
635  <target name="sample" depends="init, configure-compiler"
636          description="Standalone demo program">
637
638    <mkdir dir="${build.testcases.dir}"/>
639
640    <javac srcdir="${test.src.dir}"
641          destdir="${build.testcases.dir}"
642            debug="${build.debug}"
643       debuglevel="${build.debuglevel}"
644      deprecation="${build.deprecation}"
645           source="${build.sourcelevel}"
646             fork="true">
647
648      <include name="jsr166/test/Sample.java"/>
649
650    </javac>
651
652    <copy todir="${build.testcases.dir}">
653      <fileset dir="${test.src.dir}">
654        <include name="**/*.properties"/>
655      </fileset>
656    </copy>
657
658
659    <java classname="jsr166.test.Sample" fork="true">
660      <classpath refid="test.classpath"/>
661      <!-- <jvmarg value="-ea"/> -->
662      <!-- <jvmarg value="-server"/> -->
663      <!-- <arg value="1000"/> -->
664    </java>
665  </target>
666
667
433    <target name="loops" depends="init, configure-compiler"
434            description="Benchmark from Doug Lea's AQS paper">
435  
# Line 690 | Line 455
455    </target>
456  
457  
458 <  <target name="compile-j1" depends="init, configure-compiler, compile">
458 >  <!-- jsr166x -->
459 >
460 >
461 >  <target name="jsr166xcompile"
462 >          depends="init, configure-compiler"
463 >          description="Compiles jsr166x sources">
464  
465 <    <mkdir dir="${build.j1.dir}"/>
465 >    <mkdir dir="${build.jsr166x.dir}"/>
466  
467 <    <javac srcdir="${j1.src.dir}"
468 <          destdir="${build.j1.dir}"
467 >    <javac srcdir="${jsr166xsrc.dir}"
468 >          destdir="${build.jsr166x.dir}"
469              debug="${build.debug}"
470         debuglevel="${build.debuglevel}"
471        deprecation="${build.deprecation}"
472 <           source="${build.sourcelevel}" >
472 >           source="${build.sourcelevel}"
473 >             fork="true">
474  
475        <include name="**/*.java"/>
705      <exclude name="**/dijkstra/**"/>
706
476        <compilerarg line="${build.args}"/>
708      <classpath refid="j1.classpath"/>
477  
478      </javac>
479  
480    </target>
481  
482  
715  <target name="sw" depends="compile-j1"
716          description="Runs the SwingWorker demo">
717
718    <!--
719    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
720      <classpath refid="j1.classpath"/>
721    </java>
722    -->
723
724    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
725
726    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
727      <arg value="${build.j1.dir}/SwingWorker.html"/>
728    </exec>
729
730  </target>
731
732  <target name="j1" depends="compile-j1"
733          description="Runs a standalone JavaOne program">
734
735    <java classname="${j1.test}" fork="true">
736      <classpath refid="j1.classpath"/>
737      <jvmarg value="-client"/>
483  
484 <      <!-- TestPseudoRandom args -->
485 <      <arg value="2"/>
486 <      <arg value="25"/>
742 <      <arg value="100000"/>
484 >  <target name="jsr166xjar"
485 >          depends="jsr166xcompile"
486 >          description="Builds library jar from compiled sources">
487  
488 <      <!-- WebCrawler args -->
745 <      <!--
746 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
747 <      <arg value="http://www.priorartisans.com"/>
748 <      <arg value="25"/>
749 <      -->
488 >    <mkdir dir="${build.jsr166xlib.dir}"/>
489  
490 <    </java>
490 >    <jar destfile="${jsr166xproduct.jar}">
491 >      <fileset dir="${build.jsr166x.dir}"/>
492 >    </jar>
493  
494    </target>
495  
496  
756  <target name="test-j1" depends="compile-j1"
757          description="Runs testcases from the JavaOne source directories">
497  
498 <    <junit printsummary="true"
499 <             showoutput="true"
761 <          errorProperty="junit.failed"
762 <        failureProperty="junit.failed"
763 <                    dir="${build.j1.dir}"
764 <                   fork="true">
498 >  <target name="jsr166xdocs"
499 >          description="Builds javadocs with custom tags to build folder">
500  
501 <      <!-- <jvmarg value="-server"/> -->
502 <      <classpath refid="j1.classpath"/>
768 <      <formatter type="xml"/>
501 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
502 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
503  
504 <      <batchtest todir="${build.j1.dir}">
505 <        <fileset dir="${j1.src.dir}">
772 <          <include name="**/*Test.java"/>
773 <        </fileset>
774 <      </batchtest>
504 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
505 >             link="http://java.sun.com/javase/6/docs/api/"
506  
507 <    </junit>
507 >            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
508  
509 <    <available property="junit.report.format"
510 <                  value="frames"
511 <              classname="org.apache.xalan.lib.Redirect"/>
512 <    <property name="junit.report.format" value="noframes"/>
509 >    >
510 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
511 >      <include name="jsr166x"/>
512 >      </packageset>
513  
783    <junitreport todir="${build.j1.dir}">
784      <fileset dir="${build.j1.dir}">
785        <include name="TEST-*.xml"/>
786      </fileset>
787      <report styledir="${stylesheet.dir}"
788                format="${junit.report.format}"
789                 todir="${build.j1.dir}"
790      />
791    </junitreport>
514  
515 <    <fail message="Test Cases Failed" if="junit.failed"/>
515 >    </javadoc>
516  
517    </target>
518  
519  
520 +  <target name="jsr166xdist"
521 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
522 +          description="Puts all distributable products in single hierarchy"/>
523  
799  <!-- C++ and JNI definitions and demos -->
800
801  <target name="configure-cpp">
802
803    <!-- Define tasks and types -->
804
805    <path id="cpptasks.path">
806      <pathelement location="${lib.dir}/cpptasks.jar"/>
807    </path>
808    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
809    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
810
811    <!-- Set platform property for JNI includes -->
812
813    <condition property="platform" value="linux">
814      <os name="Linux"/>
815    </condition>
816    <condition property="platform" value="win32">
817      <os family="windows"/>
818    </condition>
819    <condition property="platform" value="solaris">
820      <os name="SunOS"/>
821    </condition>
822
823  </target>
824
825
826  <target name="cppdemo" depends="configure-cpp">
524  
828    <mkdir dir="${build.dir}"/>
525  
526 <    <cc multithreaded="true"
527 <                 name="g++"
832 <               objdir="${build.dir}"
833 <              outfile="${build.dir}/CppDemo">
834 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
835 <      <libset libs="stdc++"/>
836 <    </cc>
526 >  <target name="jsr166xclean"
527 >          description="Removes all build products">
528  
529 <    <exec executable="${build.dir}/CppDemo">
530 <      <arg line="count in word frequency of word in command line count"/>
840 <    </exec>
529 >    <delete dir="${build.jsr166x.dir}"/>
530 >    <delete dir="${build.jsr166xlib.dir}"/>
531  
532    </target>
533  
534  
845  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
846
847    <mkdir dir="${build.testcases.dir}"/>
535  
536 <    <javac srcdir="${test.src.dir}"
537 <          destdir="${build.testcases.dir}"
851 <            debug="${build.debug}"
852 <       debuglevel="${build.debuglevel}"
853 <      deprecation="${build.deprecation}"
854 <           source="${build.sourcelevel}"
855 <             fork="true">
856 <      <compilerarg value="${bootclasspath.args}"/>
857 <      <compilerarg line="${build.args}"/>
858 <      <classpath refid="test.classpath"/>
859 <      <include name="JniDemo.java"/>
860 <    </javac>
861 <
862 <    <javah destdir="${build.testcases.dir}"
863 <      classpathref="test.classpath">
864 <      <class name="JniDemo"/>
865 <    </javah>
866 <
867 <    <cc multithreaded="true"
868 <                 name="g++"
869 <               objdir="${build.dir}"
870 <              outfile="${build.dir}/JniDemo"
871 <              outtype="shared">
872 <
873 <      <compiler>
874 <        <defineset>
875 <          <define name="__int64" value="long long"/>
876 <        </defineset>
877 <        <includepath location="${java.home}/../include"/>
878 <        <includepath location="${java.home}/../include/${platform}"/>
879 <        <compilerarg value="-mno-cygwin"/>
880 <      </compiler>
881 <
882 <      <linker>
883 <        <linkerarg value="--add-stdcall-alias"/>
884 <      </linker>
885 <
886 <      <includepath location="${build.testcases.dir}"/>
887 <
888 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
889 <
890 <      <libset libs="stdc++"/>
891 <
892 <    </cc>
893 <
894 <    <!-- Necessary if windows, harmless if not -->
895 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
896 <
897 <    <java classname="JniDemo" fork="true">
898 <      <!-- Watch out: path separator hardwired to semicolon here! -->
899 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
900 <      <classpath refid="test.classpath"/>
901 <      <arg line="count in word frequency of word in command line count"/>
902 <    </java>
536 >  <target name="jsr166xdist-clean"
537 >          description="Removes all build and distribution products">
538  
539    </target>
540  
541  
542  
543 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
544 <
910 <
911 <
912 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
913 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
914 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
915 <  <property name="pretiger.sourcelevel" value="1.4"/>
916 <
917 <  <target name="defang"
918 <       depends="init"
919 <   description="Generates pre-Tiger compatible source">
920 <
921 <    <delete dir="${pretiger.src.dir}"/>
922 <    <mkdir dir="${pretiger.src.dir}"/>
923 <
924 <    <exec executable="perl">
925 <      <arg file="etc/defang.pl"/>
926 <      <!-- <arg value="-v"/> -->
927 <      <arg value="-s"/> <arg file="${src.dir}"/>
928 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
929 <    </exec>
930 <
931 <  </target>
932 <
933 <  <target name="compile-pretiger"
934 <          depends="init, configure-compiler, defang"
935 <          description="Compiles pre-Tiger sources to build folder">
543 >  <target name="jsr166xdist-docs"
544 >          description="Builds javadocs without custom tags to dist folder">
545  
546 <    <mkdir dir="${build.pretiger.dir}"/>
546 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
547 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
548  
549 <    <javac srcdir="${pretiger.src.dir}"
550 <          destdir="${build.pretiger.dir}"
551 <            debug="${build.debug}"
942 <       debuglevel="${build.debuglevel}"
943 <      deprecation="${build.deprecation}"
944 <           source="${pretiger.sourcelevel}"
945 <             fork="true">
549 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
550 >                link="http://java.sun.com/javase/6/docs/api/"
551 >              source="${build.sourcelevel}">
552  
553 <      <compilerarg line="${build.args}"/>
554 <      <exclude name="**/Thread.java"/>
553 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
554 >      <include name="jsr166x"/>
555 >      </packageset>
556  
557 <    </javac>
557 >    </javadoc>
558  
559    </target>
560  
561 <  <target name="pretiger" depends="compile-pretiger">
562 <
956 <    <mkdir dir="${build.lib.dir}"/>
561 >  <target name="jsr166xdist-jar"
562 >          depends="jsr166xclean, jsr166xjar">
563  
564 <    <jar destfile="${pretiger.jar}">
959 <      <fileset dir="${build.pretiger.dir}">
960 <      </fileset>
961 <    </jar>
564 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
565  
566    </target>
567  
568 <  <!-- jsr166x -->
568 >  <!-- jsr166y -->
569  
570  
571 <  <target name="jsr166xcompile"
571 >  <target name="jsr166ycompile"
572            depends="init, configure-compiler"
573 <          description="Compiles jsr166x sources">
573 >          description="Compiles jsr166y sources">
574  
575 <    <mkdir dir="${build.jsr166x.dir}"/>
575 >    <mkdir dir="${build.jsr166y.dir}"/>
576  
577 <    <javac srcdir="${jsr166xsrc.dir}"
578 <          destdir="${build.jsr166x.dir}"
577 >    <javac srcdir="${jsr166ysrc.dir}"
578 >          destdir="${build.jsr166y.dir}"
579              debug="${build.debug}"
580         debuglevel="${build.debuglevel}"
581        deprecation="${build.deprecation}"
# Line 981 | Line 584
584  
585        <include name="**/*.java"/>
586        <compilerarg line="${build.args}"/>
587 +      <compilerarg value="${bootclasspath.args}"/>
588 +
589 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
590  
591      </javac>
592  
# Line 988 | Line 594
594  
595  
596  
597 <  <target name="jsr166xjar"
598 <          depends="jsr166xcompile"
597 >  <target name="jsr166yjar"
598 >          depends="jsr166ycompile"
599            description="Builds library jar from compiled sources">
600  
601 <    <mkdir dir="${build.jsr166xlib.dir}"/>
601 >    <mkdir dir="${build.jsr166ylib.dir}"/>
602  
603 <    <jar destfile="${jsr166xproduct.jar}">
604 <      <fileset dir="${build.jsr166x.dir}"/>
603 >    <jar destfile="${jsr166yproduct.jar}">
604 >      <fileset dir="${build.jsr166y.dir}"/>
605      </jar>
606  
607    </target>
608  
609  
610  
611 <  <target name="jsr166xdocs"
611 >  <target name="jsr166ydocs"
612            description="Builds javadocs with custom tags to build folder">
613  
614 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
615 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
614 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
615 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
616  
617 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
618 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
619 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
617 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
618 >                link="http://java.sun.com/javase/6/docs/api/"
619 >            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
620  
621      >
622 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
623 <      <include name="jsr166x"/>
622 >      <packageset dir="${topsrc.dir}" defaultexcludes="no">
623 >      <include name="jsr166y"/>
624        </packageset>
625  
626  
# Line 1023 | Line 629
629    </target>
630  
631  
632 <  <target name="jsr166xdist"
633 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
632 >  <target name="jsr166ydist"
633 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
634            description="Puts all distributable products in single hierarchy"/>
635  
636  
637  
638 <  <target name="jsr166xclean"
638 >  <target name="jsr166yclean"
639            description="Removes all build products">
640  
641 <    <delete dir="${build.jsr166x.dir}"/>
642 <    <delete dir="${build.jsr166xlib.dir}"/>
641 >    <delete dir="${build.jsr166y.dir}"/>
642 >    <delete dir="${build.jsr166ylib.dir}"/>
643  
644    </target>
645  
646  
647  
648 <  <target name="jsr166xdist-clean"
648 >  <target name="jsr166ydist-clean"
649            description="Removes all build and distribution products">
650  
651    </target>
652  
653 <
1048 <
1049 <  <target name="jsr166xdist-docs"
653 >  <target name="jsr166ydist-docs"
654            description="Builds javadocs without custom tags to dist folder">
655  
656 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
657 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
656 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
657 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
658  
659 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
660 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
659 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
660 >                link="http://java.sun.com/javase/6/docs/api/"
661                source="${build.sourcelevel}">
662 <
663 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
664 <      <include name="jsr166x"/>
665 <      </packageset>
1062 <
662 >      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
663 >      <include name="jsr166y/*.java"/>
664 >      <include name="jsr166y/forkjoin/*.java"/>
665 >            </fileset>
666      </javadoc>
667  
668    </target>
669  
670 <  <target name="jsr166xdist-jar"
671 <          depends="jsr166xclean, jsr166xjar">
670 >  <target name="jsr166ydist-jar"
671 >          depends="jsr166yclean, jsr166yjar">
672  
673 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
673 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
674  
675    </target>
676  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines