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.75 by jsr166, Tue Sep 18 12:46:40 2007 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.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"/>
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"/>
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"/>
# Line 53 | Line 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 <
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 82 | Line 89
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 108
108               fork="true">
109  
110        <include name="**/*.java"/>
111 <      <compilerarg value="-XDignore.symbol.file"/>
111 >      <compilerarg value="-XDignore.symbol.file=true"/>
112  
113   <!--
114        <exclude name="java/lang/**"/>
# Line 138 | 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/javase/6/docs/api/"
143 <            overview="${src.dir}/intro.html"
144 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
145 <    >          
146 <
147 <      <packageset dir="${src.dir}"/>
151 >    <!-- the packagenames="none" hack below prevents scanning the -->
152 >    <!-- sourcepath for packages -->
153  
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    </target>
# Line 157 | Line 170
170            description="Puts all distributable products in single hierarchy"/>
171  
172  
160
173    <target name="release"
174            depends="dist"
175            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 204 | 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/javase/6/docs/api/"
209 <            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 < <!--
225 <      <packageset dir="${src.dir}" defaultexcludes="yes">
226 <      <include name="java/util/concurrent"/>
227 <      <include name="java/util/concurrent/atomic"/>
228 <      <include name="java/util/concurrent/locks"/>
218 <      </packageset>
219 < -->
220 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
221 <      <include name="main/java/util/concurrent/*.java"/>
222 <      <include name="main/java/util/concurrent/atomic/*.java"/>
223 <      <include name="main/java/util/concurrent/locks/*.java"/>
224 <      <include name="main/java/util/*.java"/>
225 < <!--
226 <      <include name="main/java/util/concurrent/*.html"/>
227 <      <include name="main/java/util/concurrent/atomic/*.html"/>
228 <      <include name="main/java/util/concurrent/locks/*.html"/>
229 <      <include name="main/java/util/*.html"/>
230 < -->
231 < <!--      <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 272 | 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 289 | 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 305 | 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 445 | 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 474 | Line 475
475  
476        <include name="**/*.java"/>
477        <compilerarg line="${build.args}"/>
478 +      <compilerarg value="-XDignore.symbol.file=true"/>
479  
480      </javac>
481  
# Line 502 | Line 504
504      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
505  
506      <javadoc destdir="${build.jsr166xjavadocs.dir}"
507 <             link="http://java.sun.com/javase/6/docs/api/"
508 <
509 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
510 <
509 <    >
510 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
511 <      <include name="jsr166x"/>
512 <      </packageset>
513 <
514 <
515 <    </javadoc>
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  
# Line 547 | Line 542
542      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
543  
544      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
545 <                link="http://java.sun.com/javase/6/docs/api/"
546 <              source="${build.sourcelevel}">
547 <
548 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
554 <      <include name="jsr166x"/>
555 <      </packageset>
556 <
557 <    </javadoc>
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    </target>
551  
# Line 584 | Line 575
575  
576        <include name="**/*.java"/>
577        <compilerarg line="${build.args}"/>
578 +      <compilerarg value="-XDignore.symbol.file=true"/>
579        <compilerarg value="${bootclasspath.args}"/>
580  
581   <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 600 | Line 592
592  
593      <mkdir dir="${build.jsr166ylib.dir}"/>
594  
595 <    <jar destfile="${jsr166yproduct.jar}">
595 >    <jar destfile="${jsr166yproduct.jar}" index="true">
596        <fileset dir="${build.jsr166y.dir}"/>
597      </jar>
598  
# Line 615 | Line 607
607      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
608  
609      <javadoc destdir="${build.jsr166yjavadocs.dir}"
610 <                link="http://java.sun.com/javase/6/docs/api/"
611 <            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
612 <
613 <    >
622 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
623 <      <include name="jsr166y"/>
624 <      </packageset>
625 <
626 <
627 <    </javadoc>
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  
# Line 657 | Line 643
643      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
644  
645      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
646 <                link="http://java.sun.com/javase/6/docs/api/"
647 <              source="${build.sourcelevel}">
648 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
649 <      <include name="jsr166y/*.java"/>
664 <      <include name="jsr166y/forkjoin/*.java"/>
665 <            </fileset>
666 <    </javadoc>
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  
# Line 674 | Line 657
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}"
676 +             fork="true">
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 +
687 +  </target>
688 +
689 +
690 +
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