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.89 by jsr166, Fri Jun 10 18:07:30 2011 UTC vs.
Revision 1.102 by jsr166, Sat Jan 19 20:53:34 2013 UTC

# Line 8 | Line 8
8  
9    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.
11 +
12 +  The repository contains all dependencies except for ant and the JDK
13 +  itself.  Because the JDK version matters and because different
14 +  targets require different JDKs, we assume that users have created a
15 +  hierarchy containing:
16 +  $HOME/jdk/jdk6
17 +  $HOME/jdk/jdk7
18 +  $HOME/jdk/jdk8
19 +  where each of the above is a JDK or a symlink to same, and
20 +  $HOME/jdk/src/jdk6
21 +  $HOME/jdk/src/jdk7
22 +  $HOME/jdk/src/jdk8
23 +  where each of the above is a complete JDK source tree
24 +  (e.g. mercurial forest) or a symlink to same.
25   ------------------------------------------------------------------------------
26    </description>
27  
# Line 34 | Line 48
48    <property name="build.lib.dir"               location="${build.dir}/lib"/>
49    <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50    <property name="build.reports.dir"           location="${build.dir}/reports"/>
51 +
52 +  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53 +  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54 +  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55 +  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56 +  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57 +
58    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
# Line 42 | Line 63
63    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65  
66 +  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67 +  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68 +  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69 +
70    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72    <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
73  
74 +  <!-- JDK binary locations -->
75 +  <property name="jdks.home"  location="${user.home}/jdk"/>
76 +
77 +  <macrodef name="defjdklocations">
78 +    <attribute name="v"/>
79 +    <sequential>
80 +    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81 +    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82 +    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83 +    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84 +    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85 +    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86 +    <property name="bootclasspath@{v}"
87 +     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88 +    </sequential>
89 +  </macrodef>
90 +
91 +  <defjdklocations v="6"/>
92 +  <defjdklocations v="7"/>
93 +  <defjdklocations v="8"/>
94 +
95 +  <macrodef name="run-tck-tests">
96 +    <attribute name="jvm"/>
97 +    <attribute name="tck.classes"/>
98 +    <attribute name="product.jar" default="${product.jar}"/>
99 +    <attribute name="jvmflags" default=""/>
100 +    <sequential>
101 +    <java classname="JSR166TestCase"
102 +          jvm="@{jvm}" fork="true">
103 +        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104 +        <jvmarg line="@{jvmflags}"/>
105 +        <classpath>
106 +          <pathelement location="${junit.jar}"/>
107 +          <pathelement location="@{tck.classes}"/>
108 +        </classpath>
109 +    </java>
110 +    </sequential>
111 +  </macrodef>
112 +
113    <!-- Source locations -->
114    <property name="src.dir"              location="${basedir}/src/main"/>
115    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 55 | Line 119
119    <property name="lib.dir"              location="${basedir}/lib"/>
120    <property name="dist.dir"             location="${basedir}/dist"/>
121    <property name="topsrc.dir"           location="${basedir}/src"/>
122 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
123 <  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
124 <  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
122 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128 +
129    <!-- Distribution locations -->
130    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131 +  <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134 +  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
136  
137    <!-- Jar locations -->
138    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139 +  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
145  
146    <!-- Bootclasspath argument -->
147    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
148  
149 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153 +
154 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155 +  <!-- The below does not yet exist as of 2012-11 -->
156 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158 +
159    <!-- Test classpath -->
160    <path id="test.classpath">
161      <pathelement location="${build.testcases.dir}"/>
# Line 86 | Line 167
167      <pathelement location="${build.loops.dir}"/>
168    </path>
169  
170 +  <!-- Support @jls tag, used in jdk8+ javadoc -->
171 +  <!-- TODO: How do we get &trade to work? -->
172 +  <!-- TODO: Why isn't @jls a "standard" tag? -->
173 +  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174 +  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
175 +  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176  
177    <!-- Main targets -->
178  
179    <target name="dists"
180 <          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
180 >          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
181            description="Builds all public jars and docs"/>
182  
183    <target name="compile"
184 <          depends="init, configure-compiler"
185 <          description="Compiles main sources to build folder">
184 >          depends="configure-compiler"
185 >          description="Compiles src/main sources to build dir">
186  
187      <mkdir dir="${build.classes.dir}"/>
188  
189      <javac srcdir="${src.dir}"
190 <          destdir="${build.classes.dir}"
191 <            debug="${build.debug}"
192 <       debuglevel="${build.debuglevel}"
193 <      deprecation="${build.deprecation}"
194 <           source="${build.sourcelevel}"
195 <             fork="true">
190 >           destdir="${build.classes.dir}"
191 >           debug="${build.debug}"
192 >           debuglevel="${build.debuglevel}"
193 >           deprecation="${build.deprecation}"
194 >           classpath=""
195 >           includeAntRuntime="false"
196 >           includeJavaRuntime="false"
197 >           executable="${javac8}"
198 >           fork="true">
199  
200        <include name="**/*.java"/>
201 +      <compilerarg line="${build.args}"/>
202        <compilerarg value="-XDignore.symbol.file=true"/>
203 +      <compilerarg value="-Xlint:all"/>
204  
205   <!--
206        <exclude name="java/lang/**"/>
# Line 143 | Line 235
235  
236  
237    <target name="docs"
238 <          description="Builds javadocs with custom tags to build folder">
238 >          description="Builds javadocs for src/main to dist dir">
239  
240 <    <delete dir="${build.javadocs.dir}"/>
241 <    <mkdir dir="${build.javadocs.dir}"/>
240 >    <delete dir="${dist.javadocs.dir}"/>
241 >    <mkdir dir="${dist.javadocs.dir}"/>
242  
243      <!-- the packagenames="none" hack below prevents scanning the -->
244      <!-- sourcepath for packages -->
245  
246 <    <javadoc destdir="${build.javadocs.dir}"
246 >    <javadoc destdir="${dist.javadocs.dir}"
247               packagenames="none"
248 <             link="http://download.oracle.com/javase/7/docs/api/"
248 >             link="${jdkapi8docs.url}"
249               overview="${src.dir}/intro.html"
250 <             sourcepath="${src.dir}:${jdksrc.dir}"
251 <             additionalparam="-XDignore.symbol.file=true" >
250 >             sourcepath="${src.dir}:${jdk8src.dir}"
251 >             classpath=""
252 >             executable="${javadoc8}">
253 >      <arg value="-XDignore.symbol.file=true"/>
254 >      <arg value="-tag"/>
255 >      <arg value="${javadoc.jls.option}"/>
256        <fileset dir="${src.dir}" defaultexcludes="yes">
257 <      <include name="**/*.java"/>
257 >        <include name="**/*.java"/>
258        </fileset>
259      </javadoc>
260  
# Line 167 | Line 263
263  
264  
265    <target name="dist"
266 <          depends="init, dist-clean, dist-jar, dist-docs"
266 >          depends="init, dist-clean, dist-jar, docs"
267            description="Puts all distributable products in single hierarchy"/>
268  
269  
# Line 211 | Line 307
307  
308  
309  
214  <target name="dist-docs"
215          description="Builds javadocs without custom tags to dist folder">
216
217    <delete dir="${dist.javadocs.dir}"/>
218    <mkdir dir="${dist.javadocs.dir}"/>
219
220    <!-- the packagenames="none" hack below prevents scanning the -->
221    <!-- sourcepath for packages -->
222
223    <javadoc destdir="${dist.javadocs.dir}"
224             packagenames="none"
225             link="http://download.oracle.com/javase/7/docs/api/"
226             overview="${src.dir}/intro.html"
227             sourcepath="${src.dir}:${jdksrc.dir}"
228             additionalparam="-XDignore.symbol.file=true" >
229      <fileset dir="${src.dir}" defaultexcludes="yes">
230      <include name="**/*.java"/>
231      </fileset>
232    </javadoc>
233
234  </target>
235
236
237
310    <!-- Internal targets -->
311  
312  
# Line 458 | Line 530
530    </target>
531  
532  
533 +  <!-- jsr166 4jdk7 -->
534 +
535 +
536 +  <target name="4jdk7compile"
537 +          depends="configure-compiler"
538 +          description="Compiles src/jdk7 sources, targeting jdk7">
539 +
540 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
541 +
542 +    <javac srcdir="${4jdk7src.dir}"
543 +           destdir="${build.4jdk7.classes.dir}"
544 +           debug="${build.debug}"
545 +           debuglevel="${build.debuglevel}"
546 +           deprecation="${build.deprecation}"
547 +           source="1.6"
548 +           classpath=""
549 +           bootclasspath="${bootclasspath6}"
550 +           includeAntRuntime="false"
551 +           includeJavaRuntime="false"
552 +           executable="${javac7}"
553 +           fork="true">
554 +
555 +      <include name="**/*.java"/>
556 +      <compilerarg line="${build.args}"/>
557 +      <compilerarg value="-XDignore.symbol.file=true"/>
558 +      <compilerarg value="-Xlint:all"/>
559 +
560 +    </javac>
561 +
562 +    <mkdir dir="${build.4jdk7.lib.dir}"/>
563 +
564 +    <jar destfile="${4jdk7product.jar}" index="true">
565 +      <fileset dir="${build.4jdk7.classes.dir}"/>
566 +    </jar>
567 +
568 +    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
569 +
570 +    <javac srcdir="${tck.src.dir}"
571 +           destdir="${build.4jdk7.tck.classes.dir}"
572 +           debug="${build.debug}"
573 +           debuglevel="${build.debuglevel}"
574 +           deprecation="${build.deprecation}"
575 +           source="1.6"
576 +           classpath="${junit.jar}"
577 +           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
578 +           includeAntRuntime="false"
579 +           includeJavaRuntime="false"
580 +           executable="${javac7}"
581 +           fork="true">
582 +
583 +      <include name="**/*.java"/>
584 +      <compilerarg line="${build.args}"/>
585 +      <compilerarg value="-XDignore.symbol.file=true"/>
586 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
587 +
588 +    </javac>
589 +
590 +  </target>
591 +
592 +
593 +  <target name="4jdk7-test-tck"
594 +          depends="4jdk7compile"
595 +          description="Runs tck tests for jsr166-4jdk7 directly">
596 +    <run-tck-tests
597 +      jvm="${java7}"
598 +      tck.classes="${build.4jdk7.tck.classes.dir}"
599 +      product.jar="${4jdk7product.jar}"/>
600 +  </target>
601 +
602 +
603 +  <target name="4jdk7-test-tck-junit"
604 +          depends="4jdk7compile"
605 +          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
606 +
607 +    <junit printsummary="true"
608 +           showoutput="true"
609 +           errorProperty="junit.failed"
610 +           failureProperty="junit.failed"
611 +           includeantruntime="true"
612 +           jvm="${java7}"
613 +           fork="true">
614 +
615 +      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
616 +      <jvmarg value="-server"/>
617 +
618 +      <classpath>
619 +        <pathelement location="${junit.jar}"/>
620 +        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
621 +      </classpath>
622 +
623 +      <formatter type="brief"/>
624 +
625 +      <test name="JSR166TestCase" haltonfailure="no">
626 +      </test>
627 +
628 +    </junit>
629 +  </target>
630 +
631 +
632 +  <target name="4jdk7docs"
633 +          description="Builds javadocs for src/jdk7 to dist dir">
634 +
635 +    <delete dir="${dist.4jdk7.docs.dir}"/>
636 +    <mkdir dir="${dist.4jdk7.docs.dir}"/>
637 +
638 +    <javadoc destdir="${dist.4jdk7.docs.dir}"
639 +             packagenames="none"
640 +             link="${jdkapi7docs.url}"
641 +             overview="${4jdk7src.dir}/intro.html"
642 +             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
643 +             classpath=""
644 +             executable="${javadoc7}">
645 +      <arg value="-XDignore.symbol.file=true"/>
646 +      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
647 +        <include name="**/*.java"/>
648 +      </fileset>
649 +    </javadoc>
650 +
651 +  </target>
652 +
653 +
654 +  <target name="4jdk7dist"
655 +          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
656 +          description="Puts all distributable products in single hierarchy"/>
657 +
658 +
659 +
660 +  <target name="4jdk7clean"
661 +          description="Removes all build products">
662 +
663 +    <delete dir="${build.4jdk7.dir}"/>
664 +
665 +  </target>
666 +
667 +
668 +
669 +  <target name="4jdk7dist-clean"
670 +          description="Removes all build and distribution products">
671 +
672 +  </target>
673 +
674 +  <target name="4jdk7dist-jar"
675 +          depends="4jdk7clean, 4jdk7compile">
676 +
677 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
678 +
679 +  </target>
680 +
681    <!-- jsr166x -->
682  
683  
# Line 500 | Line 720
720  
721  
722    <target name="jsr166xdocs"
723 <          description="Builds javadocs with custom tags to build folder">
723 >          description="Builds javadocs to dist dir">
724  
725      <delete dir="${build.jsr166xjavadocs.dir}"/>
726      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
727  
728      <javadoc destdir="${build.jsr166xjavadocs.dir}"
729               packagenames="jsr166x"
730 <             link="http://download.oracle.com/javase/7/docs/api/"
730 >             link="${jdkapidocs.url}"
731               source="${build.sourcelevel}"
732               sourcepath="${topsrc.dir}:${jdksrc.dir}"
733               additionalparam="-XDignore.symbol.file=true" />
# Line 539 | Line 759
759  
760  
761    <target name="jsr166xdist-docs"
762 <          description="Builds javadocs without custom tags to dist folder">
762 >          description="Builds javadocs to dist dir">
763  
764      <delete dir="${dist.jsr166xjavadocs.dir}"/>
765      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
766  
767      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
768               packagenames="jsr166x"
769 <             link="http://download.oracle.com/javase/7/docs/api/"
769 >             link="${jdkapidocs.url}"
770               source="${build.sourcelevel}"
771               sourcepath="${topsrc.dir}:${jdksrc.dir}"
772               additionalparam="-XDignore.symbol.file=true" />
# Line 605 | Line 825
825  
826  
827    <target name="jsr166ydocs"
828 <          description="Builds javadocs with custom tags to build folder">
828 >          description="Builds javadocs to dist dir">
829  
830      <delete dir="${build.jsr166yjavadocs.dir}"/>
831      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
832  
833      <javadoc destdir="${build.jsr166yjavadocs.dir}"
834               packagenames="jsr166y"
835 <             link="http://download.oracle.com/javase/7/docs/api/"
835 >             link="${jdkapidocs.url}"
836               source="${build.sourcelevel}"
837               sourcepath="${topsrc.dir}:${jdksrc.dir}"
838               additionalparam="-XDignore.symbol.file=true" />
# Line 642 | Line 862
862    </target>
863  
864    <target name="jsr166ydist-docs"
865 <          description="Builds javadocs without custom tags to dist folder">
865 >          description="Builds javadocs to dist dir">
866  
867      <delete dir="${dist.jsr166yjavadocs.dir}"/>
868      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
869  
870      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
871               packagenames="jsr166y"
872 <             link="http://download.oracle.com/javase/7/docs/api/"
872 >             link="${jdkapidocs.url}"
873               source="${build.sourcelevel}"
874               sourcepath="${topsrc.dir}:${jdksrc.dir}"
875               additionalparam="-XDignore.symbol.file=true" />
# Line 663 | Line 883
883  
884    </target>
885  
886 +
887    <!-- extra166y -->
888  
889  
# Line 709 | Line 930
930  
931  
932    <target name="extra166ydocs"
933 <          description="Builds javadocs with custom tags to build folder">
933 >          description="Builds javadocs with custom tags to build dir">
934  
935      <delete dir="${build.extra166yjavadocs.dir}"/>
936      <mkdir dir="${build.extra166yjavadocs.dir}"/>
937  
938      <javadoc destdir="${build.extra166yjavadocs.dir}"
939               packagenames="extra166y"
940 <             link="http://download.oracle.com/javase/7/docs/api/"
940 >             link="${jdkapidocs.url}"
941               source="${build.sourcelevel}"
942               sourcepath="${topsrc.dir}:${jdksrc.dir}"
943               additionalparam="-XDignore.symbol.file=true" />
# Line 746 | Line 967
967    </target>
968  
969    <target name="extra166ydist-docs"
970 <          description="Builds javadocs without custom tags to dist folder">
970 >          description="Builds javadocs to dist dir">
971  
972      <delete dir="${dist.extra166yjavadocs.dir}"/>
973      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
974  
975      <javadoc destdir="${dist.extra166yjavadocs.dir}"
976               packagenames="extra166y"
977 <             link="http://download.oracle.com/javase/7/docs/api/"
977 >             link="${jdkapidocs.url}"
978               source="${build.sourcelevel}"
979               sourcepath="${topsrc.dir}:${jdksrc.dir}"
980               additionalparam="-XDignore.symbol.file=true" />
# Line 767 | Line 988
988  
989    </target>
990  
991 +  <!-- jsr166e -->
992 +
993 +  <target name="jsr166ecompile"
994 +          depends="configure-compiler"
995 +          description="Compiles jsr166e sources">
996 +
997 +    <mkdir dir="${build.jsr166e.dir}"/>
998 +
999 +    <javac srcdir="${topsrc.dir}"
1000 +           destdir="${build.jsr166e.dir}"
1001 +           debug="${build.debug}"
1002 +           debuglevel="${build.debuglevel}"
1003 +           deprecation="${build.deprecation}"
1004 +           source="1.7"
1005 +           classpath=""
1006 +           includeAntRuntime="false"
1007 +           includeJavaRuntime="false"
1008 +           executable="${javac7}"
1009 +           fork="true">
1010 +
1011 +      <include name="jsr166e/**/*.java"/>
1012 +      <compilerarg line="${build.args}"/>
1013 +      <compilerarg value="-XDignore.symbol.file=true"/>
1014 +      <compilerarg value="-Xlint:all"/>
1015 +
1016 +    </javac>
1017 +
1018 +  </target>
1019 +
1020 +
1021 +
1022 +  <target name="jsr166ejar"
1023 +          depends="jsr166ecompile"
1024 +          description="Builds library jar from compiled sources">
1025 +
1026 +    <mkdir dir="${build.jsr166elib.dir}"/>
1027 +
1028 +    <jar destfile="${jsr166eproduct.jar}" index="true">
1029 +      <fileset dir="${build.jsr166e.dir}"/>
1030 +    </jar>
1031 +
1032 +  </target>
1033 +
1034 +
1035 +
1036 +  <target name="jsr166edocs"
1037 +          description="Builds javadocs with custom tags to build dir">
1038 +
1039 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
1040 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1041 +
1042 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
1043 +             packagenames="jsr166e,jsr166e.extra"
1044 +             link="${jdkapi7docs.url}"
1045 +             source="1.7"
1046 +             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1047 +             executable="${javadoc7}"
1048 +             additionalparam="-XDignore.symbol.file=true" >
1049 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1050 +        <include name="jsr166e/**/*.java"/>
1051 +      </fileset>
1052 +    </javadoc>
1053 +
1054 +  </target>
1055 +
1056 +
1057 +  <target name="jsr166edist"
1058 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1059 +          description="Puts all distributable products in single hierarchy"/>
1060 +
1061 +
1062 +
1063 +  <target name="jsr166eclean"
1064 +          description="Removes all build products">
1065 +
1066 +    <delete dir="${build.jsr166e.dir}"/>
1067 +    <delete dir="${build.jsr166elib.dir}"/>
1068 +
1069 +  </target>
1070 +
1071 +
1072 +
1073 +  <target name="jsr166edist-clean"
1074 +          description="Removes all build and distribution products">
1075 +
1076 +  </target>
1077 +
1078 +  <target name="jsr166edist-docs"
1079 +          description="Builds javadocs to dist dir">
1080 +
1081 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1082 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1083 +
1084 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1085 +             packagenames="jsr166e,jsr166e.extra"
1086 +             link="${jdkapidocs.url}"
1087 +             source="1.7"
1088 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
1089 +             additionalparam="-XDignore.symbol.file=true" />
1090 +
1091 +  </target>
1092 +
1093 +  <target name="jsr166edist-jar"
1094 +          depends="jsr166eclean, jsr166ejar">
1095 +
1096 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1097 +
1098 +  </target>
1099 +
1100   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines