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

Diff of /jsr166/build.xml

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

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

Legend:
Removed from v.1.108  
changed lines
  Added in v.1.113

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