/[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.115 by jsr166, Sun Jan 20 06:11:07 2013 UTC
# Line 35  Line 35 
35    
36    
37    <!-- Compilation options -->    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# 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"/>
59    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
60      <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61      <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62      <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63      <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64    
65    <!-- JDK binary locations -->    <!-- JDK binary locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 119  Line 115 
115    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
116    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
117    <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"/>  
118    
119    <!-- Distribution locations -->    <!-- Distribution locations -->
120    <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
121    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
122    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
123    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
124    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
125    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
126    
127    <!-- Jar locations -->    <!-- Jar locations -->
128    <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
129    <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
130    <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
131    <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
132    <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
133    <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
134    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
135    
136    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
# Line 153  Line 148 
148    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
149    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
150    
151      <!-- Define the "jtreg" task -->
152      <!-- See the docs in "jtreg -onlineHelp" -->
153      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
154               classpath="${lib.dir}/jtreg.jar" />
155    
156    <!-- Test classpath -->    <!-- Test classpath -->
157    <path id="test.classpath">    <path id="test.classpath">
158      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 215  Line 215 
215            depends="compile"            depends="compile"
216            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
217    
     <mkdir dir="${build.lib.dir}"/>  
   
218      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
219        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
220      </jar>      </jar>
# Line 288  Line 286 
286            description="Removes all build products">            description="Removes all build products">
287    
288      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
289    
290    </target>    </target>
291    
# Line 321  Line 317 
317      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
318    
319      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
320            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
321              debug="${build.debug}"             debug="${build.debug}"
322         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
323        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
324             source="${build.sourcelevel}"             source="6"
325               fork="true">             classpath="${junit.jar}"
326               bootclasspath="${product.jar}:${bootclasspath6}"
327               includeAntRuntime="false"
328               includeJavaRuntime="false"
329               executable="${javac8}"
330               fork="true">
331    
332        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
333        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
334        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
335          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
336    
337      </javac>      </javac>
338    
339      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
340            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
341              debug="${build.debug}"             debug="${build.debug}"
342         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
343        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
344             source="${build.sourcelevel}"             source="6"
345               fork="true">             classpath=""
346               bootclasspath="${product.jar}:${bootclasspath6}"
347               includeAntRuntime="false"
348               includeJavaRuntime="false"
349               executable="${javac8}"
350               fork="true">
351    
352        <include name="jsr166/test/**"/>        <include name="jsr166/test/**/*.java"/>
353    
       <compilerarg value="${bootclasspath.args}"/>  
354        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
355        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
356          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
357    
358      </javac>      </javac>
359    
# Line 367  Line 370 
370        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
371        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
372    
       <classpath refid="test.classpath"/>  
   
373      </javac>      </javac>
374  -->  -->
375    
# Line 388  Line 389 
389            errorProperty="junit.failed"            errorProperty="junit.failed"
390          failureProperty="junit.failed"          failureProperty="junit.failed"
391                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
392                        jvm="${java8}"
393                     fork="true">                     fork="true">
394    
395        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
396        <jvmarg value="-server"/>        <jvmarg value="-server"/>
397        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
398    
# Line 546  Line 548 
548    
549      </javac>      </javac>
550    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
   
551      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}" index="true">
552        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
553      </jar>      </jar>
# Line 615  Line 615 
615      </junit>      </junit>
616    </target>    </target>
617    
618      <target name="4jdk7-test-jtreg"
619              depends="4jdk7compile"
620              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
621        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
622        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
623        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
624        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
625        <jtreg dir="${jtreg.src.dir}"
626               jdk="${jdk7.home}"
627               workDir="${build.4jdk7.dir}/JTwork"
628               reportDir="${build.4jdk7.dir}/JTreport">
629    
630          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
631          <arg value="-agentvm"/>
632          <arg value="-v:nopass,fail"/>
633          <arg value="-vmoptions:-esa -ea"/>
634          <arg value="-automatic"/>
635          <arg value="-k:!ignore"/>
636        </jtreg>
637      </target>
638    
639    
640      <target name="4jdk7-test"
641              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
642              description="Runs tck and jtreg tests for jsr166-4jdk7">
643      </target>
644    
645    
646    <target name="4jdk7docs"    <target name="4jdk7docs"
647            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
# Line 645  Line 672 
672    
673    
674    <target name="4jdk7clean"    <target name="4jdk7clean"
675            description="Removes all build products">            description="Removes all 4jdk7 build products">
676    
677      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
678    
# Line 665  Line 692 
692    
693    </target>    </target>
694    
   <!-- jsr166x -->  
695    
696      <!-- jsr166x -->
697    
698    <target name="jsr166xcompile"    <target name="jsr166xcompile"
699            depends="configure-compiler"            depends="configure-compiler"
700            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
701    
702      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
703    
704      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
705             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
706             debug="${build.debug}"             debug="${build.debug}"
707             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
708             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 702  Line 729 
729            depends="jsr166xcompile"            depends="jsr166xcompile"
730            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
731    
     <mkdir dir="${build.jsr166xlib.dir}"/>  
   
732      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
733        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
734      </jar>      </jar>
735    
736    </target>    </target>
# Line 725  Line 750 
750               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
751               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
752               executable="${javadoc7}"               executable="${javadoc7}"
753               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
754    
755    </target>    </target>
756    
# Line 737  Line 762 
762    
763    
764    <target name="jsr166xclean"    <target name="jsr166xclean"
765            description="Removes all build products">            description="Removes all jsr166x build products">
766    
767      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
768    
769    </target>    </target>
770    
# Line 766  Line 790 
790            depends="configure-compiler"            depends="configure-compiler"
791            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
792    
793      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
794    
795      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
796             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
797             debug="${build.debug}"             debug="${build.debug}"
798             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
799             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 793  Line 817 
817            depends="jsr166ycompile"            depends="jsr166ycompile"
818            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
819    
     <mkdir dir="${build.jsr166ylib.dir}"/>  
   
820      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
821        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
822      </jar>      </jar>
823    
824    </target>    </target>
# Line 816  Line 838 
838               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
839               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
840               executable="${javadoc7}"               executable="${javadoc7}"
841               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
842    
843    </target>    </target>
844    
# Line 828  Line 850 
850    
851    
852    <target name="jsr166yclean"    <target name="jsr166yclean"
853            description="Removes all build products">            description="Removes all jsr166y build products">
854    
855      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
856    
857    </target>    </target>
858    
# Line 857  Line 878 
878            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
879            description="Compiles extra166y sources">            description="Compiles extra166y sources">
880    
881      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
882    
883      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
884             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
885             debug="${build.debug}"             debug="${build.debug}"
886             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
887             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 887  Line 908 
908            depends="extra166ycompile"            depends="extra166ycompile"
909            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
910    
     <mkdir dir="${build.extra166ylib.dir}"/>  
   
911      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
912        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
913      </jar>      </jar>
914    
915    </target>    </target>
# Line 910  Line 929 
929               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
930               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
931               executable="${javadoc7}"               executable="${javadoc7}"
932               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
933    
934    </target>    </target>
935    
# Line 922  Line 941 
941    
942    
943    <target name="extra166yclean"    <target name="extra166yclean"
944            description="Removes all build products">            description="Removes all extra166y build products">
945    
946      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
947    
948    </target>    </target>
949    
# Line 949  Line 967 
967            depends="configure-compiler"            depends="configure-compiler"
968            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
969    
970      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
971    
972      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
973             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
974             debug="${build.debug}"             debug="${build.debug}"
975             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
976             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 978  Line 996 
996            depends="jsr166ecompile"            depends="jsr166ecompile"
997            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
998    
     <mkdir dir="${build.jsr166elib.dir}"/>  
   
999      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1000        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1001      </jar>      </jar>
1002    
1003    </target>    </target>
# Line 1013  Line 1029 
1029    
1030    
1031    <target name="jsr166eclean"    <target name="jsr166eclean"
1032            description="Removes all build products">            description="Removes all jsr166e build products">
1033    
1034      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
1035    
1036    </target>    </target>
1037    

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

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