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.84 by dl, Thu Nov 25 12:48:45 2010 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 139 | Line 149
149      <mkdir dir="${build.javadocs.dir}"/>
150  
151      <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://java.sun.com/javase/6/docs/api/"
152 >                link="http://download.oracle.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"
154 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
155 <    >          
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >
156  
157        <packageset dir="${src.dir}"/>
158  
# Line 157 | Line 167
167            description="Puts all distributable products in single hierarchy"/>
168  
169  
160
170    <target name="release"
171            depends="dist"
172            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 205 | Line 214
214      <mkdir dir="${dist.javadocs.dir}"/>
215  
216      <javadoc destdir="${dist.javadocs.dir}"
217 <            link="http://java.sun.com/javase/6/docs/api/"
217 >            link="http://download.oracle.com/javase/6/docs/api/"
218              overview="${src.dir}/intro.html"
219  
220 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
220 >            sourcepath="${src.dir}:${jdksrc.dir}"
221       >
222   <!--
223        <packageset dir="${src.dir}" defaultexcludes="yes">
# Line 272 | Line 281
281  
282        <compilerarg value="${bootclasspath.args}"/>
283        <compilerarg line="${build.args}"/>
284 +      <compilerarg value="-XDignore.symbol.file=true"/>
285  
286        <classpath refid="test.classpath"/>
287  
# Line 289 | Line 299
299  
300        <compilerarg value="${bootclasspath.args}"/>
301        <compilerarg line="${build.args}"/>
302 +      <compilerarg value="-XDignore.symbol.file=true"/>
303  
304        <classpath refid="test.classpath"/>
305  
# Line 305 | Line 316
316  
317        <compilerarg value="${bootclasspath.args}"/>
318        <compilerarg line="${build.args}"/>
319 +      <compilerarg value="-XDignore.symbol.file=true"/>
320  
321        <classpath refid="test.classpath"/>
322  
# Line 445 | Line 457
457  
458        <compilerarg line="${build.args}"/>
459        <classpath refid="loops.classpath"/>
460 +      <compilerarg value="-XDignore.symbol.file=true"/>
461  
462      </javac>
463  
# Line 474 | Line 487
487  
488        <include name="**/*.java"/>
489        <compilerarg line="${build.args}"/>
490 +      <compilerarg value="-XDignore.symbol.file=true"/>
491  
492      </javac>
493  
# Line 502 | Line 516
516      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
517  
518      <javadoc destdir="${build.jsr166xjavadocs.dir}"
519 <             link="http://java.sun.com/javase/6/docs/api/"
520 <
507 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
508 <
519 >             link="http://download.oracle.com/javase/6/docs/api/"
520 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
521      >
522        <packageset dir="${topsrc.dir}" defaultexcludes="yes">
523        <include name="jsr166x"/>
# Line 547 | Line 559
559      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
560  
561      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
562 <                link="http://java.sun.com/javase/6/docs/api/"
562 >                link="http://download.oracle.com/javase/6/docs/api/"
563                source="${build.sourcelevel}">
564  
565        <packageset dir="${topsrc.dir}" defaultexcludes="yes">
# Line 584 | Line 596
596  
597        <include name="**/*.java"/>
598        <compilerarg line="${build.args}"/>
599 +      <compilerarg value="-XDignore.symbol.file=true"/>
600        <compilerarg value="${bootclasspath.args}"/>
601  
602   <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 600 | Line 613
613  
614      <mkdir dir="${build.jsr166ylib.dir}"/>
615  
616 <    <jar destfile="${jsr166yproduct.jar}">
616 >    <jar destfile="${jsr166yproduct.jar}" index="true">
617        <fileset dir="${build.jsr166y.dir}"/>
618      </jar>
619  
# Line 615 | Line 628
628      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
629  
630      <javadoc destdir="${build.jsr166yjavadocs.dir}"
631 <                link="http://java.sun.com/javase/6/docs/api/"
632 <            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
620 <
631 >                link="http://download.oracle.com/javase/6/docs/api/"
632 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
633      >
634        <packageset dir="${topsrc.dir}" defaultexcludes="no">
635        <include name="jsr166y"/>
# Line 657 | Line 669
669      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
670  
671      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
672 <                link="http://java.sun.com/javase/6/docs/api/"
673 <              source="${build.sourcelevel}">
672 >                link="http://download.oracle.com/javase/6/docs/api/"
673 >              source="${build.sourcelevel}"
674 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
675 >            >
676        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
677        <include name="jsr166y/*.java"/>
664      <include name="jsr166y/forkjoin/*.java"/>
678              </fileset>
679      </javadoc>
680  
# Line 674 | Line 687
687  
688    </target>
689  
690 +  <!-- extra166y -->
691 +
692 +
693 +  <target name="extra166ycompile"
694 +          depends="init, configure-compiler, jsr166ycompile"
695 +          description="Compiles extra166y sources">
696 +
697 +    <mkdir dir="${build.extra166y.dir}"/>
698 +
699 +    <javac srcdir="${extra166ysrc.dir}"
700 +          destdir="${build.extra166y.dir}"
701 +            debug="${build.debug}"
702 +            classpath="${jsr166yproduct.jar}"
703 +       debuglevel="${build.debuglevel}"
704 +      deprecation="${build.deprecation}"
705 +           source="${build.sourcelevel}"
706 +             fork="true">
707 +
708 +      <include name="**/*.java"/>
709 +      <compilerarg line="${build.args}"/>
710 +      <compilerarg value="-XDignore.symbol.file=true"/>
711 +      <compilerarg value="${bootclasspath.args}"/>
712 +
713 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
714 +
715 +    </javac>
716 +
717 +  </target>
718 +
719 +
720 +
721 +  <target name="extra166yjar"
722 +          depends="extra166ycompile"
723 +          description="Builds library jar from compiled sources">
724 +
725 +    <mkdir dir="${build.extra166ylib.dir}"/>
726 +
727 +    <jar destfile="${extra166yproduct.jar}" index="true">
728 +      <fileset dir="${build.extra166y.dir}"/>
729 +    </jar>
730 +
731 +  </target>
732 +
733 +
734 +
735 +  <target name="extra166ydocs"
736 +          description="Builds javadocs with custom tags to build folder">
737 +
738 +    <delete dir="${build.extra166yjavadocs.dir}"/>
739 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
740 +
741 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
742 +                link="http://download.oracle.com/javase/6/docs/api/"
743 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
744 +    >
745 +      <packageset dir="${topsrc.dir}" defaultexcludes="no">
746 +      <include name="extra166y"/>
747 +      </packageset>
748 +
749 +
750 +    </javadoc>
751 +
752 +  </target>
753 +
754 +
755 +  <target name="extra166ydist"
756 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
757 +          description="Puts all distributable products in single hierarchy"/>
758 +
759 +
760 +
761 +  <target name="extra166yclean"
762 +          description="Removes all build products">
763 +
764 +    <delete dir="${build.extra166y.dir}"/>
765 +    <delete dir="${build.extra166ylib.dir}"/>
766 +
767 +  </target>
768 +
769 +
770 +
771 +  <target name="extra166ydist-clean"
772 +          description="Removes all build and distribution products">
773 +
774 +  </target>
775 +
776 +  <target name="extra166ydist-docs"
777 +          description="Builds javadocs without custom tags to dist folder">
778 +
779 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
780 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
781 +
782 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
783 +                link="http://download.oracle.com/javase/6/docs/api/"
784 +              source="${build.sourcelevel}"
785 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
786 +            >
787 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
788 +      <include name="extra166y/*.java"/>
789 +            </fileset>
790 +    </javadoc>
791 +
792 +  </target>
793 +
794 +  <target name="extra166ydist-jar"
795 +          depends="extra166yclean, extra166yjar">
796 +
797 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
798 +
799 +  </target>
800 +
801   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines