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.81 by jsr166, Sun Aug 2 00:11:59 2009 UTC vs.
Revision 1.91 by jsr166, Sun Nov 18 06:21:11 2012 UTC

# Line 42 | Line 42
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.jsr166e.dir"           location="${build.dir}/jsr166e"/>
46 +  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
47 +  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
48 +
49    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
50    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
51    <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
# Line 57 | Line 61
61    <property name="topsrc.dir"           location="${basedir}/src"/>
62    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
63    <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
64 +  <property name="jsr166esrc.dir"       location="${basedir}/src/jsr166e"/>
65    <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
66    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
67 +
68    <!-- Distribution locations -->
69    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
70    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
71    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
72 +  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
73    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
74  
75    <!-- Jar locations -->
76    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
77    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
78    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
79 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
80    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
81    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
82  
83    <!-- Bootclasspath argument -->
84    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
85  
86 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
87 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
88 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
89 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
90 +
91 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
92 +  <!-- The below does not yet exist as of 2012-11 -->
93 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
94 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
95 +
96    <!-- Test classpath -->
97    <path id="test.classpath">
98      <pathelement location="${build.testcases.dir}"/>
# Line 90 | Line 108
108    <!-- Main targets -->
109  
110    <target name="dists"
111 <          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
111 >          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
112            description="Builds all public jars and docs"/>
113  
114    <target name="compile"
# Line 108 | Line 126
126               fork="true">
127  
128        <include name="**/*.java"/>
129 <      <compilerarg value="-XDignore.symbol.file"/>
129 >      <compilerarg value="-XDignore.symbol.file=true"/>
130  
131   <!--
132        <exclude name="java/lang/**"/>
# Line 148 | Line 166
166      <delete dir="${build.javadocs.dir}"/>
167      <mkdir dir="${build.javadocs.dir}"/>
168  
169 <    <javadoc destdir="${build.javadocs.dir}"
170 <                link="http://java.sun.com/javase/6/docs/api/"
153 <            overview="${src.dir}/intro.html"
154 <            sourcepath="${src.dir}:${jdksrc.dir}"
155 <    >          
156 <
157 <      <packageset dir="${src.dir}"/>
169 >    <!-- the packagenames="none" hack below prevents scanning the -->
170 >    <!-- sourcepath for packages -->
171  
172 +    <javadoc destdir="${build.javadocs.dir}"
173 +             packagenames="none"
174 +             link="${jdkapidocs.url}"
175 +             overview="${src.dir}/intro.html"
176 +             sourcepath="${src.dir}:${jdksrc.dir}"
177 +             additionalparam="-XDignore.symbol.file=true" >
178 +      <fileset dir="${src.dir}" defaultexcludes="yes">
179 +      <include name="**/*.java"/>
180 +      </fileset>
181      </javadoc>
182  
183    </target>
# Line 213 | Line 235
235      <delete dir="${dist.javadocs.dir}"/>
236      <mkdir dir="${dist.javadocs.dir}"/>
237  
238 <    <javadoc destdir="${dist.javadocs.dir}"
239 <            link="http://java.sun.com/javase/6/docs/api/"
218 <            overview="${src.dir}/intro.html"
238 >    <!-- the packagenames="none" hack below prevents scanning the -->
239 >    <!-- sourcepath for packages -->
240  
241 <            sourcepath="${src.dir}:${jdksrc.dir}"
242 <     >
243 < <!--
244 <      <packageset dir="${src.dir}" defaultexcludes="yes">
245 <      <include name="java/util/concurrent"/>
246 <      <include name="java/util/concurrent/atomic"/>
247 <      <include name="java/util/concurrent/locks"/>
248 <      </packageset>
228 < -->
229 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230 <      <include name="main/java/util/concurrent/*.java"/>
231 <      <include name="main/java/util/concurrent/atomic/*.java"/>
232 <      <include name="main/java/util/concurrent/locks/*.java"/>
233 <      <include name="main/java/util/*.java"/>
234 < <!--
235 <      <include name="main/java/util/concurrent/*.html"/>
236 <      <include name="main/java/util/concurrent/atomic/*.html"/>
237 <      <include name="main/java/util/concurrent/locks/*.html"/>
238 <      <include name="main/java/util/*.html"/>
239 < -->
240 < <!--      <include name="jsr166x/*.java"/> -->
241 >    <javadoc destdir="${dist.javadocs.dir}"
242 >             packagenames="none"
243 >             link="${jdkapidocs.url}"
244 >             overview="${src.dir}/intro.html"
245 >             sourcepath="${src.dir}:${jdksrc.dir}"
246 >             additionalparam="-XDignore.symbol.file=true" >
247 >      <fileset dir="${src.dir}" defaultexcludes="yes">
248 >      <include name="**/*.java"/>
249        </fileset>
250      </javadoc>
251  
# Line 281 | Line 289
289  
290        <compilerarg value="${bootclasspath.args}"/>
291        <compilerarg line="${build.args}"/>
292 +      <compilerarg value="-XDignore.symbol.file=true"/>
293  
294        <classpath refid="test.classpath"/>
295  
# Line 298 | Line 307
307  
308        <compilerarg value="${bootclasspath.args}"/>
309        <compilerarg line="${build.args}"/>
310 +      <compilerarg value="-XDignore.symbol.file=true"/>
311  
312        <classpath refid="test.classpath"/>
313  
# Line 314 | Line 324
324  
325        <compilerarg value="${bootclasspath.args}"/>
326        <compilerarg line="${build.args}"/>
327 +      <compilerarg value="-XDignore.symbol.file=true"/>
328  
329        <classpath refid="test.classpath"/>
330  
# Line 454 | Line 465
465  
466        <compilerarg line="${build.args}"/>
467        <classpath refid="loops.classpath"/>
468 +      <compilerarg value="-XDignore.symbol.file=true"/>
469  
470      </javac>
471  
# Line 483 | Line 495
495  
496        <include name="**/*.java"/>
497        <compilerarg line="${build.args}"/>
498 +      <compilerarg value="-XDignore.symbol.file=true"/>
499  
500      </javac>
501  
# Line 511 | Line 524
524      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
525  
526      <javadoc destdir="${build.jsr166xjavadocs.dir}"
527 <             link="http://java.sun.com/javase/6/docs/api/"
528 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
529 <    >
530 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
531 <      <include name="jsr166x"/>
519 <      </packageset>
520 <
521 <
522 <    </javadoc>
527 >             packagenames="jsr166x"
528 >             link="${jdkapidocs.url}"
529 >             source="${build.sourcelevel}"
530 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
531 >             additionalparam="-XDignore.symbol.file=true" />
532  
533    </target>
534  
# Line 554 | Line 563
563      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
564  
565      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
566 <                link="http://java.sun.com/javase/6/docs/api/"
567 <              source="${build.sourcelevel}">
568 <
569 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
570 <      <include name="jsr166x"/>
562 <      </packageset>
563 <
564 <    </javadoc>
566 >             packagenames="jsr166x"
567 >             link="${jdkapidocs.url}"
568 >             source="${build.sourcelevel}"
569 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
570 >             additionalparam="-XDignore.symbol.file=true" />
571  
572    </target>
573  
# Line 591 | Line 597
597  
598        <include name="**/*.java"/>
599        <compilerarg line="${build.args}"/>
600 +      <compilerarg value="-XDignore.symbol.file=true"/>
601        <compilerarg value="${bootclasspath.args}"/>
602  
603   <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 622 | Line 629
629      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
630  
631      <javadoc destdir="${build.jsr166yjavadocs.dir}"
632 <                link="http://java.sun.com/javase/6/docs/api/"
633 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
634 <    >
635 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
636 <      <include name="jsr166y"/>
630 <      </packageset>
631 <
632 <
633 <    </javadoc>
632 >             packagenames="jsr166y"
633 >             link="${jdkapidocs.url}"
634 >             source="${build.sourcelevel}"
635 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
636 >             additionalparam="-XDignore.symbol.file=true" />
637  
638    </target>
639  
# Line 663 | Line 666
666      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
667  
668      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
669 <                link="http://java.sun.com/javase/6/docs/api/"
670 <              source="${build.sourcelevel}"
671 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
672 <            >          
673 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
671 <      <include name="jsr166y/*.java"/>
672 <            </fileset>
673 <    </javadoc>
669 >             packagenames="jsr166y"
670 >             link="${jdkapidocs.url}"
671 >             source="${build.sourcelevel}"
672 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
673 >             additionalparam="-XDignore.symbol.file=true" />
674  
675    </target>
676  
# Line 681 | Line 681
681  
682    </target>
683  
684 +
685    <!-- extra166y -->
686  
687  
# Line 701 | Line 702
702  
703        <include name="**/*.java"/>
704        <compilerarg line="${build.args}"/>
705 +      <compilerarg value="-XDignore.symbol.file=true"/>
706        <compilerarg value="${bootclasspath.args}"/>
707  
708   <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 732 | Line 734
734      <mkdir dir="${build.extra166yjavadocs.dir}"/>
735  
736      <javadoc destdir="${build.extra166yjavadocs.dir}"
737 <                link="http://java.sun.com/javase/6/docs/api/"
738 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
739 <    >
740 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
741 <      <include name="extra166y"/>
740 <      </packageset>
741 <
742 <
743 <    </javadoc>
737 >             packagenames="extra166y"
738 >             link="${jdkapidocs.url}"
739 >             source="${build.sourcelevel}"
740 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
741 >             additionalparam="-XDignore.symbol.file=true" />
742  
743    </target>
744  
# Line 773 | Line 771
771      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
772  
773      <javadoc destdir="${dist.extra166yjavadocs.dir}"
774 <                link="http://java.sun.com/javase/6/docs/api/"
775 <              source="${build.sourcelevel}"
776 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
777 <            >
778 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
781 <      <include name="extra166y/*.java"/>
782 <            </fileset>
783 <    </javadoc>
774 >             packagenames="extra166y"
775 >             link="${jdkapidocs.url}"
776 >             source="${build.sourcelevel}"
777 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
778 >             additionalparam="-XDignore.symbol.file=true" />
779  
780    </target>
781  
# Line 791 | Line 786
786  
787    </target>
788  
789 +  <!-- jsr166e -->
790 +
791 +
792 +  <target name="jsr166ecompile"
793 +          depends="init, configure-compiler"
794 +          description="Compiles jsr166e sources">
795 +
796 +    <mkdir dir="${build.jsr166e.dir}"/>
797 +
798 +    <javac srcdir="${jsr166esrc.dir}"
799 +          destdir="${build.jsr166e.dir}"
800 +            debug="${build.debug}"
801 +       debuglevel="${build.debuglevel}"
802 +      deprecation="${build.deprecation}"
803 +           source="1.7"
804 +             fork="true">
805 +
806 +      <include name="**/*.java"/>
807 +      <compilerarg line="${build.args}"/>
808 +      <compilerarg value="-XDignore.symbol.file=true"/>
809 +      <compilerarg value="${bootclasspath.args}"/>
810 +
811 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
812 +
813 +    </javac>
814 +
815 +  </target>
816 +
817 +
818 +
819 +  <target name="jsr166ejar"
820 +          depends="jsr166ecompile"
821 +          description="Builds library jar from compiled sources">
822 +
823 +    <mkdir dir="${build.jsr166elib.dir}"/>
824 +
825 +    <jar destfile="${jsr166eproduct.jar}" index="true">
826 +      <fileset dir="${build.jsr166e.dir}"/>
827 +    </jar>
828 +
829 +  </target>
830 +
831 +
832 +
833 +  <target name="jsr166edocs"
834 +          description="Builds javadocs with custom tags to build folder">
835 +
836 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
837 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
838 +
839 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
840 +             packagenames="jsr166e,jsr166e.extra"
841 +             link="${jdkapidocs.url}"
842 +             source="1.7"
843 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
844 +             additionalparam="-XDignore.symbol.file=true" />
845 +
846 +  </target>
847 +
848 +
849 +  <target name="jsr166edist"
850 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
851 +          description="Puts all distributable products in single hierarchy"/>
852 +
853 +
854 +
855 +  <target name="jsr166eclean"
856 +          description="Removes all build products">
857 +
858 +    <delete dir="${build.jsr166e.dir}"/>
859 +    <delete dir="${build.jsr166elib.dir}"/>
860 +
861 +  </target>
862 +
863 +
864 +
865 +  <target name="jsr166edist-clean"
866 +          description="Removes all build and distribution products">
867 +
868 +  </target>
869 +
870 +  <target name="jsr166edist-docs"
871 +          description="Builds javadocs without custom tags to dist folder">
872 +
873 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
874 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
875 +
876 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
877 +             packagenames="jsr166e,jsr166e.extra"
878 +             link="${jdkapidocs.url}"
879 +             source="1.7"
880 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
881 +             additionalparam="-XDignore.symbol.file=true" />
882 +
883 +  </target>
884 +
885 +  <target name="jsr166edist-jar"
886 +          depends="jsr166eclean, jsr166ejar">
887 +
888 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
889 +
890 +  </target>
891 +
892   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines