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.108 by jsr166, Sat Jan 19 23:58:12 2013 UTC vs.
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"/>
46    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47    <property name="build.loops.dir"             location="${build.dir}/loops"/>
48 –  <property name="build.lib.dir"               location="${build.dir}/lib"/>
48    <property name="build.reports.dir"           location="${build.dir}/reports"/>
49  
50 <  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
51 <  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
52 <  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
53 <  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
55 <  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
50 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
53 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54  
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
58 –  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
59 –
56    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
61 –  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
62 –
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
64 –  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
65 –
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
67 –  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
59  
60    <!-- JDK binary locations -->
61    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 122 | Line 113
113    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
114  
115    <!-- Distribution locations -->
116 <  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
117 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
118 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
119 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
120 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
121 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
116 >  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
117 >  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
118 >  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
119 >  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
120 >  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
121 >  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
122  
123    <!-- Jar locations -->
124 <  <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
125 <  <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
126 <  <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
127 <  <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
128 <  <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
129 <  <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
124 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
125 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
126 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
127 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
128 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
129 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
130    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
131  
132    <!-- Bootclasspath argument -->
# Line 215 | Line 206
206            depends="compile"
207            description="Builds library jar from compiled sources">
208  
218 –    <mkdir dir="${build.lib.dir}"/>
219 –
209      <jar destfile="${product.jar}">
210        <fileset dir="${build.classes.dir}"/>
211      </jar>
# Line 288 | Line 277
277            description="Removes all build products">
278  
279      <delete dir="${build.dir}"/>
291 –    <delete dir="${build.classes.dir}"/>
292 –    <delete dir="${build.lib.dir}"/>
280  
281    </target>
282  
# Line 546 | Line 533
533  
534      </javac>
535  
549 –    <mkdir dir="${build.4jdk7.lib.dir}"/>
550 –
536      <jar destfile="${4jdk7product.jar}" index="true">
537        <fileset dir="${build.4jdk7.classes.dir}"/>
538      </jar>
# Line 645 | Line 630
630  
631  
632    <target name="4jdk7clean"
633 <          description="Removes all build products">
633 >          description="Removes all 4jdk7 build products">
634  
635      <delete dir="${build.4jdk7.dir}"/>
636  
# Line 665 | Line 650
650  
651    </target>
652  
668 –  <!-- jsr166x -->
653  
654 +  <!-- jsr166x -->
655  
656    <target name="jsr166xcompile"
657            depends="configure-compiler"
# Line 702 | Line 687
687            depends="jsr166xcompile"
688            description="Builds library jar from compiled sources">
689  
705 –    <mkdir dir="${build.jsr166xlib.dir}"/>
706 –
690      <jar destfile="${jsr166x.jar}">
691        <fileset dir="${build.jsr166x.dir}"/>
692      </jar>
# Line 737 | Line 720
720  
721  
722    <target name="jsr166xclean"
723 <          description="Removes all build products">
723 >          description="Removes all jsr166x build products">
724  
725      <delete dir="${build.jsr166x.dir}"/>
743 –    <delete dir="${build.jsr166xlib.dir}"/>
726  
727    </target>
728  
# Line 793 | Line 775
775            depends="jsr166ycompile"
776            description="Builds library jar from compiled sources">
777  
796 –    <mkdir dir="${build.jsr166ylib.dir}"/>
797 –
778      <jar destfile="${jsr166y.jar}" index="true">
779        <fileset dir="${build.jsr166y.dir}"/>
780      </jar>
# Line 828 | Line 808
808  
809  
810    <target name="jsr166yclean"
811 <          description="Removes all build products">
811 >          description="Removes all jsr166y build products">
812  
813      <delete dir="${build.jsr166y.dir}"/>
834 –    <delete dir="${build.jsr166ylib.dir}"/>
814  
815    </target>
816  
# Line 887 | Line 866
866            depends="extra166ycompile"
867            description="Builds library jar from compiled sources">
868  
890 –    <mkdir dir="${build.extra166ylib.dir}"/>
891 –
869      <jar destfile="${extra166y.jar}" index="true">
870        <fileset dir="${build.extra166y.dir}"/>
871      </jar>
# Line 922 | Line 899
899  
900  
901    <target name="extra166yclean"
902 <          description="Removes all build products">
902 >          description="Removes all extra166y build products">
903  
904      <delete dir="${build.extra166y.dir}"/>
928 –    <delete dir="${build.extra166ylib.dir}"/>
905  
906    </target>
907  
# Line 978 | Line 954
954            depends="jsr166ecompile"
955            description="Builds library jar from compiled sources">
956  
981 –    <mkdir dir="${build.jsr166elib.dir}"/>
982 –
957      <jar destfile="${jsr166e.jar}" index="true">
958        <fileset dir="${build.jsr166e.dir}"/>
959      </jar>
# Line 1013 | Line 987
987  
988  
989    <target name="jsr166eclean"
990 <          description="Removes all build products">
990 >          description="Removes all jsr166e build products">
991  
992      <delete dir="${build.jsr166e.dir}"/>
1019 –    <delete dir="${build.jsr166elib.dir}"/>
993  
994    </target>
995  

Diff Legend

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