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.71 by peierls, Thu Dec 30 21:43:34 2004 UTC vs.
Revision 1.88 by jsr166, Sun May 29 16:00:20 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"/>
43 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
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"/>
50  <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"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <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    <property name="topsrc.dir"           location="${basedir}/src"/>
58    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59 <
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"/>
69  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
74  
75    <!-- Bootclasspath argument -->
76    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 82 | Line 86
86      <pathelement location="${build.loops.dir}"/>
87    </path>
88  
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
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 111 | Line 108
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 146 | Line 148
148      <delete dir="${build.javadocs.dir}"/>
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"
151 <            overview="${src.dir}/intro.html"
152 <              source="${build.sourcelevel}">
153 <
154 <      <tag name="revised" description="Last revised:"/>
155 <      <tag name="spec"    description="Specified by:"/>
156 <
157 <      <packageset dir="${src.dir}"/>
158 <
159 <    </javadoc>
160 <
161 <  </target>
162 <
163 <
151 >    <!-- the packagenames="none" hack below prevents scanning the -->
152 >    <!-- sourcepath for packages -->
153  
154 <  <target name="doccheck"
155 <          depends="filter-doccheck"
156 <          description="Reports on javadoc style errors">
157 <
158 <    <delete dir="${build.doccheck.dir}"/>
159 <    <mkdir dir="${build.doccheck.dir}"/>
160 <
161 <    <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}"/>
154 >    <javadoc destdir="${build.javadocs.dir}"
155 >             packagenames="none"
156 >             link="http://download.oracle.com/javase/7/docs/api/"
157 >             overview="${src.dir}/intro.html"
158 >             sourcepath="${src.dir}:${jdksrc.dir}" >
159 >      <fileset dir="${src.dir}" defaultexcludes="yes">
160 >      <include name="**/*.java"/>
161 >      </fileset>
162      </javadoc>
163  
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
164    </target>
165  
166  
# Line 209 | Line 170
170            description="Puts all distributable products in single hierarchy"/>
171  
172  
212
173    <target name="release"
174            depends="dist"
175            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 256 | Line 216
216      <delete dir="${dist.javadocs.dir}"/>
217      <mkdir dir="${dist.javadocs.dir}"/>
218  
219 <    <javadoc destdir="${dist.javadocs.dir}"
220 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
261 <            overview="${src.dir}/intro.html"
262 <              source="${build.sourcelevel}">
263 <
264 <      <packageset dir="${src.dir}"/>
219 >    <!-- the packagenames="none" hack below prevents scanning the -->
220 >    <!-- sourcepath for packages -->
221  
222 +    <javadoc destdir="${dist.javadocs.dir}"
223 +             packagenames="none"
224 +             link="http://download.oracle.com/javase/7/docs/api/"
225 +             overview="${src.dir}/intro.html"
226 +             sourcepath="${src.dir}:${jdksrc.dir}" >
227 +      <fileset dir="${src.dir}" defaultexcludes="yes">
228 +      <include name="**/*.java"/>
229 +      </fileset>
230      </javadoc>
231  
232    </target>
# Line 290 | Line 254
254    </target>
255  
256  
293  <target name="compile-ant-filter"
294          depends="init">
295
296    <mkdir dir="${build.ant.dir}"/>
297
298    <javac srcdir="${ant.src.dir}"
299          destdir="${build.ant.dir}"
300           source="1.4"/>
301
302  </target>
303
304
305  <target name="filter-src"
306          depends="compile-ant-filter">
307
308    <mkdir dir="${build.filter.src.dir}"/>
309
310    <copy todir="${build.filter.src.dir}">
311      <fileset dir="${src.dir}">
312        <include name="**/*.html"/>
313      </fileset>
314    </copy>
315
316    <copy todir="${build.filter.src.dir}">
317      <fileset dir="${src.dir}">
318        <exclude name="**/*.html"/>
319        <!-- Files excluded from dist-docs -->
320        <exclude name="java/util/Random.*"/>
321        <exclude name="sun/misc/Unsafe.*"/>
322      </fileset>
323      <!--
324      <filterchain>
325      -->
326
327        <!--
328         # This filter gets rid of angle-bracketed type parameters
329         # so that javadoc can run on the result. The following
330         # heuristic seems to work:
331         #
332         # For all lines not starting with space(s)-asterisk-space(s),
333         #   replace <something> with a space, where there may be more
334         #   than one right angle bracket at the end, and "something"
335         #   must not contain parens or pipes. (This may need some
336         #   tweaking.)
337         -->
338
339        <!--
340        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
341                      classpath="${build.ant.dir}">
342          <param name="notmatching" value="^\s+\*\s.*$"/>
343          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
344          <param name="replacement" value=" "/>
345        </filterreader>
346        -->
347
348      <!--
349      </filterchain>
350      -->
351    </copy>
352
353  </target>
354
355
356  <target name="filter-doccheck"
357          depends="filter-src">
358
359    <mkdir dir="${build.dc-filter.dir}"/>
360
361    <copy todir="${build.dc-filter.dir}">
362      <fileset dir="${build.filter.src.dir}">
363        <include name="**/*.html"/>
364      </fileset>
365    </copy>
366
367    <property name="generic.declarations"
368             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 {}"
369    />
370
371    <copy todir="${build.dc-filter.dir}">
372      <fileset dir="${build.filter.src.dir}">
373        <exclude name="**/*.html"/>
374      </fileset>
375      <filterchain>
376        <!--
377         # These two filters try to make the source look like
378         # something that doccheck can process. The first removes
379         # -source 1.4 assertions and the second adds in a bunch
380         # of single letter public nested marker interfaces so that
381         # the generic type parameters are recognized.
382         -->
383
384        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
385                      classpath="${build.ant.dir}">
386          <param name="matching"    value="^\s*assert[\s ].*$"/>
387          <param name="pattern"     value="assert"/>
388          <param name="replacement" value="//assert"/>
389        </filterreader>
390
391        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
392                      classpath="${build.ant.dir}">
393          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
394          <param name="pattern"     value="$"/>
395          <param name="replacement" value=" ${generic.declarations}"/>
396        </filterreader>
397
398      </filterchain>
399    </copy>
400
401  </target>
402
403
257    <target name="compile-tests"
258            depends="jar">
259  
# Line 416 | Line 269
269  
270        <compilerarg value="${bootclasspath.args}"/>
271        <compilerarg line="${build.args}"/>
272 +      <compilerarg value="-XDignore.symbol.file=true"/>
273  
274        <classpath refid="test.classpath"/>
275  
# Line 433 | Line 287
287  
288        <compilerarg value="${bootclasspath.args}"/>
289        <compilerarg line="${build.args}"/>
290 +      <compilerarg value="-XDignore.symbol.file=true"/>
291  
292        <classpath refid="test.classpath"/>
293  
# Line 449 | Line 304
304  
305        <compilerarg value="${bootclasspath.args}"/>
306        <compilerarg line="${build.args}"/>
307 +      <compilerarg value="-XDignore.symbol.file=true"/>
308  
309        <classpath refid="test.classpath"/>
310  
# Line 521 | Line 377
377        <fileset dir="${build.reports.dir}">
378          <include name="TEST-*.xml"/>
379        </fileset>
380 <      <report styledir="${stylesheet.dir}"
525 <                format="${junit.report.format}"
526 <                 todir="${build.reports.dir}"
380 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
381        />
382      </junitreport>
383  
# Line 573 | Line 427
427    </target>
428  
429  
576
577  <!-- Anthill targets -->
578
579  <target name="anthill-build">
580
581    <!-- Override this in user.properties -->
582    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
583
584    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
585      <arg value="-Xmx256000000"/>
586      <!-- classpath of new JVM -->
587      <arg value="-classpath"/> <arg path="${java.class.path}"/>
588      <!-- location of Ant home directory -->
589      <arg value="-Dant.home=${ant.home}"/>
590      <!-- the Ant main class -->
591      <arg value="org.apache.tools.ant.Main"/>
592      <!-- The build file -->
593      <arg value="-buildfile"/>  <arg value="build.xml"/>
594      <!-- the target to build on the new Ant instance -->
595      <arg value="-DJAVA_HOME=${tiger.home}"/>
596      <arg value="do-anthill-build"/>
597    </exec>
598  </target>
599
600  <target name="do-anthill-build"
601          depends="jar, test, docs, dist-docs"/>
602
603  <target name="anthill-publish">
604
605    <copy todir="${deployDir}/docs/private">
606      <fileset dir="${build.javadocs.dir}"/>
607    </copy>
608
609    <copy todir="${deployDir}/docs/public">
610      <fileset dir="${dist.javadocs.dir}"/>
611    </copy>
612
613    <copy tofile="${deployDir}/index.html"
614          file="${basedir}/etc/anthill-index.html"/>
615
616    <copy todir="${deployDir}/notes">
617      <fileset dir="${basedir}/etc/notes"/>
618    </copy>
619
620  </target>
621
622
623
430    <!-- Various demos and test programs -->
431  
432  
627  <target name="sample" depends="init, configure-compiler"
628          description="Standalone demo program">
629
630    <mkdir dir="${build.testcases.dir}"/>
631
632    <javac srcdir="${test.src.dir}"
633          destdir="${build.testcases.dir}"
634            debug="${build.debug}"
635       debuglevel="${build.debuglevel}"
636      deprecation="${build.deprecation}"
637           source="${build.sourcelevel}"
638             fork="true">
639
640      <include name="jsr166/test/Sample.java"/>
641
642    </javac>
643
644    <copy todir="${build.testcases.dir}">
645      <fileset dir="${test.src.dir}">
646        <include name="**/*.properties"/>
647      </fileset>
648    </copy>
649
650
651    <java classname="jsr166.test.Sample" fork="true">
652      <classpath refid="test.classpath"/>
653      <!-- <jvmarg value="-ea"/> -->
654      <!-- <jvmarg value="-server"/> -->
655      <!-- <arg value="1000"/> -->
656    </java>
657  </target>
658
659
433    <target name="loops" depends="init, configure-compiler"
434            description="Benchmark from Doug Lea's AQS paper">
435  
# Line 672 | Line 445
445  
446        <compilerarg line="${build.args}"/>
447        <classpath refid="loops.classpath"/>
448 +      <compilerarg value="-XDignore.symbol.file=true"/>
449  
450      </javac>
451  
# Line 682 | Line 456
456    </target>
457  
458  
459 <  <target name="compile-j1" depends="init, configure-compiler, compile">
459 >  <!-- jsr166x -->
460 >
461 >
462 >  <target name="jsr166xcompile"
463 >          depends="init, configure-compiler"
464 >          description="Compiles jsr166x sources">
465  
466 <    <mkdir dir="${build.j1.dir}"/>
466 >    <mkdir dir="${build.jsr166x.dir}"/>
467  
468 <    <javac srcdir="${j1.src.dir}"
469 <          destdir="${build.j1.dir}"
468 >    <javac srcdir="${jsr166xsrc.dir}"
469 >          destdir="${build.jsr166x.dir}"
470              debug="${build.debug}"
471         debuglevel="${build.debuglevel}"
472        deprecation="${build.deprecation}"
473 <           source="${build.sourcelevel}" >
473 >           source="${build.sourcelevel}"
474 >             fork="true">
475  
476        <include name="**/*.java"/>
697      <exclude name="**/dijkstra/**"/>
698
477        <compilerarg line="${build.args}"/>
478 <      <classpath refid="j1.classpath"/>
478 >      <compilerarg value="-XDignore.symbol.file=true"/>
479  
480      </javac>
481  
482    </target>
483  
484  
707  <target name="sw" depends="compile-j1"
708          description="Runs the SwingWorker demo">
485  
486 <    <!--
487 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
488 <      <classpath refid="j1.classpath"/>
713 <    </java>
714 <    -->
486 >  <target name="jsr166xjar"
487 >          depends="jsr166xcompile"
488 >          description="Builds library jar from compiled sources">
489  
490 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
490 >    <mkdir dir="${build.jsr166xlib.dir}"/>
491  
492 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
493 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
494 <    </exec>
492 >    <jar destfile="${jsr166xproduct.jar}">
493 >      <fileset dir="${build.jsr166x.dir}"/>
494 >    </jar>
495  
496    </target>
497  
724  <target name="j1" depends="compile-j1"
725          description="Runs a standalone JavaOne program">
498  
727    <java classname="${j1.test}" fork="true">
728      <classpath refid="j1.classpath"/>
729      <jvmarg value="-client"/>
499  
500 <      <!-- TestPseudoRandom args -->
501 <      <arg value="2"/>
733 <      <arg value="25"/>
734 <      <arg value="100000"/>
500 >  <target name="jsr166xdocs"
501 >          description="Builds javadocs with custom tags to build folder">
502  
503 <      <!-- WebCrawler args -->
504 <      <!--
738 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
739 <      <arg value="http://www.priorartisans.com"/>
740 <      <arg value="25"/>
741 <      -->
503 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
504 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
505  
506 <    </java>
506 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
507 >             packagenames="jsr166x"
508 >             link="http://download.oracle.com/javase/7/docs/api/"
509 >             source="${build.sourcelevel}"
510 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
511  
512    </target>
513  
514  
515 <  <target name="test-j1" depends="compile-j1"
516 <          description="Runs testcases from the JavaOne source directories">
517 <
751 <    <junit printsummary="true"
752 <             showoutput="true"
753 <          errorProperty="junit.failed"
754 <        failureProperty="junit.failed"
755 <                    dir="${build.j1.dir}"
756 <                   fork="true">
757 <
758 <      <!-- <jvmarg value="-server"/> -->
759 <      <classpath refid="j1.classpath"/>
760 <      <formatter type="xml"/>
761 <
762 <      <batchtest todir="${build.j1.dir}">
763 <        <fileset dir="${j1.src.dir}">
764 <          <include name="**/*Test.java"/>
765 <        </fileset>
766 <      </batchtest>
515 >  <target name="jsr166xdist"
516 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
517 >          description="Puts all distributable products in single hierarchy"/>
518  
768    </junit>
519  
770    <available property="junit.report.format"
771                  value="frames"
772              classname="org.apache.xalan.lib.Redirect"/>
773    <property name="junit.report.format" value="noframes"/>
520  
521 <    <junitreport todir="${build.j1.dir}">
522 <      <fileset dir="${build.j1.dir}">
777 <        <include name="TEST-*.xml"/>
778 <      </fileset>
779 <      <report styledir="${stylesheet.dir}"
780 <                format="${junit.report.format}"
781 <                 todir="${build.j1.dir}"
782 <      />
783 <    </junitreport>
521 >  <target name="jsr166xclean"
522 >          description="Removes all build products">
523  
524 <    <fail message="Test Cases Failed" if="junit.failed"/>
524 >    <delete dir="${build.jsr166x.dir}"/>
525 >    <delete dir="${build.jsr166xlib.dir}"/>
526  
527    </target>
528  
529  
530  
531 <  <!-- C++ and JNI definitions and demos -->
532 <
793 <  <target name="configure-cpp">
794 <
795 <    <!-- Define tasks and types -->
531 >  <target name="jsr166xdist-clean"
532 >          description="Removes all build and distribution products">
533  
534 <    <path id="cpptasks.path">
798 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
799 <    </path>
800 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
801 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
534 >  </target>
535  
803    <!-- Set platform property for JNI includes -->
536  
805    <condition property="platform" value="linux">
806      <os name="Linux"/>
807    </condition>
808    <condition property="platform" value="win32">
809      <os family="windows"/>
810    </condition>
811    <condition property="platform" value="solaris">
812      <os name="SunOS"/>
813    </condition>
537  
538 <  </target>
538 >  <target name="jsr166xdist-docs"
539 >          description="Builds javadocs without custom tags to dist folder">
540  
541 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
542 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
543  
544 <  <target name="cppdemo" depends="configure-cpp">
544 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
545 >             packagenames="jsr166x"
546 >             link="http://download.oracle.com/javase/7/docs/api/"
547 >             source="${build.sourcelevel}"
548 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
549  
550 <    <mkdir dir="${build.dir}"/>
550 >  </target>
551  
552 <    <cc multithreaded="true"
553 <                 name="g++"
824 <               objdir="${build.dir}"
825 <              outfile="${build.dir}/CppDemo">
826 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
827 <      <libset libs="stdc++"/>
828 <    </cc>
552 >  <target name="jsr166xdist-jar"
553 >          depends="jsr166xclean, jsr166xjar">
554  
555 <    <exec executable="${build.dir}/CppDemo">
831 <      <arg line="count in word frequency of word in command line count"/>
832 <    </exec>
555 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
556  
557    </target>
558  
559 +  <!-- jsr166y -->
560  
837  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
561  
562 <    <mkdir dir="${build.testcases.dir}"/>
562 >  <target name="jsr166ycompile"
563 >          depends="init, configure-compiler"
564 >          description="Compiles jsr166y sources">
565  
566 <    <javac srcdir="${test.src.dir}"
567 <          destdir="${build.testcases.dir}"
566 >    <mkdir dir="${build.jsr166y.dir}"/>
567 >
568 >    <javac srcdir="${jsr166ysrc.dir}"
569 >          destdir="${build.jsr166y.dir}"
570              debug="${build.debug}"
571         debuglevel="${build.debuglevel}"
572        deprecation="${build.deprecation}"
573             source="${build.sourcelevel}"
574               fork="true">
575 <      <compilerarg value="${bootclasspath.args}"/>
575 >
576 >      <include name="**/*.java"/>
577        <compilerarg line="${build.args}"/>
578 <      <classpath refid="test.classpath"/>
579 <      <include name="JniDemo.java"/>
852 <    </javac>
578 >      <compilerarg value="-XDignore.symbol.file=true"/>
579 >      <compilerarg value="${bootclasspath.args}"/>
580  
581 <    <javah destdir="${build.testcases.dir}"
582 <      classpathref="test.classpath">
583 <      <class name="JniDemo"/>
857 <    </javah>
858 <
859 <    <cc multithreaded="true"
860 <                 name="g++"
861 <               objdir="${build.dir}"
862 <              outfile="${build.dir}/JniDemo"
863 <              outtype="shared">
864 <
865 <      <compiler>
866 <        <defineset>
867 <          <define name="__int64" value="long long"/>
868 <        </defineset>
869 <        <includepath location="${java.home}/../include"/>
870 <        <includepath location="${java.home}/../include/${platform}"/>
871 <        <compilerarg value="-mno-cygwin"/>
872 <      </compiler>
873 <
874 <      <linker>
875 <        <linkerarg value="--add-stdcall-alias"/>
876 <      </linker>
877 <
878 <      <includepath location="${build.testcases.dir}"/>
879 <
880 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
881 <
882 <      <libset libs="stdc++"/>
883 <
884 <    </cc>
885 <
886 <    <!-- Necessary if windows, harmless if not -->
887 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
888 <
889 <    <java classname="JniDemo" fork="true">
890 <      <!-- Watch out: path separator hardwired to semicolon here! -->
891 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
892 <      <classpath refid="test.classpath"/>
893 <      <arg line="count in word frequency of word in command line count"/>
894 <    </java>
581 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
582 >
583 >    </javac>
584  
585    </target>
586  
587  
588  
589 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
589 >  <target name="jsr166yjar"
590 >          depends="jsr166ycompile"
591 >          description="Builds library jar from compiled sources">
592  
593 +    <mkdir dir="${build.jsr166ylib.dir}"/>
594  
595 +    <jar destfile="${jsr166yproduct.jar}" index="true">
596 +      <fileset dir="${build.jsr166y.dir}"/>
597 +    </jar>
598  
599 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
905 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
906 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
907 <  <property name="pretiger.sourcelevel" value="1.4"/>
599 >  </target>
600  
909  <target name="defang"
910       depends="init"
911   description="Generates pre-Tiger compatible source">
601  
913    <delete dir="${pretiger.src.dir}"/>
914    <mkdir dir="${pretiger.src.dir}"/>
602  
603 <    <exec executable="perl">
604 <      <arg file="etc/defang.pl"/>
605 <      <!-- <arg value="-v"/> -->
606 <      <arg value="-s"/> <arg file="${src.dir}"/>
607 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
608 <    </exec>
603 >  <target name="jsr166ydocs"
604 >          description="Builds javadocs with custom tags to build folder">
605 >
606 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
607 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
608 >
609 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
610 >             packagenames="jsr166y"
611 >             link="http://download.oracle.com/javase/7/docs/api/"
612 >             source="${build.sourcelevel}"
613 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
614  
615    </target>
616  
925  <target name="compile-pretiger"
926          depends="init, configure-compiler, defang"
927          description="Compiles pre-Tiger sources to build folder">
617  
618 <    <mkdir dir="${build.pretiger.dir}"/>
618 >  <target name="jsr166ydist"
619 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
620 >          description="Puts all distributable products in single hierarchy"/>
621  
931    <javac srcdir="${pretiger.src.dir}"
932          destdir="${build.pretiger.dir}"
933            debug="${build.debug}"
934       debuglevel="${build.debuglevel}"
935      deprecation="${build.deprecation}"
936           source="${pretiger.sourcelevel}"
937             fork="true">
622  
939      <compilerarg line="${build.args}"/>
940      <exclude name="**/Thread.java"/>
623  
624 <    </javac>
624 >  <target name="jsr166yclean"
625 >          description="Removes all build products">
626 >
627 >    <delete dir="${build.jsr166y.dir}"/>
628 >    <delete dir="${build.jsr166ylib.dir}"/>
629  
630    </target>
631  
946  <target name="pretiger" depends="compile-pretiger">
632  
948    <mkdir dir="${build.lib.dir}"/>
633  
634 <    <jar destfile="${pretiger.jar}">
635 <      <fileset dir="${build.pretiger.dir}">
952 <      </fileset>
953 <    </jar>
634 >  <target name="jsr166ydist-clean"
635 >          description="Removes all build and distribution products">
636  
637    </target>
638  
639 <  <!-- jsr166x -->
639 >  <target name="jsr166ydist-docs"
640 >          description="Builds javadocs without custom tags to dist folder">
641  
642 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
643 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
644  
645 <  <target name="jsr166xcompile"
646 <          depends="init, configure-compiler"
647 <          description="Compiles jsr166x sources">
645 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
646 >             packagenames="jsr166y"
647 >             link="http://download.oracle.com/javase/7/docs/api/"
648 >             source="${build.sourcelevel}"
649 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
650  
651 <    <mkdir dir="${build.jsr166x.dir}"/>
651 >  </target>
652  
653 <    <javac srcdir="${jsr166xsrc.dir}"
654 <          destdir="${build.jsr166x.dir}"
653 >  <target name="jsr166ydist-jar"
654 >          depends="jsr166yclean, jsr166yjar">
655 >
656 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
657 >
658 >  </target>
659 >
660 >  <!-- extra166y -->
661 >
662 >
663 >  <target name="extra166ycompile"
664 >          depends="init, configure-compiler, jsr166ycompile"
665 >          description="Compiles extra166y sources">
666 >
667 >    <mkdir dir="${build.extra166y.dir}"/>
668 >
669 >    <javac srcdir="${extra166ysrc.dir}"
670 >          destdir="${build.extra166y.dir}"
671              debug="${build.debug}"
672 +            classpath="${jsr166yproduct.jar}"
673         debuglevel="${build.debuglevel}"
674        deprecation="${build.deprecation}"
675             source="${build.sourcelevel}"
# Line 973 | Line 677
677  
678        <include name="**/*.java"/>
679        <compilerarg line="${build.args}"/>
680 +      <compilerarg value="-XDignore.symbol.file=true"/>
681 +      <compilerarg value="${bootclasspath.args}"/>
682 +
683 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
684  
685      </javac>
686  
# Line 980 | Line 688
688  
689  
690  
691 <  <target name="jsr166xjar"
692 <          depends="jsr166xcompile"
691 >  <target name="extra166yjar"
692 >          depends="extra166ycompile"
693            description="Builds library jar from compiled sources">
694  
695 <    <mkdir dir="${build.jsr166xlib.dir}"/>
695 >    <mkdir dir="${build.extra166ylib.dir}"/>
696  
697 <    <jar destfile="${jsr166xproduct.jar}">
698 <      <fileset dir="${build.jsr166x.dir}"/>
697 >    <jar destfile="${extra166yproduct.jar}" index="true">
698 >      <fileset dir="${build.extra166y.dir}"/>
699      </jar>
700  
701    </target>
702  
703  
704  
705 <  <target name="jsr166xdocs"
705 >  <target name="extra166ydocs"
706            description="Builds javadocs with custom tags to build folder">
707  
708 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
709 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1002 <
1003 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1004 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1005 <    >
1006 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1007 <      <include name="jsr166x"/>
1008 <      </packageset>
1009 <
708 >    <delete dir="${build.extra166yjavadocs.dir}"/>
709 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
710  
711 <    </javadoc>
711 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
712 >             packagenames="extra166y"
713 >             link="http://download.oracle.com/javase/7/docs/api/"
714 >             source="${build.sourcelevel}"
715 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
716  
717    </target>
718  
719  
720 <  <target name="jsr166xdist"
721 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
720 >  <target name="extra166ydist"
721 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
722            description="Puts all distributable products in single hierarchy"/>
723  
724  
725  
726 <  <target name="jsr166xclean"
726 >  <target name="extra166yclean"
727            description="Removes all build products">
728  
729 <    <delete dir="${build.jsr166x.dir}"/>
730 <    <delete dir="${build.jsr166xlib.dir}"/>
729 >    <delete dir="${build.extra166y.dir}"/>
730 >    <delete dir="${build.extra166ylib.dir}"/>
731  
732    </target>
733  
734  
735  
736 <  <target name="jsr166xdist-clean"
736 >  <target name="extra166ydist-clean"
737            description="Removes all build and distribution products">
738  
739    </target>
740  
741 <
1038 <
1039 <  <target name="jsr166xdist-docs"
741 >  <target name="extra166ydist-docs"
742            description="Builds javadocs without custom tags to dist folder">
743  
744 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
745 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
744 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
745 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
746  
747 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
748 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
749 <              source="${build.sourcelevel}">
750 <
751 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1050 <      <include name="jsr166x"/>
1051 <      </packageset>
1052 <
1053 <    </javadoc>
747 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
748 >             packagenames="extra166y"
749 >             link="http://download.oracle.com/javase/7/docs/api/"
750 >             source="${build.sourcelevel}"
751 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
752  
753    </target>
754  
755 <  <target name="jsr166xdist-jar"
756 <          depends="jsr166xclean, jsr166xjar">
755 >  <target name="extra166ydist-jar"
756 >          depends="extra166yclean, extra166yjar">
757  
758 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
758 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
759  
760    </target>
761  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines