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.77 by dl, Thu Jul 23 13:06:55 2009 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.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 +  <property name="extra166ysrc.dir"       location="${basedir}/src/extra166y"/>
61  
62    <!-- Distribution locations -->
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 600 | Line 607
607  
608      <mkdir dir="${build.jsr166ylib.dir}"/>
609  
610 <    <jar destfile="${jsr166yproduct.jar}">
610 >    <jar destfile="${jsr166yproduct.jar}" index="true">
611        <fileset dir="${build.jsr166y.dir}"/>
612      </jar>
613  
# Line 661 | Line 668
668                source="${build.sourcelevel}">
669        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
670        <include name="jsr166y/*.java"/>
664 –      <include name="jsr166y/forkjoin/*.java"/>
671              </fileset>
672      </javadoc>
673  
# Line 674 | Line 680
680  
681    </target>
682  
683 +  <!-- extra166y -->
684 +
685 +
686 +  <target name="extra166ycompile"
687 +          depends="init, configure-compiler, jsr166ycompile"
688 +          description="Compiles extra166y sources">
689 +
690 +    <mkdir dir="${build.extra166y.dir}"/>
691 +
692 +    <javac srcdir="${extra166ysrc.dir}"
693 +          destdir="${build.extra166y.dir}"
694 +            debug="${build.debug}"
695 +            classpath="${jsr166yproduct.jar}"
696 +       debuglevel="${build.debuglevel}"
697 +      deprecation="${build.deprecation}"
698 +           source="${build.sourcelevel}"
699 +             fork="true">
700 +
701 +      <include name="**/*.java"/>
702 +      <compilerarg line="${build.args}"/>
703 +      <compilerarg value="${bootclasspath.args}"/>
704 +
705 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
706 +
707 +    </javac>
708 +
709 +  </target>
710 +
711 +
712 +
713 +  <target name="extra166yjar"
714 +          depends="extra166ycompile"
715 +          description="Builds library jar from compiled sources">
716 +
717 +    <mkdir dir="${build.extra166ylib.dir}"/>
718 +
719 +    <jar destfile="${extra166yproduct.jar}" index="true">
720 +      <fileset dir="${build.extra166y.dir}"/>
721 +    </jar>
722 +
723 +  </target>
724 +
725 +
726 +
727 +  <target name="extra166ydocs"
728 +          description="Builds javadocs with custom tags to build folder">
729 +
730 +    <delete dir="${build.extra166yjavadocs.dir}"/>
731 +    <mkdir dir="${build.extra166yjavadocs.dir}"/>
732 +
733 +    <javadoc destdir="${build.extra166yjavadocs.dir}"
734 +                link="http://java.sun.com/javase/6/docs/api/"
735 +            sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
736 +
737 +    >
738 +      <packageset dir="${topsrc.dir}" defaultexcludes="no">
739 +      <include name="extra166y"/>
740 +      </packageset>
741 +
742 +
743 +    </javadoc>
744 +
745 +  </target>
746 +
747 +
748 +  <target name="extra166ydist"
749 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
750 +          description="Puts all distributable products in single hierarchy"/>
751 +
752 +
753 +
754 +  <target name="extra166yclean"
755 +          description="Removes all build products">
756 +
757 +    <delete dir="${build.extra166y.dir}"/>
758 +    <delete dir="${build.extra166ylib.dir}"/>
759 +
760 +  </target>
761 +
762 +
763 +
764 +  <target name="extra166ydist-clean"
765 +          description="Removes all build and distribution products">
766 +
767 +  </target>
768 +
769 +  <target name="extra166ydist-docs"
770 +          description="Builds javadocs without custom tags to dist folder">
771 +
772 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
773 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
774 +
775 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
776 +                link="http://java.sun.com/javase/6/docs/api/"
777 +              source="${build.sourcelevel}">
778 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
779 +      <include name="extra166y/*.java"/>
780 +            </fileset>
781 +    </javadoc>
782 +
783 +  </target>
784 +
785 +  <target name="extra166ydist-jar"
786 +          depends="extra166yclean, extra166yjar">
787 +
788 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
789 +
790 +  </target>
791 +
792   </project>

Diff Legend

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