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.73 by dl, Tue Nov 8 00:13:41 2005 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}"/>
# Line 149 | 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.5.0/docs/api"
154 <            overview="${src.dir}/intro.html"
155 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
156 <    >          
157 <
158 <      <packageset dir="${src.dir}"/>
159 <
160 <    </javadoc>
161 <
162 <  </target>
163 <
151 >    <!-- the packagenames="none" hack below prevents scanning the -->
152 >    <!-- sourcepath for packages -->
153  
154 <
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 <
173 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
174 <         docletpath="${lib.dir}/doccheck.jar"
175 <            destdir="${build.doccheck.dir}">
176 <      <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  
179    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
180
181  </target>
182
183
184
185  <target name="checkstyle"
186          depends="filter-src"
187          description="Reports on style errors in Java source (verbose, mostly chaff)">
188
189    <taskdef resource="checkstyletask.properties"
190            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
191
192    <mkdir dir="${build.checkstyle.dir}"/>
193
194    <checkstyle config="etc/checkstyle/sun_checks.xml"
195       failOnViolation="false">
196      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
197      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
198    </checkstyle>
199
200    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
201          out="${build.checkstyle.dir}/checkstyle-report.html"
202        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
203
164    </target>
165  
166  
# Line 210 | Line 170
170            description="Puts all distributable products in single hierarchy"/>
171  
172  
213
173    <target name="release"
174            depends="dist"
175            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 257 | 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.5.0/docs/api"
262 <            overview="${src.dir}/intro.html"
219 >    <!-- the packagenames="none" hack below prevents scanning the -->
220 >    <!-- sourcepath for packages -->
221  
222 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
223 <     >
224 <      <packageset dir="${src.dir}" defaultexcludes="yes">
225 <      <include name="java/util/concurrent"/>
226 <      <include name="java/util/concurrent/atomic"/>
227 <      <include name="java/util/concurrent/locks"/>
228 <      </packageset>
271 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
272 <      <include name="main/java/util/*.java"/>
273 <      <include name="main/java/util/*.html"/>
274 < <!--      <include name="jsr166x/*.java"/> -->
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  
# Line 300 | Line 254
254    </target>
255  
256  
303  <target name="compile-ant-filter"
304          depends="init">
305
306    <mkdir dir="${build.ant.dir}"/>
307
308    <javac srcdir="${ant.src.dir}"
309          destdir="${build.ant.dir}"
310           source="1.4"/>
311
312  </target>
313
314
315  <target name="filter-src"
316          depends="compile-ant-filter">
317
318    <mkdir dir="${build.filter.src.dir}"/>
319
320    <copy todir="${build.filter.src.dir}">
321      <fileset dir="${src.dir}">
322        <include name="**/*.html"/>
323      </fileset>
324    </copy>
325
326    <copy todir="${build.filter.src.dir}">
327      <fileset dir="${src.dir}">
328        <exclude name="**/*.html"/>
329        <!-- Files excluded from dist-docs -->
330        <exclude name="java/util/Random.*"/>
331        <exclude name="sun/misc/Unsafe.*"/>
332      </fileset>
333      <!--
334      <filterchain>
335      -->
336
337        <!--
338         # This filter gets rid of angle-bracketed type parameters
339         # so that javadoc can run on the result. The following
340         # heuristic seems to work:
341         #
342         # For all lines not starting with space(s)-asterisk-space(s),
343         #   replace <something> with a space, where there may be more
344         #   than one right angle bracket at the end, and "something"
345         #   must not contain parens or pipes. (This may need some
346         #   tweaking.)
347         -->
348
349        <!--
350        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
351                      classpath="${build.ant.dir}">
352          <param name="notmatching" value="^\s+\*\s.*$"/>
353          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
354          <param name="replacement" value=" "/>
355        </filterreader>
356        -->
357
358      <!--
359      </filterchain>
360      -->
361    </copy>
362
363  </target>
364
365
366  <target name="filter-doccheck"
367          depends="filter-src">
368
369    <mkdir dir="${build.dc-filter.dir}"/>
370
371    <copy todir="${build.dc-filter.dir}">
372      <fileset dir="${build.filter.src.dir}">
373        <include name="**/*.html"/>
374      </fileset>
375    </copy>
376
377    <property name="generic.declarations"
378             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 {}"
379    />
380
381    <copy todir="${build.dc-filter.dir}">
382      <fileset dir="${build.filter.src.dir}">
383        <exclude name="**/*.html"/>
384      </fileset>
385      <filterchain>
386        <!--
387         # These two filters try to make the source look like
388         # something that doccheck can process. The first removes
389         # -source 1.4 assertions and the second adds in a bunch
390         # of single letter public nested marker interfaces so that
391         # the generic type parameters are recognized.
392         -->
393
394        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
395                      classpath="${build.ant.dir}">
396          <param name="matching"    value="^\s*assert[\s ].*$"/>
397          <param name="pattern"     value="assert"/>
398          <param name="replacement" value="//assert"/>
399        </filterreader>
400
401        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
402                      classpath="${build.ant.dir}">
403          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
404          <param name="pattern"     value="$"/>
405          <param name="replacement" value=" ${generic.declarations}"/>
406        </filterreader>
407
408      </filterchain>
409    </copy>
410
411  </target>
412
413
257    <target name="compile-tests"
258            depends="jar">
259  
# Line 426 | 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 443 | 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 459 | 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 531 | Line 377
377        <fileset dir="${build.reports.dir}">
378          <include name="TEST-*.xml"/>
379        </fileset>
380 <      <report styledir="${stylesheet.dir}"
535 <                format="${junit.report.format}"
536 <                 todir="${build.reports.dir}"
380 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
381        />
382      </junitreport>
383  
# Line 583 | Line 427
427    </target>
428  
429  
586
587  <!-- Anthill targets -->
588
589  <target name="anthill-build">
590
591    <!-- Override this in user.properties -->
592    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
593
594    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
595      <arg value="-Xmx256000000"/>
596      <!-- classpath of new JVM -->
597      <arg value="-classpath"/> <arg path="${java.class.path}"/>
598      <!-- location of Ant home directory -->
599      <arg value="-Dant.home=${ant.home}"/>
600      <!-- the Ant main class -->
601      <arg value="org.apache.tools.ant.Main"/>
602      <!-- The build file -->
603      <arg value="-buildfile"/>  <arg value="build.xml"/>
604      <!-- the target to build on the new Ant instance -->
605      <arg value="-DJAVA_HOME=${tiger.home}"/>
606      <arg value="do-anthill-build"/>
607    </exec>
608  </target>
609
610  <target name="do-anthill-build"
611          depends="jar, test, docs, dist-docs"/>
612
613  <target name="anthill-publish">
614
615    <copy todir="${deployDir}/docs/private">
616      <fileset dir="${build.javadocs.dir}"/>
617    </copy>
618
619    <copy todir="${deployDir}/docs/public">
620      <fileset dir="${dist.javadocs.dir}"/>
621    </copy>
622
623    <copy tofile="${deployDir}/index.html"
624          file="${basedir}/etc/anthill-index.html"/>
625
626    <copy todir="${deployDir}/notes">
627      <fileset dir="${basedir}/etc/notes"/>
628    </copy>
629
630  </target>
631
632
633
430    <!-- Various demos and test programs -->
431  
432  
637  <target name="sample" depends="init, configure-compiler"
638          description="Standalone demo program">
639
640    <mkdir dir="${build.testcases.dir}"/>
641
642    <javac srcdir="${test.src.dir}"
643          destdir="${build.testcases.dir}"
644            debug="${build.debug}"
645       debuglevel="${build.debuglevel}"
646      deprecation="${build.deprecation}"
647           source="${build.sourcelevel}"
648             fork="true">
649
650      <include name="jsr166/test/Sample.java"/>
651
652    </javac>
653
654    <copy todir="${build.testcases.dir}">
655      <fileset dir="${test.src.dir}">
656        <include name="**/*.properties"/>
657      </fileset>
658    </copy>
659
660
661    <java classname="jsr166.test.Sample" fork="true">
662      <classpath refid="test.classpath"/>
663      <!-- <jvmarg value="-ea"/> -->
664      <!-- <jvmarg value="-server"/> -->
665      <!-- <arg value="1000"/> -->
666    </java>
667  </target>
668
669
433    <target name="loops" depends="init, configure-compiler"
434            description="Benchmark from Doug Lea's AQS paper">
435  
# Line 682 | 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 692 | Line 456
456    </target>
457  
458  
459 <  <target name="compile-j1" depends="init, configure-compiler, compile">
459 >  <!-- jsr166x -->
460 >
461  
462 <    <mkdir dir="${build.j1.dir}"/>
462 >  <target name="jsr166xcompile"
463 >          depends="init, configure-compiler"
464 >          description="Compiles jsr166x sources">
465  
466 <    <javac srcdir="${j1.src.dir}"
467 <          destdir="${build.j1.dir}"
466 >    <mkdir dir="${build.jsr166x.dir}"/>
467 >
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"/>
707      <exclude name="**/dijkstra/**"/>
708
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  
717  <target name="sw" depends="compile-j1"
718          description="Runs the SwingWorker demo">
485  
486 <    <!--
487 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
488 <      <classpath refid="j1.classpath"/>
723 <    </java>
724 <    -->
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  
734  <target name="j1" depends="compile-j1"
735          description="Runs a standalone JavaOne program">
498  
737    <java classname="${j1.test}" fork="true">
738      <classpath refid="j1.classpath"/>
739      <jvmarg value="-client"/>
499  
500 <      <!-- TestPseudoRandom args -->
501 <      <arg value="2"/>
743 <      <arg value="25"/>
744 <      <arg value="100000"/>
500 >  <target name="jsr166xdocs"
501 >          description="Builds javadocs with custom tags to build folder">
502  
503 <      <!-- WebCrawler args -->
504 <      <!--
748 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
749 <      <arg value="http://www.priorartisans.com"/>
750 <      <arg value="25"/>
751 <      -->
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 <
761 <    <junit printsummary="true"
762 <             showoutput="true"
763 <          errorProperty="junit.failed"
764 <        failureProperty="junit.failed"
765 <                    dir="${build.j1.dir}"
766 <                   fork="true">
767 <
768 <      <!-- <jvmarg value="-server"/> -->
769 <      <classpath refid="j1.classpath"/>
770 <      <formatter type="xml"/>
771 <
772 <      <batchtest todir="${build.j1.dir}">
773 <        <fileset dir="${j1.src.dir}">
774 <          <include name="**/*Test.java"/>
775 <        </fileset>
776 <      </batchtest>
515 >  <target name="jsr166xdist"
516 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
517 >          description="Puts all distributable products in single hierarchy"/>
518  
778    </junit>
519  
780    <available property="junit.report.format"
781                  value="frames"
782              classname="org.apache.xalan.lib.Redirect"/>
783    <property name="junit.report.format" value="noframes"/>
520  
521 <    <junitreport todir="${build.j1.dir}">
522 <      <fileset dir="${build.j1.dir}">
787 <        <include name="TEST-*.xml"/>
788 <      </fileset>
789 <      <report styledir="${stylesheet.dir}"
790 <                format="${junit.report.format}"
791 <                 todir="${build.j1.dir}"
792 <      />
793 <    </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 <
803 <  <target name="configure-cpp">
804 <
805 <    <!-- Define tasks and types -->
531 >  <target name="jsr166xdist-clean"
532 >          description="Removes all build and distribution products">
533  
534 <    <path id="cpptasks.path">
808 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
809 <    </path>
810 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
811 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
534 >  </target>
535  
813    <!-- Set platform property for JNI includes -->
536  
815    <condition property="platform" value="linux">
816      <os name="Linux"/>
817    </condition>
818    <condition property="platform" value="win32">
819      <os family="windows"/>
820    </condition>
821    <condition property="platform" value="solaris">
822      <os name="SunOS"/>
823    </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++"
834 <               objdir="${build.dir}"
835 <              outfile="${build.dir}/CppDemo">
836 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
837 <      <libset libs="stdc++"/>
838 <    </cc>
552 >  <target name="jsr166xdist-jar"
553 >          depends="jsr166xclean, jsr166xjar">
554  
555 <    <exec executable="${build.dir}/CppDemo">
841 <      <arg line="count in word frequency of word in command line count"/>
842 <    </exec>
555 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
556  
557    </target>
558  
559 +  <!-- jsr166y -->
560  
847  <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"/>
862 <    </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"/>
867 <    </javah>
868 <
869 <    <cc multithreaded="true"
870 <                 name="g++"
871 <               objdir="${build.dir}"
872 <              outfile="${build.dir}/JniDemo"
873 <              outtype="shared">
874 <
875 <      <compiler>
876 <        <defineset>
877 <          <define name="__int64" value="long long"/>
878 <        </defineset>
879 <        <includepath location="${java.home}/../include"/>
880 <        <includepath location="${java.home}/../include/${platform}"/>
881 <        <compilerarg value="-mno-cygwin"/>
882 <      </compiler>
883 <
884 <      <linker>
885 <        <linkerarg value="--add-stdcall-alias"/>
886 <      </linker>
887 <
888 <      <includepath location="${build.testcases.dir}"/>
889 <
890 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
891 <
892 <      <libset libs="stdc++"/>
893 <
894 <    </cc>
895 <
896 <    <!-- Necessary if windows, harmless if not -->
897 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
898 <
899 <    <java classname="JniDemo" fork="true">
900 <      <!-- Watch out: path separator hardwired to semicolon here! -->
901 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
902 <      <classpath refid="test.classpath"/>
903 <      <arg line="count in word frequency of word in command line count"/>
904 <    </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 +  </target>
600  
914  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
915  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
916  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
917  <property name="pretiger.sourcelevel" value="1.4"/>
601  
919  <target name="defang"
920       depends="init"
921   description="Generates pre-Tiger compatible source">
602  
603 <    <delete dir="${pretiger.src.dir}"/>
604 <    <mkdir dir="${pretiger.src.dir}"/>
603 >  <target name="jsr166ydocs"
604 >          description="Builds javadocs with custom tags to build folder">
605  
606 <    <exec executable="perl">
607 <      <arg file="etc/defang.pl"/>
608 <      <!-- <arg value="-v"/> -->
609 <      <arg value="-s"/> <arg file="${src.dir}"/>
610 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
611 <    </exec>
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  
935  <target name="compile-pretiger"
936          depends="init, configure-compiler, defang"
937          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  
941    <javac srcdir="${pretiger.src.dir}"
942          destdir="${build.pretiger.dir}"
943            debug="${build.debug}"
944       debuglevel="${build.debuglevel}"
945      deprecation="${build.deprecation}"
946           source="${pretiger.sourcelevel}"
947             fork="true">
622  
949      <compilerarg line="${build.args}"/>
950      <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  
956  <target name="pretiger" depends="compile-pretiger">
632  
958    <mkdir dir="${build.lib.dir}"/>
633  
634 <    <jar destfile="${pretiger.jar}">
635 <      <fileset dir="${build.pretiger.dir}">
962 <      </fileset>
963 <    </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 983 | 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 990 | 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}"/>
708 >    <delete dir="${build.extra166yjavadocs.dir}"/>
709 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
710  
711 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
712 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
713 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
714 <
715 <    >
1018 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1019 <      <include name="jsr166x"/>
1020 <      </packageset>
1021 <
1022 <
1023 <    </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 <
1050 <
1051 <  <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">
1062 <      <include name="jsr166x"/>
1063 <      </packageset>
1064 <
1065 <    </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