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.65 by jsr166, Fri Apr 9 20:10:29 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"/>
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"/>
74  
75    <!-- Bootclasspath argument -->
# Line 74 | Line 86
86      <pathelement location="${build.loops.dir}"/>
87    </path>
88  
77  <!-- J1 classpath -->
78  <path id="j1.classpath">
79    <pathelement location="${build.j1.dir}"/>
80    <pathelement location="${junit.jar}"/>
81  </path>
82
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 98 | 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 132 | 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"
137 <            overview="${src.dir}/intro.html"
138 <              source="${build.sourcelevel}">
139 <
140 <      <tag name="revised" description="Last revised:"/>
141 <      <tag name="spec"    description="Specified by:"/>
142 <
143 <      <packageset dir="${src.dir}"/>
144 <
145 <    </javadoc>
146 <
147 <  </target>
148 <
149 <
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"
159 <         docletpath="${lib.dir}/doccheck.jar"
160 <            destdir="${build.doccheck.dir}">
161 <      <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  
164    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
165
166  </target>
167
168
169
170  <target name="checkstyle"
171          depends="filter-src"
172          description="Reports on style errors in Java source (verbose, mostly chaff)">
173
174    <taskdef resource="checkstyletask.properties"
175            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
176
177    <mkdir dir="${build.checkstyle.dir}"/>
178
179    <checkstyle config="etc/checkstyle/sun_checks.xml"
180       failOnViolation="false">
181      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
182      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
183    </checkstyle>
184
185    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
186          out="${build.checkstyle.dir}/checkstyle-report.html"
187        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
188
164    </target>
165  
166  
# Line 195 | Line 170
170            description="Puts all distributable products in single hierarchy"/>
171  
172  
198
173    <target name="release"
174            depends="dist"
175            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 242 | 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"
247 <            overview="${src.dir}/intro.html"
248 <              source="${build.sourcelevel}">
249 <
250 <      <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 276 | Line 254
254    </target>
255  
256  
279  <target name="compile-ant-filter"
280          depends="init">
281
282    <mkdir dir="${build.ant.dir}"/>
283
284    <javac srcdir="${ant.src.dir}"
285          destdir="${build.ant.dir}"
286           source="1.4"/>
287
288  </target>
289
290
291  <target name="filter-src"
292          depends="compile-ant-filter">
293
294    <mkdir dir="${build.filter.src.dir}"/>
295
296    <copy todir="${build.filter.src.dir}">
297      <fileset dir="${src.dir}">
298        <include name="**/*.html"/>
299      </fileset>
300    </copy>
301
302    <copy todir="${build.filter.src.dir}">
303      <fileset dir="${src.dir}">
304        <exclude name="**/*.html"/>
305        <!-- Files excluded from dist-docs -->
306        <exclude name="java/util/Random.*"/>
307        <exclude name="sun/misc/Unsafe.*"/>
308      </fileset>
309      <!--
310      <filterchain>
311      -->
312
313        <!--
314         # This filter gets rid of angle-bracketed type parameters
315         # so that javadoc can run on the result. The following
316         # heuristic seems to work:
317         #
318         # For all lines not starting with space(s)-asterisk-space(s),
319         #   replace <something> with a space, where there may be more
320         #   than one right angle bracket at the end, and "something"
321         #   must not contain parens or pipes. (This may need some
322         #   tweaking.)
323         -->
324
325        <!--
326        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
327                      classpath="${build.ant.dir}">
328          <param name="notmatching" value="^\s+\*\s.*$"/>
329          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
330          <param name="replacement" value=" "/>
331        </filterreader>
332        -->
333
334      <!--
335      </filterchain>
336      -->
337    </copy>
338
339  </target>
340
341
342  <target name="filter-doccheck"
343          depends="filter-src">
344
345    <mkdir dir="${build.dc-filter.dir}"/>
346
347    <copy todir="${build.dc-filter.dir}">
348      <fileset dir="${build.filter.src.dir}">
349        <include name="**/*.html"/>
350      </fileset>
351    </copy>
352
353    <property name="generic.declarations"
354             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 {}"
355    />
356
357    <copy todir="${build.dc-filter.dir}">
358      <fileset dir="${build.filter.src.dir}">
359        <exclude name="**/*.html"/>
360      </fileset>
361      <filterchain>
362        <!--
363         # These two filters try to make the source look like
364         # something that doccheck can process. The first removes
365         # -source 1.4 assertions and the second adds in a bunch
366         # of single letter public nested marker interfaces so that
367         # the generic type parameters are recognized.
368         -->
369
370        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
371                      classpath="${build.ant.dir}">
372          <param name="matching"    value="^\s*assert[\s ].*$"/>
373          <param name="pattern"     value="assert"/>
374          <param name="replacement" value="//assert"/>
375        </filterreader>
376
377        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
378                      classpath="${build.ant.dir}">
379          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
380          <param name="pattern"     value="$"/>
381          <param name="replacement" value=" ${generic.declarations}"/>
382        </filterreader>
383
384      </filterchain>
385    </copy>
386
387  </target>
388
389
257    <target name="compile-tests"
258            depends="jar">
259  
# Line 402 | 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 419 | 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 435 | 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 507 | Line 377
377        <fileset dir="${build.reports.dir}">
378          <include name="TEST-*.xml"/>
379        </fileset>
380 <      <report styledir="${stylesheet.dir}"
511 <                format="${junit.report.format}"
512 <                 todir="${build.reports.dir}"
380 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
381        />
382      </junitreport>
383  
# Line 559 | Line 427
427    </target>
428  
429  
562
563  <!-- Anthill targets -->
564
565  <target name="anthill-build">
566
567    <!-- Override this in user.properties -->
568    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
569
570    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
571      <arg value="-Xmx256000000"/>
572      <!-- classpath of new JVM -->
573      <arg value="-classpath"/> <arg path="${java.class.path}"/>
574      <!-- location of Ant home directory -->
575      <arg value="-Dant.home=${ant.home}"/>
576      <!-- the Ant main class -->
577      <arg value="org.apache.tools.ant.Main"/>
578      <!-- The build file -->
579      <arg value="-buildfile"/>  <arg value="build.xml"/>
580      <!-- the target to build on the new Ant instance -->
581      <arg value="-DJAVA_HOME=${tiger.home}"/>
582      <arg value="do-anthill-build"/>
583    </exec>
584  </target>
585
586  <target name="do-anthill-build"
587          depends="jar, test, docs, dist-docs"/>
588
589  <target name="anthill-publish">
590
591    <copy todir="${deployDir}/docs/private">
592      <fileset dir="${build.javadocs.dir}"/>
593    </copy>
594
595    <copy todir="${deployDir}/docs/public">
596      <fileset dir="${dist.javadocs.dir}"/>
597    </copy>
598
599    <copy tofile="${deployDir}/index.html"
600          file="${basedir}/etc/anthill-index.html"/>
601
602    <copy todir="${deployDir}/notes">
603      <fileset dir="${basedir}/etc/notes"/>
604    </copy>
605
606  </target>
607
608
609
430    <!-- Various demos and test programs -->
431  
432  
613  <target name="sample" depends="init, configure-compiler"
614          description="Standalone demo program">
615
616    <mkdir dir="${build.testcases.dir}"/>
617
618    <javac srcdir="${test.src.dir}"
619          destdir="${build.testcases.dir}"
620            debug="${build.debug}"
621       debuglevel="${build.debuglevel}"
622      deprecation="${build.deprecation}"
623           source="${build.sourcelevel}"
624             fork="true">
625
626      <include name="jsr166/test/Sample.java"/>
627
628    </javac>
629
630    <copy todir="${build.testcases.dir}">
631      <fileset dir="${test.src.dir}">
632        <include name="**/*.properties"/>
633      </fileset>
634    </copy>
635
636
637    <java classname="jsr166.test.Sample" fork="true">
638      <classpath refid="test.classpath"/>
639      <!-- <jvmarg value="-ea"/> -->
640      <!-- <jvmarg value="-server"/> -->
641      <!-- <arg value="1000"/> -->
642    </java>
643  </target>
644
645
433    <target name="loops" depends="init, configure-compiler"
434            description="Benchmark from Doug Lea's AQS paper">
435  
# Line 658 | 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 668 | Line 456
456    </target>
457  
458  
459 <  <target name="compile-j1" depends="init, configure-compiler">
459 >  <!-- jsr166x -->
460  
673    <mkdir dir="${build.j1.dir}"/>
461  
462 <    <javac srcdir="${j1.src.dir}"
463 <          destdir="${build.j1.dir}"
462 >  <target name="jsr166xcompile"
463 >          depends="init, configure-compiler"
464 >          description="Compiles jsr166x sources">
465 >
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}"
474               fork="true">
475  
476 +      <include name="**/*.java"/>
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  
691  <target name="sw" depends="compile-j1"
692          description="Runs the SwingWorker demo">
485  
486 <    <!--
487 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
488 <      <classpath refid="j1.classpath"/>
697 <    </java>
698 <    -->
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  
708  <target name="j1" depends="compile-j1"
709          description="Runs a standalone JavaOne program">
498  
711    <java classname="jsr166.misc.SortedEnumSet" fork="true">
712      <classpath refid="j1.classpath"/>
713    </java>
499  
500 <  </target>
500 >  <target name="jsr166xdocs"
501 >          description="Builds javadocs with custom tags to build folder">
502  
503 +    <delete dir="${build.jsr166xjavadocs.dir}"/>
504 +    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
505  
506 <  <target name="test-j1" depends="compile-j1"
507 <          description="Runs testcases from the JavaOne source directories">
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 <    <junit printsummary="true"
722 <             showoutput="true"
723 <          errorProperty="junit.failed"
724 <        failureProperty="junit.failed"
725 <                    dir="${build.j1.dir}"
726 <                   fork="true">
512 >  </target>
513  
728      <!-- <jvmarg value="-server"/> -->
729      <classpath refid="j1.classpath"/>
730      <formatter type="xml"/>
514  
515 <      <batchtest todir="${build.j1.dir}">
516 <        <fileset dir="${j1.src.dir}">
517 <          <include name="**/*Test.java"/>
735 <        </fileset>
736 <      </batchtest>
515 >  <target name="jsr166xdist"
516 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
517 >          description="Puts all distributable products in single hierarchy"/>
518  
738    </junit>
519  
740    <available property="junit.report.format"
741                  value="frames"
742              classname="org.apache.xalan.lib.Redirect"/>
743    <property name="junit.report.format" value="noframes"/>
520  
521 <    <junitreport todir="${build.j1.dir}">
522 <      <fileset dir="${build.j1.dir}">
747 <        <include name="TEST-*.xml"/>
748 <      </fileset>
749 <      <report styledir="${stylesheet.dir}"
750 <                format="${junit.report.format}"
751 <                 todir="${build.j1.dir}"
752 <      />
753 <    </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 <
763 <  <target name="configure-cpp">
764 <
765 <    <!-- Define tasks and types -->
531 >  <target name="jsr166xdist-clean"
532 >          description="Removes all build and distribution products">
533  
534 <    <path id="cpptasks.path">
768 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
769 <    </path>
770 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
771 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
534 >  </target>
535  
773    <!-- Set platform property for JNI includes -->
536  
775    <condition property="platform" value="linux">
776      <os name="Linux"/>
777    </condition>
778    <condition property="platform" value="win32">
779      <os family="windows"/>
780    </condition>
781    <condition property="platform" value="solaris">
782      <os name="SunOS"/>
783    </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++"
794 <               objdir="${build.dir}"
795 <              outfile="${build.dir}/CppDemo">
796 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
797 <      <libset libs="stdc++"/>
798 <    </cc>
552 >  <target name="jsr166xdist-jar"
553 >          depends="jsr166xclean, jsr166xjar">
554  
555 <    <exec executable="${build.dir}/CppDemo">
801 <      <arg line="count in word frequency of word in command line count"/>
802 <    </exec>
555 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
556  
557    </target>
558  
559 +  <!-- jsr166y -->
560  
807  <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"/>
578 >      <compilerarg value="-XDignore.symbol.file=true"/>
579 >      <compilerarg value="${bootclasspath.args}"/>
580 >
581 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
582 >
583      </javac>
584  
585 <    <javah destdir="${build.testcases.dir}"
586 <      classpathref="test.classpath">
587 <      <class name="JniDemo"/>
588 <    </javah>
589 <
590 <    <cc multithreaded="true"
591 <                 name="g++"
592 <               objdir="${build.dir}"
593 <              outfile="${build.dir}/JniDemo"
594 <              outtype="shared">
595 <
596 <      <compiler>
597 <        <defineset>
837 <          <define name="__int64" value="long long"/>
838 <        </defineset>
839 <        <includepath location="${java.home}/../include"/>
840 <        <includepath location="${java.home}/../include/${platform}"/>
841 <        <compilerarg value="-mno-cygwin"/>
842 <      </compiler>
843 <
844 <      <linker>
845 <        <linkerarg value="--add-stdcall-alias"/>
846 <      </linker>
847 <
848 <      <includepath location="${build.testcases.dir}"/>
849 <
850 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
851 <
852 <      <libset libs="stdc++"/>
853 <
854 <    </cc>
855 <
856 <    <!-- Necessary if windows, harmless if not -->
857 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
858 <
859 <    <java classname="JniDemo" fork="true">
860 <      <!-- Watch out: path separator hardwired to semicolon here! -->
861 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
862 <      <classpath refid="test.classpath"/>
863 <      <arg line="count in word frequency of word in command line count"/>
864 <    </java>
585 >  </target>
586 >
587 >
588 >
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  
601  
602  
603 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
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  
874  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
875  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
876  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
877  <property name="pretiger.sourcelevel" value="1.4"/>
617  
618 <  <target name="defang"
619 <       depends="init"
620 <   description="Generates pre-Tiger compatible source">
618 >  <target name="jsr166ydist"
619 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
620 >          description="Puts all distributable products in single hierarchy"/>
621  
883    <delete dir="${pretiger.src.dir}"/>
884    <mkdir dir="${pretiger.src.dir}"/>
622  
623 <    <exec executable="perl">
624 <      <arg file="etc/defang.pl"/>
625 <      <!-- <arg value="-v"/> -->
626 <      <arg value="-s"/> <arg file="${src.dir}"/>
627 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
628 <    </exec>
623 >
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  
895  <target name="compile-pretiger"
896          depends="init, configure-compiler, defang"
897          description="Compiles pre-Tiger sources to build folder">
632  
899    <mkdir dir="${build.pretiger.dir}"/>
633  
634 <    <javac srcdir="${pretiger.src.dir}"
635 <          destdir="${build.pretiger.dir}"
634 >  <target name="jsr166ydist-clean"
635 >          description="Removes all build and distribution products">
636 >
637 >  </target>
638 >
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 >    <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 >  </target>
652 >
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="${pretiger.sourcelevel}"
675 >           source="${build.sourcelevel}"
676               fork="true">
677  
678 +      <include name="**/*.java"/>
679        <compilerarg line="${build.args}"/>
680 <      <exclude name="**/Thread.java"/>
680 >      <compilerarg value="-XDignore.symbol.file=true"/>
681 >      <compilerarg value="${bootclasspath.args}"/>
682 >
683 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
684  
685      </javac>
686  
687    </target>
688  
916  <target name="pretiger" depends="compile-pretiger">
689  
918    <mkdir dir="${build.lib.dir}"/>
690  
691 <    <jar destfile="${pretiger.jar}">
692 <      <fileset dir="${build.pretiger.dir}">
693 <      </fileset>
691 >  <target name="extra166yjar"
692 >          depends="extra166ycompile"
693 >          description="Builds library jar from compiled sources">
694 >
695 >    <mkdir dir="${build.extra166ylib.dir}"/>
696 >
697 >    <jar destfile="${extra166yproduct.jar}" index="true">
698 >      <fileset dir="${build.extra166y.dir}"/>
699      </jar>
700  
701    </target>
702  
703 +
704 +
705 +  <target name="extra166ydocs"
706 +          description="Builds javadocs with custom tags to build folder">
707 +
708 +    <delete dir="${build.extra166yjavadocs.dir}"/>
709 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
710 +
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="extra166ydist"
721 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
722 +          description="Puts all distributable products in single hierarchy"/>
723 +
724 +
725 +
726 +  <target name="extra166yclean"
727 +          description="Removes all build products">
728 +
729 +    <delete dir="${build.extra166y.dir}"/>
730 +    <delete dir="${build.extra166ylib.dir}"/>
731 +
732 +  </target>
733 +
734 +
735 +
736 +  <target name="extra166ydist-clean"
737 +          description="Removes all build and distribution products">
738 +
739 +  </target>
740 +
741 +  <target name="extra166ydist-docs"
742 +          description="Builds javadocs without custom tags to dist folder">
743 +
744 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
745 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
746 +
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="extra166ydist-jar"
756 +          depends="extra166yclean, extra166yjar">
757 +
758 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
759 +
760 +  </target>
761 +
762   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines