/[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.110 by jsr166, Sun Jan 20 01:09:12 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 124  Line 110 
110    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
   <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>  
113    
114    <!-- Distribution locations -->    <!-- Distribution locations -->
115    <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121    
122    <!-- Jar locations -->    <!-- Jar locations -->
123    <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124    <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125    <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126    <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127    <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128    <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130    
131    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
# Line 220  Line 205 
205            depends="compile"            depends="compile"
206            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
207    
     <mkdir dir="${build.lib.dir}"/>  
   
208      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
209        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
210      </jar>      </jar>
# Line 293  Line 276 
276            description="Removes all build products">            description="Removes all build products">
277    
278      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
279    
280    </target>    </target>
281    
# Line 551  Line 532 
532    
533      </javac>      </javac>
534    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
   
535      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}" index="true">
536        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
537      </jar>      </jar>
# Line 650  Line 629 
629    
630    
631    <target name="4jdk7clean"    <target name="4jdk7clean"
632            description="Removes all build products">            description="Removes all 4jdk7 build products">
633    
634      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
635    
# Line 670  Line 649 
649    
650    </target>    </target>
651    
   <!-- jsr166x -->  
652    
653      <!-- jsr166x -->
654    
655    <target name="jsr166xcompile"    <target name="jsr166xcompile"
656            depends="configure-compiler"            depends="configure-compiler"
# Line 707  Line 686 
686            depends="jsr166xcompile"            depends="jsr166xcompile"
687            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
688    
     <mkdir dir="${build.jsr166xlib.dir}"/>  
   
689      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
690        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.dir}"/>
691      </jar>      </jar>
# Line 720  Line 697 
697    <target name="jsr166xdocs"    <target name="jsr166xdocs"
698            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
699    
700      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
701      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
702    
703      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
704               packagenames="jsr166x.*"               packagenames="jsr166x.*"
705               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
706               source="5"               source="5"
# Line 736  Line 713 
713    
714    
715    <target name="jsr166xdist"    <target name="jsr166xdist"
716            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
717            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
718    
719    
720    
721    <target name="jsr166xclean"    <target name="jsr166xclean"
722            description="Removes all build products">            description="Removes all jsr166x build products">
723    
724      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
725    
726    </target>    </target>
727    
# Line 757  Line 733 
733    </target>    </target>
734    
735    
   
   <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>  
   
736    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
737            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
738    
# Line 815  Line 774 
774            depends="jsr166ycompile"            depends="jsr166ycompile"
775            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
776    
     <mkdir dir="${build.jsr166ylib.dir}"/>  
   
777      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
778        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.dir}"/>
779      </jar>      </jar>
# Line 828  Line 785 
785    <target name="jsr166ydocs"    <target name="jsr166ydocs"
786            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
787    
788      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
789      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
790    
791      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
792               packagenames="jsr166y.*"               packagenames="jsr166y.*"
793               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
794               source="6"               source="6"
# Line 844  Line 801 
801    
802    
803    <target name="jsr166ydist"    <target name="jsr166ydist"
804            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
805            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
806    
807    
808    
809    <target name="jsr166yclean"    <target name="jsr166yclean"
810            description="Removes all build products">            description="Removes all jsr166y build products">
811    
812      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
813    
814    </target>    </target>
815    
# Line 864  Line 820 
820    
821    </target>    </target>
822    
   <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>  
   
823    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
824            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
825    
# Line 925  Line 865 
865            depends="extra166ycompile"            depends="extra166ycompile"
866            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
867    
     <mkdir dir="${build.extra166ylib.dir}"/>  
   
868      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
869        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
870      </jar>      </jar>
# Line 938  Line 876 
876    <target name="extra166ydocs"    <target name="extra166ydocs"
877            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
878    
879      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
880      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
881    
882      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
883               packagenames="extra166y.*"               packagenames="extra166y.*"
884               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
885               source="6"               source="6"
# Line 954  Line 892 
892    
893    
894    <target name="extra166ydist"    <target name="extra166ydist"
895            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
896            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
897    
898    
899    
900    <target name="extra166yclean"    <target name="extra166yclean"
901            description="Removes all build products">            description="Removes all extra166y build products">
902    
903      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
904    
905    </target>    </target>
906    
# Line 974  Line 911 
911    
912    </target>    </target>
913    
   <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>  
   
914    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
915            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
916    
# Line 1032  Line 953 
953            depends="jsr166ecompile"            depends="jsr166ecompile"
954            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
955    
     <mkdir dir="${build.jsr166elib.dir}"/>  
   
956      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
957        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
958      </jar>      </jar>
# Line 1045  Line 964 
964    <target name="jsr166edocs"    <target name="jsr166edocs"
965            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
966    
967      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
968      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
969    
970      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
971               packagenames="jsr166e.*"               packagenames="jsr166e.*"
972               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
973               source="7"               source="7"
# Line 1061  Line 980 
980    
981    
982    <target name="jsr166edist"    <target name="jsr166edist"
983            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
984            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
985    
986    
987    
988    <target name="jsr166eclean"    <target name="jsr166eclean"
989            description="Removes all build products">            description="Removes all jsr166e build products">
990    
991      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
992    
993    </target>    </target>
994    
995    
   
996    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
997            description="Removes all build and distribution products">            description="Removes all build and distribution products">
998    
999    </target>    </target>
1000    
   <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>  
   
1001    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1002            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1003    
Legend:
Removed from v.1.107  
changed lines
  Added in v.1.110
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27