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.112 by jsr166, Sun Jan 20 03:44:54 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 321 | Line 307
307      <mkdir dir="${build.testcases.dir}"/>
308  
309      <javac srcdir="${tck.src.dir}"
310 <          destdir="${build.testcases.dir}"
311 <            debug="${build.debug}"
312 <       debuglevel="${build.debuglevel}"
313 <      deprecation="${build.deprecation}"
314 <           source="${build.sourcelevel}"
315 <             fork="true">
310 >           destdir="${build.testcases.dir}"
311 >           debug="${build.debug}"
312 >           debuglevel="${build.debuglevel}"
313 >           deprecation="${build.deprecation}"
314 >           source="6"
315 >           classpath="${junit.jar}"
316 >           bootclasspath="${product.jar}:${bootclasspath6}"
317 >           includeAntRuntime="false"
318 >           includeJavaRuntime="false"
319 >           executable="${javac8}"
320 >           fork="true">
321  
322 <      <compilerarg value="${bootclasspath.args}"/>
322 >      <include name="**/*.java"/>
323        <compilerarg line="${build.args}"/>
324        <compilerarg value="-XDignore.symbol.file=true"/>
325 <
335 <      <classpath refid="test.classpath"/>
325 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326  
327      </javac>
328  
329      <javac srcdir="${test.src.dir}"
330 <          destdir="${build.testcases.dir}"
331 <            debug="${build.debug}"
332 <       debuglevel="${build.debuglevel}"
333 <      deprecation="${build.deprecation}"
334 <           source="${build.sourcelevel}"
335 <             fork="true">
330 >           destdir="${build.testcases.dir}"
331 >           debug="${build.debug}"
332 >           debuglevel="${build.debuglevel}"
333 >           deprecation="${build.deprecation}"
334 >           source="6"
335 >           classpath=""
336 >           bootclasspath="${product.jar}:${bootclasspath6}"
337 >           includeAntRuntime="false"
338 >           includeJavaRuntime="false"
339 >           executable="${javac8}"
340 >           fork="true">
341  
342 <      <include name="jsr166/test/**"/>
342 >      <include name="jsr166/test/**/*.java"/>
343  
349 –      <compilerarg value="${bootclasspath.args}"/>
344        <compilerarg line="${build.args}"/>
345        <compilerarg value="-XDignore.symbol.file=true"/>
346 <
353 <      <classpath refid="test.classpath"/>
346 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347  
348      </javac>
349  
# Line 367 | Line 360
360        <compilerarg line="${build.args}"/>
361        <compilerarg value="-XDignore.symbol.file=true"/>
362  
370 –      <classpath refid="test.classpath"/>
371 –
363      </javac>
364   -->
365  
# Line 388 | Line 379
379            errorProperty="junit.failed"
380          failureProperty="junit.failed"
381                      dir="${build.reports.dir}"
382 +                    jvm="${java8}"
383                     fork="true">
384  
385 <      <jvmarg value="${bootclasspath.args}"/>
385 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
386        <jvmarg value="-server"/>
387        <jvmarg value="-showversion"/>
388  
# Line 546 | Line 538
538  
539      </javac>
540  
549 –    <mkdir dir="${build.4jdk7.lib.dir}"/>
550 –
541      <jar destfile="${4jdk7product.jar}" index="true">
542        <fileset dir="${build.4jdk7.classes.dir}"/>
543      </jar>
# Line 645 | Line 635
635  
636  
637    <target name="4jdk7clean"
638 <          description="Removes all build products">
638 >          description="Removes all 4jdk7 build products">
639  
640      <delete dir="${build.4jdk7.dir}"/>
641  
# Line 665 | Line 655
655  
656    </target>
657  
668 –  <!-- jsr166x -->
658  
659 +  <!-- jsr166x -->
660  
661    <target name="jsr166xcompile"
662            depends="configure-compiler"
# Line 702 | Line 692
692            depends="jsr166xcompile"
693            description="Builds library jar from compiled sources">
694  
705 –    <mkdir dir="${build.jsr166xlib.dir}"/>
706 –
695      <jar destfile="${jsr166x.jar}">
696        <fileset dir="${build.jsr166x.dir}"/>
697      </jar>
# Line 737 | Line 725
725  
726  
727    <target name="jsr166xclean"
728 <          description="Removes all build products">
728 >          description="Removes all jsr166x build products">
729  
730      <delete dir="${build.jsr166x.dir}"/>
743 –    <delete dir="${build.jsr166xlib.dir}"/>
731  
732    </target>
733  
# Line 793 | Line 780
780            depends="jsr166ycompile"
781            description="Builds library jar from compiled sources">
782  
796 –    <mkdir dir="${build.jsr166ylib.dir}"/>
797 –
783      <jar destfile="${jsr166y.jar}" index="true">
784        <fileset dir="${build.jsr166y.dir}"/>
785      </jar>
# Line 828 | Line 813
813  
814  
815    <target name="jsr166yclean"
816 <          description="Removes all build products">
816 >          description="Removes all jsr166y build products">
817  
818      <delete dir="${build.jsr166y.dir}"/>
834 –    <delete dir="${build.jsr166ylib.dir}"/>
819  
820    </target>
821  
# Line 887 | Line 871
871            depends="extra166ycompile"
872            description="Builds library jar from compiled sources">
873  
890 –    <mkdir dir="${build.extra166ylib.dir}"/>
891 –
874      <jar destfile="${extra166y.jar}" index="true">
875        <fileset dir="${build.extra166y.dir}"/>
876      </jar>
# Line 922 | Line 904
904  
905  
906    <target name="extra166yclean"
907 <          description="Removes all build products">
907 >          description="Removes all extra166y build products">
908  
909      <delete dir="${build.extra166y.dir}"/>
928 –    <delete dir="${build.extra166ylib.dir}"/>
910  
911    </target>
912  
# Line 978 | Line 959
959            depends="jsr166ecompile"
960            description="Builds library jar from compiled sources">
961  
981 –    <mkdir dir="${build.jsr166elib.dir}"/>
982 –
962      <jar destfile="${jsr166e.jar}" index="true">
963        <fileset dir="${build.jsr166e.dir}"/>
964      </jar>
# Line 1013 | Line 992
992  
993  
994    <target name="jsr166eclean"
995 <          description="Removes all build products">
995 >          description="Removes all jsr166e build products">
996  
997      <delete dir="${build.jsr166e.dir}"/>
1019 –    <delete dir="${build.jsr166elib.dir}"/>
998  
999    </target>
1000  

Diff Legend

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