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

Diff of /jsr166/build.xml

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

revision 1.100 by jsr166, Sat Jan 19 17:15:44 2013 UTC 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"/>    <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"/>  
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
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"/>  
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>  
   
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"/>  
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
   
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"/>  
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
   
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"/>  
   <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>  
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 127  Line 113 
113    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
114    
115    <!-- Distribution locations -->    <!-- Distribution locations -->
116    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
117    <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
118    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
119    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
120    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
121    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
122    
123    <!-- Jar locations -->    <!-- Jar locations -->
124    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
125    <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
126    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
127    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
128    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
129    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
130    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
131    
132    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
133    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 154  Line 140 
140    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
141    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2012-11 -->
142    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
143    
144      <!-- Default jdk api doc location (latest stable release seems best) -->
145    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
146    
147    <!-- Test classpath -->    <!-- Test classpath -->
# Line 169  Line 157 
157    
158    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
159    <!-- TODO: How do we get &trade to work? -->    <!-- TODO: How do we get &trade to work? -->
160      <!-- TODO: Why isn't @jls a "standard" tag? -->
161    <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->    <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
162    <property name="javadoc.jls.cite" value="The Java Language Specification"/>    <property name="javadoc.jls.cite" value="The Java Language Specification"/>
163    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
# Line 176  Line 165 
165    <!-- Main targets -->    <!-- Main targets -->
166    
167    <target name="dists"    <target name="dists"
168            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
169            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
170    
171    <target name="compile"    <target name="compile"
172            depends="configure-compiler"            depends="configure-compiler"
173            description="Compiles src/main sources to build folder">            description="Compiles src/main sources to build dir">
174    
175      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
176    
# Line 217  Line 206 
206            depends="compile"            depends="compile"
207            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
208    
     <mkdir dir="${build.lib.dir}"/>  
   
209      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
210        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
211      </jar>      </jar>
# Line 228  Line 215 
215    
216    
217    <target name="test"    <target name="test"
218            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
219            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
220    
221    
222    
223    <target name="docs"    <target name="docs"
224            description="Builds javadocs for src/main">            description="Builds javadocs for src/main to dist dir">
225    
226      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
227      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
# Line 262  Line 249 
249    
250    
251    <target name="dist"    <target name="dist"
252            depends="init, dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, docs"
253            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
254    
255    
# Line 290  Line 277 
277            description="Removes all build products">            description="Removes all build products">
278    
279      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
280    
281    </target>    </target>
282    
# Line 309  Line 294 
294    <!-- Internal targets -->    <!-- Internal targets -->
295    
296    
   <target name="init">  
   
     <!-- Version is kept in a separate file -->  
     <loadfile property="version" srcFile="version.properties"/>  
     <echo>Building JSR-166 version ${version}</echo>  
     <echo>java.home is ${java.home}</echo>  
   
   </target>  
   
   
297    <target name="dist-jar"    <target name="dist-jar"
298            depends="clean, jar">            depends="clean, jar">
299    
# Line 503  Line 478 
478    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
479    
480    
481    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
482            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
483    
484      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 543  Line 518 
518             debug="${build.debug}"             debug="${build.debug}"
519             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
520             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
521             source="1.6"             source="6"
522             classpath=""             classpath=""
523             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
524             includeAntRuntime="false"             includeAntRuntime="false"
# Line 558  Line 533 
533    
534      </javac>      </javac>
535    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
   
536      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}" index="true">
537        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
538      </jar>      </jar>
# Line 571  Line 544 
544             debug="${build.debug}"             debug="${build.debug}"
545             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
546             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
547             source="1.6"             source="6"
548             classpath="${junit.jar}"             classpath="${junit.jar}"
549             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
550             includeAntRuntime="false"             includeAntRuntime="false"
# Line 629  Line 602 
602    
603    
604    <target name="4jdk7docs"    <target name="4jdk7docs"
605            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
606    
607      <delete dir="${build.4jdk7.docs.dir}"/>      <delete dir="${dist.4jdk7.docs.dir}"/>
608      <mkdir dir="${build.4jdk7.docs.dir}"/>      <mkdir dir="${dist.4jdk7.docs.dir}"/>
609    
610      <javadoc destdir="${build.4jdk7.docs.dir}"      <javadoc destdir="${dist.4jdk7.docs.dir}"
611               packagenames="none"               packagenames="none"
612               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
613               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
# Line 651  Line 624 
624    
625    
626    <target name="4jdk7dist"    <target name="4jdk7dist"
627            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
628            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
629    
630    
631    
632    <target name="4jdk7clean"    <target name="4jdk7clean"
633            description="Removes all build products">            description="Removes all 4jdk7 build products">
634    
635      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
636    
# Line 670  Line 643 
643    
644    </target>    </target>
645    
   <target name="4jdk7dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.4jdk7.docs.dir}"/>  
     <mkdir dir="${dist.4jdk7.docs.dir}"/>  
   
     <javadoc destdir="${dist.4jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${4jdk7src.dir}/intro.html"  
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
646    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
647            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7compile">
648    
# Line 698  Line 650 
650    
651    </target>    </target>
652    
   <!-- jsr166x -->  
653    
654      <!-- jsr166x -->
655    
656    <target name="jsr166xcompile"    <target name="jsr166xcompile"
657            depends="init, configure-compiler"            depends="configure-compiler"
658            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
659    
660      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.dir}"/>
661    
662      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
663            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.dir}"
664              debug="${build.debug}"             debug="${build.debug}"
665         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
666        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
667             source="${build.sourcelevel}"             classpath=""
668               fork="true">             source="5"
669               bootclasspath="${bootclasspath6}"
670               includeAntRuntime="false"
671               includeJavaRuntime="false"
672               executable="${javac7}"
673               fork="true">
674    
675        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
676        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
677        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
678          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
679    
680      </javac>      </javac>
681    
# Line 729  Line 687 
687            depends="jsr166xcompile"            depends="jsr166xcompile"
688            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
689    
690      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
   
     <jar destfile="${jsr166xproduct.jar}">  
691        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.dir}"/>
692      </jar>      </jar>
693    
# Line 740  Line 696 
696    
697    
698    <target name="jsr166xdocs"    <target name="jsr166xdocs"
699            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
700    
701      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
702      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
703    
704      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
705               packagenames="jsr166x"               packagenames="jsr166x.*"
706               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
707               source="${build.sourcelevel}"               source="5"
708               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
709                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
710                 executable="${javadoc7}"
711               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
712    
713    </target>    </target>
714    
715    
716    <target name="jsr166xdist"    <target name="jsr166xdist"
717            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
718            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
719    
720    
721    
722    <target name="jsr166xclean"    <target name="jsr166xclean"
723            description="Removes all build products">            description="Removes all jsr166x build products">
724    
725      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
726    
727    </target>    </target>
728    
# Line 777  Line 734 
734    </target>    </target>
735    
736    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166xjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
              packagenames="jsr166x"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
737    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
738            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
739    
740      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
741    
742    </target>    </target>
743    
# Line 804  Line 745 
745    
746    
747    <target name="jsr166ycompile"    <target name="jsr166ycompile"
748            depends="init, configure-compiler"            depends="configure-compiler"
749            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
750    
751      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.dir}"/>
752    
753      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
754            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.dir}"
755              debug="${build.debug}"             debug="${build.debug}"
756         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
757        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
758             source="${build.sourcelevel}"             source="6"
759               fork="true">             classpath=""
760               bootclasspath="${bootclasspath6}"
761               includeAntRuntime="false"
762               includeJavaRuntime="false"
763               executable="${javac7}"
764               fork="true">
765    
766        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
767        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
768        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
769        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
770      </javac>      </javac>
   
771    </target>    </target>
772    
773    
   
774    <target name="jsr166yjar"    <target name="jsr166yjar"
775            depends="jsr166ycompile"            depends="jsr166ycompile"
776            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
777    
778      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
   
     <jar destfile="${jsr166yproduct.jar}" index="true">  
779        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.dir}"/>
780      </jar>      </jar>
781    
# Line 845  Line 784 
784    
785    
786    <target name="jsr166ydocs"    <target name="jsr166ydocs"
787            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
788    
789      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
790      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
791    
792      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
793               packagenames="jsr166y"               packagenames="jsr166y.*"
794               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
795               source="${build.sourcelevel}"               source="6"
796               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
797                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
798                 executable="${javadoc7}"
799               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
800    
801    </target>    </target>
802    
803    
804    <target name="jsr166ydist"    <target name="jsr166ydist"
805            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
806            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
807    
808    
809    
810    <target name="jsr166yclean"    <target name="jsr166yclean"
811            description="Removes all build products">            description="Removes all jsr166y build products">
812    
813      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
814    
815    </target>    </target>
816    
# Line 881  Line 821 
821    
822    </target>    </target>
823    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166yjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"  
              packagenames="jsr166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
824    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
825            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
826    
827      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
828    
829    </target>    </target>
830    
# Line 908  Line 833 
833    
834    
835    <target name="extra166ycompile"    <target name="extra166ycompile"
836            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
837            description="Compiles extra166y sources">            description="Compiles extra166y sources">
838    
839      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.dir}"/>
840    
841      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
842            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.dir}"
843              debug="${build.debug}"             debug="${build.debug}"
844              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
845         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
846        deprecation="${build.deprecation}"             classpath=""
847             source="${build.sourcelevel}"             source="6"
848               fork="true">             bootclasspath="${jsr166y.jar}:${bootclasspath6}"
849               includeAntRuntime="false"
850               includeJavaRuntime="false"
851               executable="${javac7}"
852               fork="true">
853    
854        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
855        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
856        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
857        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
858    
859      </javac>      </javac>
860    
# Line 939  Line 866 
866            depends="extra166ycompile"            depends="extra166ycompile"
867            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
868    
869      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
   
     <jar destfile="${extra166yproduct.jar}" index="true">  
870        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
871      </jar>      </jar>
872    
# Line 950  Line 875 
875    
876    
877    <target name="extra166ydocs"    <target name="extra166ydocs"
878            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
879    
880      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
881      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
882    
883      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
884               packagenames="extra166y"               packagenames="extra166y.*"
885               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
886               source="${build.sourcelevel}"               source="6"
887               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
888                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
889                 executable="${javadoc7}"
890               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
891    
892    </target>    </target>
893    
894    
895    <target name="extra166ydist"    <target name="extra166ydist"
896            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
897            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
898    
899    
900    
901    <target name="extra166yclean"    <target name="extra166yclean"
902            description="Removes all build products">            description="Removes all extra166y build products">
903    
904      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
905    
906    </target>    </target>
907    
# Line 986  Line 912 
912    
913    </target>    </target>
914    
   <target name="extra166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.extra166yjavadocs.dir}"/>  
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.extra166yjavadocs.dir}"  
              packagenames="extra166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
915    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
916            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
917    
918      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
919    
920    </target>    </target>
921    
# Line 1021  Line 932 
932             debug="${build.debug}"             debug="${build.debug}"
933             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
934             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
935             source="1.7"             source="7"
936             classpath=""             classpath=""
937             includeAntRuntime="false"             includeAntRuntime="false"
938             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1043  Line 954 
954            depends="jsr166ecompile"            depends="jsr166ecompile"
955            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
956    
957      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
   
     <jar destfile="${jsr166eproduct.jar}" index="true">  
958        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
959      </jar>      </jar>
960    
# Line 1054  Line 963 
963    
964    
965    <target name="jsr166edocs"    <target name="jsr166edocs"
966            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
967    
968      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
969      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
970    
971      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
972               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
973               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
974               source="1.7"               source="7"
975               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
976               executable="${javadoc7}"               executable="${javadoc7}"
977               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
978      </javadoc>      </javadoc>
979    
980    </target>    </target>
981    
982    
983    <target name="jsr166edist"    <target name="jsr166edist"
984            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
985            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
986    
987    
988    
989    <target name="jsr166eclean"    <target name="jsr166eclean"
990            description="Removes all build products">            description="Removes all jsr166e build products">
991    
992      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
993    
994    </target>    </target>
995    
996    
   
997    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
998            description="Removes all build and distribution products">            description="Removes all build and distribution products">
999    
1000    </target>    </target>
1001    
   <target name="jsr166edist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166ejavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapidocs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
1002    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1003            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1004    
1005      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1006    
1007    </target>    </target>
1008    
Legend:
Removed from v.1.100  
changed lines
  Added in v.1.109
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27