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.66 by jsr166, Sun Apr 11 01:37:41 2004 UTC vs.
Revision 1.85 by jsr166, Sat May 28 00:57:34 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines