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.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"/>
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 119 | Line 110
110    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
122 –  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
113  
114    <!-- Distribution locations -->
115 <  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
116 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
117 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
118 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
119 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
120 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
115 >  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116 >  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117 >  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118 >  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119 >  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120 >  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121  
122    <!-- Jar locations -->
123 <  <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
124 <  <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
125 <  <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
126 <  <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
127 <  <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
128 <  <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
123 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130  
131    <!-- Bootclasspath argument -->
# Line 215 | Line 205
205            depends="compile"
206            description="Builds library jar from compiled sources">
207  
218 –    <mkdir dir="${build.lib.dir}"/>
219 –
208      <jar destfile="${product.jar}">
209        <fileset dir="${build.classes.dir}"/>
210      </jar>
# Line 288 | Line 276
276            description="Removes all build products">
277  
278      <delete dir="${build.dir}"/>
291 –    <delete dir="${build.classes.dir}"/>
292 –    <delete dir="${build.lib.dir}"/>
279  
280    </target>
281  
# Line 546 | Line 532
532  
533      </javac>
534  
549 –    <mkdir dir="${build.4jdk7.lib.dir}"/>
550 –
535      <jar destfile="${4jdk7product.jar}" index="true">
536        <fileset dir="${build.4jdk7.classes.dir}"/>
537      </jar>
# Line 645 | Line 629
629  
630  
631    <target name="4jdk7clean"
632 <          description="Removes all build products">
632 >          description="Removes all 4jdk7 build products">
633  
634      <delete dir="${build.4jdk7.dir}"/>
635  
# Line 665 | Line 649
649  
650    </target>
651  
668 –  <!-- jsr166x -->
652  
653 +  <!-- jsr166x -->
654  
655    <target name="jsr166xcompile"
656            depends="configure-compiler"
# Line 702 | Line 686
686            depends="jsr166xcompile"
687            description="Builds library jar from compiled sources">
688  
705 –    <mkdir dir="${build.jsr166xlib.dir}"/>
706 –
689      <jar destfile="${jsr166x.jar}">
690        <fileset dir="${build.jsr166x.dir}"/>
691      </jar>
# Line 737 | Line 719
719  
720  
721    <target name="jsr166xclean"
722 <          description="Removes all build products">
722 >          description="Removes all jsr166x build products">
723  
724      <delete dir="${build.jsr166x.dir}"/>
743 –    <delete dir="${build.jsr166xlib.dir}"/>
725  
726    </target>
727  
# Line 793 | Line 774
774            depends="jsr166ycompile"
775            description="Builds library jar from compiled sources">
776  
796 –    <mkdir dir="${build.jsr166ylib.dir}"/>
797 –
777      <jar destfile="${jsr166y.jar}" index="true">
778        <fileset dir="${build.jsr166y.dir}"/>
779      </jar>
# Line 828 | Line 807
807  
808  
809    <target name="jsr166yclean"
810 <          description="Removes all build products">
810 >          description="Removes all jsr166y build products">
811  
812      <delete dir="${build.jsr166y.dir}"/>
834 –    <delete dir="${build.jsr166ylib.dir}"/>
813  
814    </target>
815  
# Line 887 | Line 865
865            depends="extra166ycompile"
866            description="Builds library jar from compiled sources">
867  
890 –    <mkdir dir="${build.extra166ylib.dir}"/>
891 –
868      <jar destfile="${extra166y.jar}" index="true">
869        <fileset dir="${build.extra166y.dir}"/>
870      </jar>
# Line 922 | Line 898
898  
899  
900    <target name="extra166yclean"
901 <          description="Removes all build products">
901 >          description="Removes all extra166y build products">
902  
903      <delete dir="${build.extra166y.dir}"/>
928 –    <delete dir="${build.extra166ylib.dir}"/>
904  
905    </target>
906  
# Line 978 | Line 953
953            depends="jsr166ecompile"
954            description="Builds library jar from compiled sources">
955  
981 –    <mkdir dir="${build.jsr166elib.dir}"/>
982 –
956      <jar destfile="${jsr166e.jar}" index="true">
957        <fileset dir="${build.jsr166e.dir}"/>
958      </jar>
# Line 1013 | Line 986
986  
987  
988    <target name="jsr166eclean"
989 <          description="Removes all build products">
989 >          description="Removes all jsr166e build products">
990  
991      <delete dir="${build.jsr166e.dir}"/>
1019 –    <delete dir="${build.jsr166elib.dir}"/>
992  
993    </target>
994  

Diff Legend

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