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.68 by jsr166, Mon Jun 14 17:22:09 2004 UTC vs.
Revision 1.81 by jsr166, Sun Aug 2 00:11:59 2009 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.j1.dir"         location="${build.dir}/j1"/>
34 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
35 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
36 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
37 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38 <  <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"/>
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"/>
47  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
52    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
53    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
51  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
52  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
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"/>
62  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
74  
75    <!-- Bootclasspath argument -->
76    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 75 | Line 86
86      <pathelement location="${build.loops.dir}"/>
87    </path>
88  
78  <!-- J1 classpath -->
79  <path id="j1.classpath">
80    <pathelement location="${build.j1.dir}"/>
81    <pathelement location="${junit.jar}"/>
82    <pathelement location="${concurrent.jar}"/>
83  </path>
84
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 101 | Line 108
108               fork="true">
109  
110        <include name="**/*.java"/>
111 +      <compilerarg value="-XDignore.symbol.file"/>
112 +
113 + <!--
114        <exclude name="java/lang/**"/>
115        <compilerarg line="${build.args}"/>
116 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117 + -->
118  
119      </javac>
120  
# Line 137 | 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://java.sun.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.sourcelevel}">
155 <
144 <      <tag name="revised" description="Last revised:"/>
145 <      <tag name="spec"    description="Specified by:"/>
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >          
156  
157        <packageset dir="${src.dir}"/>
158  
# Line 152 | Line 162
162  
163  
164  
155  <target name="doccheck"
156          depends="filter-doccheck"
157          description="Reports on javadoc style errors">
158
159    <delete dir="${build.doccheck.dir}"/>
160    <mkdir dir="${build.doccheck.dir}"/>
161
162    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
163         docletpath="${lib.dir}/doccheck.jar"
164            destdir="${build.doccheck.dir}">
165      <packageset dir="${build.dc-filter.dir}"/>
166    </javadoc>
167
168    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
169
170  </target>
171
172
173
174  <target name="checkstyle"
175          depends="filter-src"
176          description="Reports on style errors in Java source (verbose, mostly chaff)">
177
178    <taskdef resource="checkstyletask.properties"
179            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
180
181    <mkdir dir="${build.checkstyle.dir}"/>
182
183    <checkstyle config="etc/checkstyle/sun_checks.xml"
184       failOnViolation="false">
185      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
186      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
187    </checkstyle>
188
189    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
190          out="${build.checkstyle.dir}/checkstyle-report.html"
191        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
192
193  </target>
194
195
196
165    <target name="dist"
166            depends="init, dist-clean, dist-jar, dist-docs"
167            description="Puts all distributable products in single hierarchy"/>
168  
169  
202
170    <target name="release"
171            depends="dist"
172            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 247 | Line 214
214      <mkdir dir="${dist.javadocs.dir}"/>
215  
216      <javadoc destdir="${dist.javadocs.dir}"
217 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
217 >            link="http://java.sun.com/javase/6/docs/api/"
218              overview="${src.dir}/intro.html"
252              source="${build.sourcelevel}">
253
254      <packageset dir="${src.dir}"/>
219  
220 +            sourcepath="${src.dir}:${jdksrc.dir}"
221 +     >
222 + <!--
223 +      <packageset dir="${src.dir}" defaultexcludes="yes">
224 +      <include name="java/util/concurrent"/>
225 +      <include name="java/util/concurrent/atomic"/>
226 +      <include name="java/util/concurrent/locks"/>
227 +      </packageset>
228 + -->
229 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230 +      <include name="main/java/util/concurrent/*.java"/>
231 +      <include name="main/java/util/concurrent/atomic/*.java"/>
232 +      <include name="main/java/util/concurrent/locks/*.java"/>
233 +      <include name="main/java/util/*.java"/>
234 + <!--
235 +      <include name="main/java/util/concurrent/*.html"/>
236 +      <include name="main/java/util/concurrent/atomic/*.html"/>
237 +      <include name="main/java/util/concurrent/locks/*.html"/>
238 +      <include name="main/java/util/*.html"/>
239 + -->
240 + <!--      <include name="jsr166x/*.java"/> -->
241 +      </fileset>
242      </javadoc>
243  
244    </target>
# Line 280 | Line 266
266    </target>
267  
268  
283  <target name="compile-ant-filter"
284          depends="init">
285
286    <mkdir dir="${build.ant.dir}"/>
287
288    <javac srcdir="${ant.src.dir}"
289          destdir="${build.ant.dir}"
290           source="1.4"/>
291
292  </target>
293
294
295  <target name="filter-src"
296          depends="compile-ant-filter">
297
298    <mkdir dir="${build.filter.src.dir}"/>
299
300    <copy todir="${build.filter.src.dir}">
301      <fileset dir="${src.dir}">
302        <include name="**/*.html"/>
303      </fileset>
304    </copy>
305
306    <copy todir="${build.filter.src.dir}">
307      <fileset dir="${src.dir}">
308        <exclude name="**/*.html"/>
309        <!-- Files excluded from dist-docs -->
310        <exclude name="java/util/Random.*"/>
311        <exclude name="sun/misc/Unsafe.*"/>
312      </fileset>
313      <!--
314      <filterchain>
315      -->
316
317        <!--
318         # This filter gets rid of angle-bracketed type parameters
319         # so that javadoc can run on the result. The following
320         # heuristic seems to work:
321         #
322         # For all lines not starting with space(s)-asterisk-space(s),
323         #   replace <something> with a space, where there may be more
324         #   than one right angle bracket at the end, and "something"
325         #   must not contain parens or pipes. (This may need some
326         #   tweaking.)
327         -->
328
329        <!--
330        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
331                      classpath="${build.ant.dir}">
332          <param name="notmatching" value="^\s+\*\s.*$"/>
333          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
334          <param name="replacement" value=" "/>
335        </filterreader>
336        -->
337
338      <!--
339      </filterchain>
340      -->
341    </copy>
342
343  </target>
344
345
346  <target name="filter-doccheck"
347          depends="filter-src">
348
349    <mkdir dir="${build.dc-filter.dir}"/>
350
351    <copy todir="${build.dc-filter.dir}">
352      <fileset dir="${build.filter.src.dir}">
353        <include name="**/*.html"/>
354      </fileset>
355    </copy>
356
357    <property name="generic.declarations"
358             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 {}"
359    />
360
361    <copy todir="${build.dc-filter.dir}">
362      <fileset dir="${build.filter.src.dir}">
363        <exclude name="**/*.html"/>
364      </fileset>
365      <filterchain>
366        <!--
367         # These two filters try to make the source look like
368         # something that doccheck can process. The first removes
369         # -source 1.4 assertions and the second adds in a bunch
370         # of single letter public nested marker interfaces so that
371         # the generic type parameters are recognized.
372         -->
373
374        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
375                      classpath="${build.ant.dir}">
376          <param name="matching"    value="^\s*assert[\s ].*$"/>
377          <param name="pattern"     value="assert"/>
378          <param name="replacement" value="//assert"/>
379        </filterreader>
380
381        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
382                      classpath="${build.ant.dir}">
383          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
384          <param name="pattern"     value="$"/>
385          <param name="replacement" value=" ${generic.declarations}"/>
386        </filterreader>
387
388      </filterchain>
389    </copy>
390
391  </target>
392
393
269    <target name="compile-tests"
270            depends="jar">
271  
# Line 511 | Line 386
386        <fileset dir="${build.reports.dir}">
387          <include name="TEST-*.xml"/>
388        </fileset>
389 <      <report styledir="${stylesheet.dir}"
515 <                format="${junit.report.format}"
516 <                 todir="${build.reports.dir}"
389 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
390        />
391      </junitreport>
392  
# Line 563 | Line 436
436    </target>
437  
438  
566
567  <!-- Anthill targets -->
568
569  <target name="anthill-build">
570
571    <!-- Override this in user.properties -->
572    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
573
574    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
575      <arg value="-Xmx256000000"/>
576      <!-- classpath of new JVM -->
577      <arg value="-classpath"/> <arg path="${java.class.path}"/>
578      <!-- location of Ant home directory -->
579      <arg value="-Dant.home=${ant.home}"/>
580      <!-- the Ant main class -->
581      <arg value="org.apache.tools.ant.Main"/>
582      <!-- The build file -->
583      <arg value="-buildfile"/>  <arg value="build.xml"/>
584      <!-- the target to build on the new Ant instance -->
585      <arg value="-DJAVA_HOME=${tiger.home}"/>
586      <arg value="do-anthill-build"/>
587    </exec>
588  </target>
589
590  <target name="do-anthill-build"
591          depends="jar, test, docs, dist-docs"/>
592
593  <target name="anthill-publish">
594
595    <copy todir="${deployDir}/docs/private">
596      <fileset dir="${build.javadocs.dir}"/>
597    </copy>
598
599    <copy todir="${deployDir}/docs/public">
600      <fileset dir="${dist.javadocs.dir}"/>
601    </copy>
602
603    <copy tofile="${deployDir}/index.html"
604          file="${basedir}/etc/anthill-index.html"/>
605
606    <copy todir="${deployDir}/notes">
607      <fileset dir="${basedir}/etc/notes"/>
608    </copy>
609
610  </target>
611
612
613
439    <!-- Various demos and test programs -->
440  
441  
617  <target name="sample" depends="init, configure-compiler"
618          description="Standalone demo program">
619
620    <mkdir dir="${build.testcases.dir}"/>
621
622    <javac srcdir="${test.src.dir}"
623          destdir="${build.testcases.dir}"
624            debug="${build.debug}"
625       debuglevel="${build.debuglevel}"
626      deprecation="${build.deprecation}"
627           source="${build.sourcelevel}"
628             fork="true">
629
630      <include name="jsr166/test/Sample.java"/>
631
632    </javac>
633
634    <copy todir="${build.testcases.dir}">
635      <fileset dir="${test.src.dir}">
636        <include name="**/*.properties"/>
637      </fileset>
638    </copy>
639
640
641    <java classname="jsr166.test.Sample" fork="true">
642      <classpath refid="test.classpath"/>
643      <!-- <jvmarg value="-ea"/> -->
644      <!-- <jvmarg value="-server"/> -->
645      <!-- <arg value="1000"/> -->
646    </java>
647  </target>
648
649
442    <target name="loops" depends="init, configure-compiler"
443            description="Benchmark from Doug Lea's AQS paper">
444  
# Line 672 | Line 464
464    </target>
465  
466  
467 <  <target name="compile-j1" depends="init, configure-compiler">
467 >  <!-- jsr166x -->
468 >
469 >
470 >  <target name="jsr166xcompile"
471 >          depends="init, configure-compiler"
472 >          description="Compiles jsr166x sources">
473  
474 <    <mkdir dir="${build.j1.dir}"/>
474 >    <mkdir dir="${build.jsr166x.dir}"/>
475  
476 <    <javac srcdir="${j1.src.dir}"
477 <          destdir="${build.j1.dir}"
476 >    <javac srcdir="${jsr166xsrc.dir}"
477 >          destdir="${build.jsr166x.dir}"
478              debug="${build.debug}"
479         debuglevel="${build.debuglevel}"
480        deprecation="${build.deprecation}"
481 <           source="${build.sourcelevel}" >
481 >           source="${build.sourcelevel}"
482 >             fork="true">
483  
484        <include name="**/*.java"/>
687      <exclude name="**/dijkstra/**"/>
688
485        <compilerarg line="${build.args}"/>
690      <classpath refid="j1.classpath"/>
486  
487      </javac>
488  
489    </target>
490  
491  
697  <target name="sw" depends="compile-j1"
698          description="Runs the SwingWorker demo">
492  
493 <    <!--
494 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
495 <      <classpath refid="j1.classpath"/>
703 <    </java>
704 <    -->
493 >  <target name="jsr166xjar"
494 >          depends="jsr166xcompile"
495 >          description="Builds library jar from compiled sources">
496  
497 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
497 >    <mkdir dir="${build.jsr166xlib.dir}"/>
498  
499 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
500 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
501 <    </exec>
499 >    <jar destfile="${jsr166xproduct.jar}">
500 >      <fileset dir="${build.jsr166x.dir}"/>
501 >    </jar>
502  
503    </target>
504  
714  <target name="j1" depends="compile-j1"
715          description="Runs a standalone JavaOne program">
505  
717    <java classname="${j1.test}" fork="true">
718      <classpath refid="j1.classpath"/>
719      <jvmarg value="-client"/>
506  
507 <      <!-- WebCrawler args -->
508 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
723 <      <arg value="http://www.priorartisans.com"/>
724 <      <arg value="25"/>
507 >  <target name="jsr166xdocs"
508 >          description="Builds javadocs with custom tags to build folder">
509  
510 <    </java>
510 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
511 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
512  
513 <  </target>
513 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
514 >             link="http://java.sun.com/javase/6/docs/api/"
515 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
516 >    >
517 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
518 >      <include name="jsr166x"/>
519 >      </packageset>
520  
521  
522 <  <target name="test-j1" depends="compile-j1"
732 <          description="Runs testcases from the JavaOne source directories">
522 >    </javadoc>
523  
524 <    <junit printsummary="true"
735 <             showoutput="true"
736 <          errorProperty="junit.failed"
737 <        failureProperty="junit.failed"
738 <                    dir="${build.j1.dir}"
739 <                   fork="true">
524 >  </target>
525  
741      <!-- <jvmarg value="-server"/> -->
742      <classpath refid="j1.classpath"/>
743      <formatter type="xml"/>
526  
527 <      <batchtest todir="${build.j1.dir}">
528 <        <fileset dir="${j1.src.dir}">
529 <          <include name="**/*Test.java"/>
748 <        </fileset>
749 <      </batchtest>
527 >  <target name="jsr166xdist"
528 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
529 >          description="Puts all distributable products in single hierarchy"/>
530  
751    </junit>
531  
753    <available property="junit.report.format"
754                  value="frames"
755              classname="org.apache.xalan.lib.Redirect"/>
756    <property name="junit.report.format" value="noframes"/>
532  
533 <    <junitreport todir="${build.j1.dir}">
534 <      <fileset dir="${build.j1.dir}">
760 <        <include name="TEST-*.xml"/>
761 <      </fileset>
762 <      <report styledir="${stylesheet.dir}"
763 <                format="${junit.report.format}"
764 <                 todir="${build.j1.dir}"
765 <      />
766 <    </junitreport>
533 >  <target name="jsr166xclean"
534 >          description="Removes all build products">
535  
536 <    <fail message="Test Cases Failed" if="junit.failed"/>
536 >    <delete dir="${build.jsr166x.dir}"/>
537 >    <delete dir="${build.jsr166xlib.dir}"/>
538  
539    </target>
540  
541  
542  
543 <  <!-- C++ and JNI definitions and demos -->
543 >  <target name="jsr166xdist-clean"
544 >          description="Removes all build and distribution products">
545  
546 <  <target name="configure-cpp">
546 >  </target>
547  
778    <!-- Define tasks and types -->
548  
780    <path id="cpptasks.path">
781      <pathelement location="${lib.dir}/cpptasks.jar"/>
782    </path>
783    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
784    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
549  
550 <    <!-- Set platform property for JNI includes -->
550 >  <target name="jsr166xdist-docs"
551 >          description="Builds javadocs without custom tags to dist folder">
552  
553 <    <condition property="platform" value="linux">
554 <      <os name="Linux"/>
790 <    </condition>
791 <    <condition property="platform" value="win32">
792 <      <os family="windows"/>
793 <    </condition>
794 <    <condition property="platform" value="solaris">
795 <      <os name="SunOS"/>
796 <    </condition>
553 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
554 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
555  
556 <  </target>
556 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
557 >                link="http://java.sun.com/javase/6/docs/api/"
558 >              source="${build.sourcelevel}">
559  
560 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
561 +      <include name="jsr166x"/>
562 +      </packageset>
563  
564 <  <target name="cppdemo" depends="configure-cpp">
564 >    </javadoc>
565  
566 <    <mkdir dir="${build.dir}"/>
566 >  </target>
567  
568 <    <cc multithreaded="true"
569 <                 name="g++"
807 <               objdir="${build.dir}"
808 <              outfile="${build.dir}/CppDemo">
809 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
810 <      <libset libs="stdc++"/>
811 <    </cc>
568 >  <target name="jsr166xdist-jar"
569 >          depends="jsr166xclean, jsr166xjar">
570  
571 <    <exec executable="${build.dir}/CppDemo">
814 <      <arg line="count in word frequency of word in command line count"/>
815 <    </exec>
571 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
572  
573    </target>
574  
575 +  <!-- jsr166y -->
576  
820  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
577  
578 <    <mkdir dir="${build.testcases.dir}"/>
578 >  <target name="jsr166ycompile"
579 >          depends="init, configure-compiler"
580 >          description="Compiles jsr166y sources">
581  
582 <    <javac srcdir="${test.src.dir}"
583 <          destdir="${build.testcases.dir}"
582 >    <mkdir dir="${build.jsr166y.dir}"/>
583 >
584 >    <javac srcdir="${jsr166ysrc.dir}"
585 >          destdir="${build.jsr166y.dir}"
586              debug="${build.debug}"
587         debuglevel="${build.debuglevel}"
588        deprecation="${build.deprecation}"
589             source="${build.sourcelevel}"
590               fork="true">
591 <      <compilerarg value="${bootclasspath.args}"/>
591 >
592 >      <include name="**/*.java"/>
593        <compilerarg line="${build.args}"/>
594 <      <classpath refid="test.classpath"/>
595 <      <include name="JniDemo.java"/>
594 >      <compilerarg value="${bootclasspath.args}"/>
595 >
596 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
597 >
598      </javac>
599  
600 <    <javah destdir="${build.testcases.dir}"
601 <      classpathref="test.classpath">
602 <      <class name="JniDemo"/>
603 <    </javah>
604 <
605 <    <cc multithreaded="true"
606 <                 name="g++"
607 <               objdir="${build.dir}"
608 <              outfile="${build.dir}/JniDemo"
609 <              outtype="shared">
610 <
611 <      <compiler>
612 <        <defineset>
613 <          <define name="__int64" value="long long"/>
614 <        </defineset>
615 <        <includepath location="${java.home}/../include"/>
616 <        <includepath location="${java.home}/../include/${platform}"/>
617 <        <compilerarg value="-mno-cygwin"/>
618 <      </compiler>
619 <
620 <      <linker>
621 <        <linkerarg value="--add-stdcall-alias"/>
622 <      </linker>
623 <
624 <      <includepath location="${build.testcases.dir}"/>
625 <
626 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
627 <
628 <      <libset libs="stdc++"/>
629 <
630 <    </cc>
631 <
632 <    <!-- Necessary if windows, harmless if not -->
633 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
634 <
635 <    <java classname="JniDemo" fork="true">
636 <      <!-- Watch out: path separator hardwired to semicolon here! -->
637 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
638 <      <classpath refid="test.classpath"/>
639 <      <arg line="count in word frequency of word in command line count"/>
640 <    </java>
600 >  </target>
601 >
602 >
603 >
604 >  <target name="jsr166yjar"
605 >          depends="jsr166ycompile"
606 >          description="Builds library jar from compiled sources">
607 >
608 >    <mkdir dir="${build.jsr166ylib.dir}"/>
609 >
610 >    <jar destfile="${jsr166yproduct.jar}" index="true">
611 >      <fileset dir="${build.jsr166y.dir}"/>
612 >    </jar>
613 >
614 >  </target>
615 >
616 >
617 >
618 >  <target name="jsr166ydocs"
619 >          description="Builds javadocs with custom tags to build folder">
620 >
621 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
622 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
623 >
624 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
625 >                link="http://java.sun.com/javase/6/docs/api/"
626 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
627 >    >
628 >      <packageset dir="${topsrc.dir}" defaultexcludes="no">
629 >      <include name="jsr166y"/>
630 >      </packageset>
631 >
632 >
633 >    </javadoc>
634 >
635 >  </target>
636 >
637 >
638 >  <target name="jsr166ydist"
639 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
640 >          description="Puts all distributable products in single hierarchy"/>
641 >
642 >
643 >
644 >  <target name="jsr166yclean"
645 >          description="Removes all build products">
646 >
647 >    <delete dir="${build.jsr166y.dir}"/>
648 >    <delete dir="${build.jsr166ylib.dir}"/>
649  
650    </target>
651  
652  
653  
654 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
654 >  <target name="jsr166ydist-clean"
655 >          description="Removes all build and distribution products">
656  
657 +  </target>
658  
659 +  <target name="jsr166ydist-docs"
660 +          description="Builds javadocs without custom tags to dist folder">
661  
662 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
663 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
889 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
890 <  <property name="pretiger.sourcelevel" value="1.4"/>
662 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
663 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
664  
665 <  <target name="defang"
666 <       depends="init"
667 <   description="Generates pre-Tiger compatible source">
665 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
666 >                link="http://java.sun.com/javase/6/docs/api/"
667 >              source="${build.sourcelevel}"
668 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
669 >            >          
670 >      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
671 >      <include name="jsr166y/*.java"/>
672 >            </fileset>
673 >    </javadoc>
674  
675 <    <delete dir="${pretiger.src.dir}"/>
897 <    <mkdir dir="${pretiger.src.dir}"/>
675 >  </target>
676  
677 <    <exec executable="perl">
678 <      <arg file="etc/defang.pl"/>
679 <      <!-- <arg value="-v"/> -->
680 <      <arg value="-s"/> <arg file="${src.dir}"/>
903 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
904 <    </exec>
677 >  <target name="jsr166ydist-jar"
678 >          depends="jsr166yclean, jsr166yjar">
679 >
680 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
681  
682    </target>
683  
684 <  <target name="compile-pretiger"
685 <          depends="init, configure-compiler, defang"
910 <          description="Compiles pre-Tiger sources to build folder">
684 >  <!-- extra166y -->
685 >
686  
687 <    <mkdir dir="${build.pretiger.dir}"/>
687 >  <target name="extra166ycompile"
688 >          depends="init, configure-compiler, jsr166ycompile"
689 >          description="Compiles extra166y sources">
690  
691 <    <javac srcdir="${pretiger.src.dir}"
692 <          destdir="${build.pretiger.dir}"
691 >    <mkdir dir="${build.extra166y.dir}"/>
692 >
693 >    <javac srcdir="${extra166ysrc.dir}"
694 >          destdir="${build.extra166y.dir}"
695              debug="${build.debug}"
696 +            classpath="${jsr166yproduct.jar}"
697         debuglevel="${build.debuglevel}"
698        deprecation="${build.deprecation}"
699 <           source="${pretiger.sourcelevel}"
699 >           source="${build.sourcelevel}"
700               fork="true">
701  
702 +      <include name="**/*.java"/>
703        <compilerarg line="${build.args}"/>
704 <      <exclude name="**/Thread.java"/>
704 >      <compilerarg value="${bootclasspath.args}"/>
705 >
706 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
707  
708      </javac>
709  
710    </target>
711  
929  <target name="pretiger" depends="compile-pretiger">
712  
931    <mkdir dir="${build.lib.dir}"/>
713  
714 <    <jar destfile="${pretiger.jar}">
715 <      <fileset dir="${build.pretiger.dir}">
716 <      </fileset>
714 >  <target name="extra166yjar"
715 >          depends="extra166ycompile"
716 >          description="Builds library jar from compiled sources">
717 >
718 >    <mkdir dir="${build.extra166ylib.dir}"/>
719 >
720 >    <jar destfile="${extra166yproduct.jar}" index="true">
721 >      <fileset dir="${build.extra166y.dir}"/>
722      </jar>
723  
724    </target>
725  
726 +
727 +
728 +  <target name="extra166ydocs"
729 +          description="Builds javadocs with custom tags to build folder">
730 +
731 +    <delete dir="${build.extra166yjavadocs.dir}"/>
732 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
733 +
734 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
735 +                link="http://java.sun.com/javase/6/docs/api/"
736 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
737 +    >
738 +      <packageset dir="${topsrc.dir}" defaultexcludes="no">
739 +      <include name="extra166y"/>
740 +      </packageset>
741 +
742 +
743 +    </javadoc>
744 +
745 +  </target>
746 +
747 +
748 +  <target name="extra166ydist"
749 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
750 +          description="Puts all distributable products in single hierarchy"/>
751 +
752 +
753 +
754 +  <target name="extra166yclean"
755 +          description="Removes all build products">
756 +
757 +    <delete dir="${build.extra166y.dir}"/>
758 +    <delete dir="${build.extra166ylib.dir}"/>
759 +
760 +  </target>
761 +
762 +
763 +
764 +  <target name="extra166ydist-clean"
765 +          description="Removes all build and distribution products">
766 +
767 +  </target>
768 +
769 +  <target name="extra166ydist-docs"
770 +          description="Builds javadocs without custom tags to dist folder">
771 +
772 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
773 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
774 +
775 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
776 +                link="http://java.sun.com/javase/6/docs/api/"
777 +              source="${build.sourcelevel}"
778 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
779 +            >
780 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
781 +      <include name="extra166y/*.java"/>
782 +            </fileset>
783 +    </javadoc>
784 +
785 +  </target>
786 +
787 +  <target name="extra166ydist-jar"
788 +          depends="extra166yclean, extra166yjar">
789 +
790 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
791 +
792 +  </target>
793 +
794   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines