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.80 by dl, Sat Aug 1 23:35:22 2009 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 141 | Line 151
151      <javadoc destdir="${build.javadocs.dir}"
152                  link="http://java.sun.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"
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155      >          
156  
157        <packageset dir="${src.dir}"/>
# 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 208 | Line 217
217              link="http://java.sun.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 504 | Line 513
513      <javadoc destdir="${build.jsr166xjavadocs.dir}"
514               link="http://java.sun.com/javase/6/docs/api/"
515  
516 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
516 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
517  
518      >
519        <packageset dir="${topsrc.dir}" defaultexcludes="yes">
# Line 600 | Line 609
609  
610      <mkdir dir="${build.jsr166ylib.dir}"/>
611  
612 <    <jar destfile="${jsr166yproduct.jar}">
612 >    <jar destfile="${jsr166yproduct.jar}" index="true">
613        <fileset dir="${build.jsr166y.dir}"/>
614      </jar>
615  
# Line 616 | Line 625
625  
626      <javadoc destdir="${build.jsr166yjavadocs.dir}"
627                  link="http://java.sun.com/javase/6/docs/api/"
628 <            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
628 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
629  
630      >
631        <packageset dir="${topsrc.dir}" defaultexcludes="no">
# Line 658 | Line 667
667  
668      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
669                  link="http://java.sun.com/javase/6/docs/api/"
670 <              source="${build.sourcelevel}">
670 >              source="${build.sourcelevel}"
671 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
672 >            >          
673        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
674        <include name="jsr166y/*.java"/>
664 –      <include name="jsr166y/forkjoin/*.java"/>
675              </fileset>
676      </javadoc>
677  
# Line 674 | Line 684
684  
685    </target>
686  
687 +  <!-- extra166y -->
688 +
689 +
690 +  <target name="extra166ycompile"
691 +          depends="init, configure-compiler, jsr166ycompile"
692 +          description="Compiles extra166y sources">
693 +
694 +    <mkdir dir="${build.extra166y.dir}"/>
695 +
696 +    <javac srcdir="${extra166ysrc.dir}"
697 +          destdir="${build.extra166y.dir}"
698 +            debug="${build.debug}"
699 +            classpath="${jsr166yproduct.jar}"
700 +       debuglevel="${build.debuglevel}"
701 +      deprecation="${build.deprecation}"
702 +           source="${build.sourcelevel}"
703 +             fork="true">
704 +
705 +      <include name="**/*.java"/>
706 +      <compilerarg line="${build.args}"/>
707 +      <compilerarg value="${bootclasspath.args}"/>
708 +
709 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
710 +
711 +    </javac>
712 +
713 +  </target>
714 +
715 +
716 +
717 +  <target name="extra166yjar"
718 +          depends="extra166ycompile"
719 +          description="Builds library jar from compiled sources">
720 +
721 +    <mkdir dir="${build.extra166ylib.dir}"/>
722 +
723 +    <jar destfile="${extra166yproduct.jar}" index="true">
724 +      <fileset dir="${build.extra166y.dir}"/>
725 +    </jar>
726 +
727 +  </target>
728 +
729 +
730 +
731 +  <target name="extra166ydocs"
732 +          description="Builds javadocs with custom tags to build folder">
733 +
734 +    <delete dir="${build.extra166yjavadocs.dir}"/>
735 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
736 +
737 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
738 +                link="http://java.sun.com/javase/6/docs/api/"
739 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
740 +
741 +    >
742 +      <packageset dir="${topsrc.dir}" defaultexcludes="no">
743 +      <include name="extra166y"/>
744 +      </packageset>
745 +
746 +
747 +    </javadoc>
748 +
749 +  </target>
750 +
751 +
752 +  <target name="extra166ydist"
753 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
754 +          description="Puts all distributable products in single hierarchy"/>
755 +
756 +
757 +
758 +  <target name="extra166yclean"
759 +          description="Removes all build products">
760 +
761 +    <delete dir="${build.extra166y.dir}"/>
762 +    <delete dir="${build.extra166ylib.dir}"/>
763 +
764 +  </target>
765 +
766 +
767 +
768 +  <target name="extra166ydist-clean"
769 +          description="Removes all build and distribution products">
770 +
771 +  </target>
772 +
773 +  <target name="extra166ydist-docs"
774 +          description="Builds javadocs without custom tags to dist folder">
775 +
776 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
777 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
778 +
779 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
780 +                link="http://java.sun.com/javase/6/docs/api/"
781 +              source="${build.sourcelevel}"
782 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
783 +            >
784 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
785 +      <include name="extra166y/*.java"/>
786 +            </fileset>
787 +    </javadoc>
788 +
789 +  </target>
790 +
791 +  <target name="extra166ydist-jar"
792 +          depends="extra166yclean, extra166yjar">
793 +
794 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
795 +
796 +  </target>
797 +
798   </project>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines