/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.107 by jsr166, Sat Jan 19 23:40:04 2013 UTC revision 1.109 by jsr166, Sun Jan 20 01:06:24 2013 UTC
# Line 45  Line 45 
45    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
46    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.lib.dir"               location="${build.dir}/lib"/>  
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
48    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
49    
50    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
53    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>  
54    
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>  
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>  
   
56    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>  
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
   
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>  
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
   
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
   <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
   <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>  
59    
60    <!-- JDK binary locations -->    <!-- JDK binary locations -->
61    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 127  Line 113 
113    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
114    
115    <!-- Distribution locations -->    <!-- Distribution locations -->
116    <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
117    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
118    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
119    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
120    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
121    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
122    
123    <!-- Jar locations -->    <!-- Jar locations -->
124    <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
125    <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
126    <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
127    <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
128    <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
129    <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
130    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
131    
132    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
# Line 220  Line 206 
206            depends="compile"            depends="compile"
207            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
208    
     <mkdir dir="${build.lib.dir}"/>  
   
209      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
210        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
211      </jar>      </jar>
# Line 293  Line 277 
277            description="Removes all build products">            description="Removes all build products">
278    
279      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
280    
281    </target>    </target>
282    
# Line 551  Line 533 
533    
534      </javac>      </javac>
535    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
   
536      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}" index="true">
537        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
538      </jar>      </jar>
# Line 650  Line 630 
630    
631    
632    <target name="4jdk7clean"    <target name="4jdk7clean"
633            description="Removes all build products">            description="Removes all 4jdk7 build products">
634    
635      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
636    
# Line 670  Line 650 
650    
651    </target>    </target>
652    
   <!-- jsr166x -->  
653    
654      <!-- jsr166x -->
655    
656    <target name="jsr166xcompile"    <target name="jsr166xcompile"
657            depends="configure-compiler"            depends="configure-compiler"
# Line 707  Line 687 
687            depends="jsr166xcompile"            depends="jsr166xcompile"
688            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
689    
     <mkdir dir="${build.jsr166xlib.dir}"/>  
   
690      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
691        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.dir}"/>
692      </jar>      </jar>
# Line 720  Line 698 
698    <target name="jsr166xdocs"    <target name="jsr166xdocs"
699            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
700    
701      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
702      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
703    
704      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
705               packagenames="jsr166x.*"               packagenames="jsr166x.*"
706               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
707               source="5"               source="5"
# Line 736  Line 714 
714    
715    
716    <target name="jsr166xdist"    <target name="jsr166xdist"
717            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
718            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
719    
720    
721    
722    <target name="jsr166xclean"    <target name="jsr166xclean"
723            description="Removes all build products">            description="Removes all jsr166x build products">
724    
725      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
726    
727    </target>    </target>
728    
# Line 757  Line 734 
734    </target>    </target>
735    
736    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166xjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
              packagenames="jsr166x.*"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
737    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
738            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
739    
# Line 815  Line 775 
775            depends="jsr166ycompile"            depends="jsr166ycompile"
776            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
777    
     <mkdir dir="${build.jsr166ylib.dir}"/>  
   
778      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
779        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.dir}"/>
780      </jar>      </jar>
# Line 828  Line 786 
786    <target name="jsr166ydocs"    <target name="jsr166ydocs"
787            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
788    
789      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
790      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
791    
792      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
793               packagenames="jsr166y.*"               packagenames="jsr166y.*"
794               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
795               source="6"               source="6"
# Line 844  Line 802 
802    
803    
804    <target name="jsr166ydist"    <target name="jsr166ydist"
805            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
806            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
807    
808    
809    
810    <target name="jsr166yclean"    <target name="jsr166yclean"
811            description="Removes all build products">            description="Removes all jsr166y build products">
812    
813      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
814    
815    </target>    </target>
816    
# Line 864  Line 821 
821    
822    </target>    </target>
823    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166yjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"  
              packagenames="jsr166y.*"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
824    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
825            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
826    
# Line 925  Line 866 
866            depends="extra166ycompile"            depends="extra166ycompile"
867            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
868    
     <mkdir dir="${build.extra166ylib.dir}"/>  
   
869      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
870        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
871      </jar>      </jar>
# Line 938  Line 877 
877    <target name="extra166ydocs"    <target name="extra166ydocs"
878            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
879    
880      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
881      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
882    
883      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
884               packagenames="extra166y.*"               packagenames="extra166y.*"
885               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
886               source="6"               source="6"
# Line 954  Line 893 
893    
894    
895    <target name="extra166ydist"    <target name="extra166ydist"
896            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
897            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
898    
899    
900    
901    <target name="extra166yclean"    <target name="extra166yclean"
902            description="Removes all build products">            description="Removes all extra166y build products">
903    
904      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
905    
906    </target>    </target>
907    
# Line 974  Line 912 
912    
913    </target>    </target>
914    
   <target name="extra166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.extra166yjavadocs.dir}"/>  
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.extra166yjavadocs.dir}"  
              packagenames="extra166y.*"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
915    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
916            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
917    
# Line 1032  Line 954 
954            depends="jsr166ecompile"            depends="jsr166ecompile"
955            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
956    
     <mkdir dir="${build.jsr166elib.dir}"/>  
   
957      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
958        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
959      </jar>      </jar>
# Line 1045  Line 965 
965    <target name="jsr166edocs"    <target name="jsr166edocs"
966            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
967    
968      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
969      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
970    
971      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
972               packagenames="jsr166e.*"               packagenames="jsr166e.*"
973               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
974               source="7"               source="7"
# Line 1061  Line 981 
981    
982    
983    <target name="jsr166edist"    <target name="jsr166edist"
984            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
985            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
986    
987    
988    
989    <target name="jsr166eclean"    <target name="jsr166eclean"
990            description="Removes all build products">            description="Removes all jsr166e build products">
991    
992      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
993    
994    </target>    </target>
995    
996    
   
997    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
998            description="Removes all build and distribution products">            description="Removes all build and distribution products">
999    
1000    </target>    </target>
1001    
   <target name="jsr166edist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166ejavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"  
              packagenames="jsr166e.*"  
              link="${jdkapidocs.url}"  
              source="7"  
              sourcepath="${topsrc.dir}:${jdk7src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
1002    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1003            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1004    

Legend:
Removed from v.1.107  
changed lines
  Added in v.1.109

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27