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

Diff of /jsr166/build.xml

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

revision 1.99 by jsr166, Sat Jan 19 01:37:44 2013 UTC revision 1.111 by jsr166, Sun Jan 20 03:34:23 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 124  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="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128    <property name="extra166yproduct.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 -->
132    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 154  Line 139 
139    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2012-11 -->
141    <!-- <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/"/> -->
142    
143      <!-- Default jdk api doc location (latest stable release seems best) -->
144    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
145    
146    <!-- Test classpath -->    <!-- Test classpath -->
# Line 167  Line 154 
154      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
155    </path>    </path>
156    
157      <!-- Support @jls tag, used in jdk8+ javadoc -->
158      <!-- TODO: How do we get &trade to work? -->
159      <!-- TODO: Why isn't @jls a "standard" tag? -->
160      <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161      <property name="javadoc.jls.cite" value="The Java Language Specification"/>
162      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
163    
164    <!-- Main targets -->    <!-- Main targets -->
165    
166    <target name="dists"    <target name="dists"
167            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
168            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
169    
170    <target name="compile"    <target name="compile"
171            depends="init, configure-compiler"            depends="configure-compiler"
172            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
173    
174      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
175    
176      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
177            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
178              debug="${build.debug}"             debug="${build.debug}"
179         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
180        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
181             source="${build.sourcelevel}"             classpath=""
182               fork="true">             includeAntRuntime="false"
183               includeJavaRuntime="false"
184               executable="${javac8}"
185               fork="true">
186    
187        <include name="**/*.java"/>        <include name="**/*.java"/>
188          <compilerarg line="${build.args}"/>
189        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
190          <compilerarg value="-Xlint:all"/>
191    
192  <!--  <!--
193        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 207  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 218  Line 214 
214    
215    
216    <target name="test"    <target name="test"
217            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
218            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)" />
219    
220    
221    
222    <target name="docs"    <target name="docs"
223            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
224    
225      <delete dir="${build.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
226      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
227    
228      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
229      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
230    
231      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${dist.javadocs.dir}"
232               packagenames="none"               packagenames="none"
233               link="${jdkapidocs.url}"               link="${jdkapi8docs.url}"
234               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
235               sourcepath="${src.dir}:${jdksrc.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
236               additionalparam="-XDignore.symbol.file=true" >               classpath=""
237                 executable="${javadoc8}">
238          <arg value="-XDignore.symbol.file=true"/>
239          <arg value="-tag"/>
240          <arg value="${javadoc.jls.option}"/>
241        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
242          <include name="**/*.java"/>          <include name="**/*.java"/>
243        </fileset>        </fileset>
# Line 248  Line 248 
248    
249    
250    <target name="dist"    <target name="dist"
251            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, docs"
252            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
253    
254    
# Line 276  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 292  Line 290 
290    
291    
292    
   <target name="dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.javadocs.dir}"/>  
     <mkdir dir="${dist.javadocs.dir}"/>  
   
     <!-- the packagenames="none" hack below prevents scanning the -->  
     <!-- sourcepath for packages -->  
   
     <javadoc destdir="${dist.javadocs.dir}"  
              packagenames="none"  
              link="${jdkapidocs.url}"  
              overview="${src.dir}/intro.html"  
              sourcepath="${src.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   
   
293    <!-- Internal targets -->    <!-- Internal targets -->
294    
295    
   <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>  
   
   
296    <target name="dist-jar"    <target name="dist-jar"
297            depends="clean, jar">            depends="clean, jar">
298    
# Line 343  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"/>
326    
327        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
328    
329      </javac>      </javac>
330    
331      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
332            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
333              debug="${build.debug}"             debug="${build.debug}"
334         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
335        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
336             source="${build.sourcelevel}"             source="6"
337               fork="true">             classpath="${junit.jar}"
338               bootclasspath="${product.jar}:${bootclasspath6}"
339               includeAntRuntime="false"
340               includeJavaRuntime="false"
341               executable="${javac8}"
342               fork="true">
343    
344        <include name="jsr166/test/**"/>        <include name="jsr166/test/**/*.java"/>
345    
       <compilerarg value="${bootclasspath.args}"/>  
346        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
347        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
348          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
349    
350        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
351    
# Line 410  Line 385 
385            errorProperty="junit.failed"            errorProperty="junit.failed"
386          failureProperty="junit.failed"          failureProperty="junit.failed"
387                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
388                        jvm="${java8}"
389                     fork="true">                     fork="true">
390    
391        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
392        <jvmarg value="-server"/>        <jvmarg value="-server"/>
393        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
394    
# Line 513  Line 489 
489    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
490    
491    
492    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
493            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
494    
495      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 553  Line 529 
529             debug="${build.debug}"             debug="${build.debug}"
530             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
531             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
532             source="1.6"             source="6"
533             classpath=""             classpath=""
534             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
535             includeAntRuntime="false"             includeAntRuntime="false"
# Line 568  Line 544 
544    
545      </javac>      </javac>
546    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
   
547      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}" index="true">
548        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
549      </jar>      </jar>
# Line 581  Line 555 
555             debug="${build.debug}"             debug="${build.debug}"
556             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
557             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
558             source="1.6"             source="6"
559             classpath="${junit.jar}"             classpath="${junit.jar}"
560             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
561             includeAntRuntime="false"             includeAntRuntime="false"
# Line 639  Line 613 
613    
614    
615    <target name="4jdk7docs"    <target name="4jdk7docs"
616            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
617    
618      <delete dir="${build.4jdk7.docs.dir}"/>      <delete dir="${dist.4jdk7.docs.dir}"/>
619      <mkdir dir="${build.4jdk7.docs.dir}"/>      <mkdir dir="${dist.4jdk7.docs.dir}"/>
620    
621      <javadoc destdir="${build.4jdk7.docs.dir}"      <javadoc destdir="${dist.4jdk7.docs.dir}"
622               packagenames="none"               packagenames="none"
623               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
624               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
# Line 661  Line 635 
635    
636    
637    <target name="4jdk7dist"    <target name="4jdk7dist"
638            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
639            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
640    
641    
642    
643    <target name="4jdk7clean"    <target name="4jdk7clean"
644            description="Removes all build products">            description="Removes all 4jdk7 build products">
645    
646      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
647    
# Line 680  Line 654 
654    
655    </target>    </target>
656    
   <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>  
   
657    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
658            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7compile">
659    
# Line 708  Line 661 
661    
662    </target>    </target>
663    
   <!-- jsr166x -->  
664    
665      <!-- jsr166x -->
666    
667    <target name="jsr166xcompile"    <target name="jsr166xcompile"
668            depends="init, configure-compiler"            depends="configure-compiler"
669            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
670    
671      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.dir}"/>
672    
673      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
674            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.dir}"
675              debug="${build.debug}"             debug="${build.debug}"
676         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
677        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
678             source="${build.sourcelevel}"             classpath=""
679               fork="true">             source="5"
680               bootclasspath="${bootclasspath6}"
681               includeAntRuntime="false"
682               includeJavaRuntime="false"
683               executable="${javac7}"
684               fork="true">
685    
686        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
687        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
688        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
689          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
690    
691      </javac>      </javac>
692    
# Line 739  Line 698 
698            depends="jsr166xcompile"            depends="jsr166xcompile"
699            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
700    
701      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
   
     <jar destfile="${jsr166xproduct.jar}">  
702        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.dir}"/>
703      </jar>      </jar>
704    
# Line 750  Line 707 
707    
708    
709    <target name="jsr166xdocs"    <target name="jsr166xdocs"
710            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
711    
712      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
713      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
714    
715      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
716               packagenames="jsr166x"               packagenames="jsr166x.*"
717               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
718               source="${build.sourcelevel}"               source="5"
719               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
720                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
721                 executable="${javadoc7}"
722               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
723    
724    </target>    </target>
725    
726    
727    <target name="jsr166xdist"    <target name="jsr166xdist"
728            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
729            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
730    
731    
732    
733    <target name="jsr166xclean"    <target name="jsr166xclean"
734            description="Removes all build products">            description="Removes all jsr166x build products">
735    
736      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
737    
738    </target>    </target>
739    
# Line 787  Line 745 
745    </target>    </target>
746    
747    
   
   <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>  
   
748    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
749            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
750    
751      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
752    
753    </target>    </target>
754    
# Line 814  Line 756 
756    
757    
758    <target name="jsr166ycompile"    <target name="jsr166ycompile"
759            depends="init, configure-compiler"            depends="configure-compiler"
760            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
761    
762      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.dir}"/>
763    
764      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
765            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.dir}"
766              debug="${build.debug}"             debug="${build.debug}"
767         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
768        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
769             source="${build.sourcelevel}"             source="6"
770               fork="true">             classpath=""
771               bootclasspath="${bootclasspath6}"
772               includeAntRuntime="false"
773               includeJavaRuntime="false"
774               executable="${javac7}"
775               fork="true">
776    
777        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
778        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
779        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
780        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
781      </javac>      </javac>
   
782    </target>    </target>
783    
784    
   
785    <target name="jsr166yjar"    <target name="jsr166yjar"
786            depends="jsr166ycompile"            depends="jsr166ycompile"
787            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
788    
789      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
   
     <jar destfile="${jsr166yproduct.jar}" index="true">  
790        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.dir}"/>
791      </jar>      </jar>
792    
# Line 855  Line 795 
795    
796    
797    <target name="jsr166ydocs"    <target name="jsr166ydocs"
798            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
799    
800      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
801      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
802    
803      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
804               packagenames="jsr166y"               packagenames="jsr166y.*"
805               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
806               source="${build.sourcelevel}"               source="6"
807               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
808                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
809                 executable="${javadoc7}"
810               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
811    
812    </target>    </target>
813    
814    
815    <target name="jsr166ydist"    <target name="jsr166ydist"
816            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
817            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
818    
819    
820    
821    <target name="jsr166yclean"    <target name="jsr166yclean"
822            description="Removes all build products">            description="Removes all jsr166y build products">
823    
824      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
825    
826    </target>    </target>
827    
# Line 891  Line 832 
832    
833    </target>    </target>
834    
   <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>  
   
835    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
836            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
837    
838      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
839    
840    </target>    </target>
841    
# Line 918  Line 844 
844    
845    
846    <target name="extra166ycompile"    <target name="extra166ycompile"
847            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
848            description="Compiles extra166y sources">            description="Compiles extra166y sources">
849    
850      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.dir}"/>
851    
852      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
853            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.dir}"
854              debug="${build.debug}"             debug="${build.debug}"
855              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
856         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
857        deprecation="${build.deprecation}"             classpath=""
858             source="${build.sourcelevel}"             source="6"
859               fork="true">             bootclasspath="${jsr166y.jar}:${bootclasspath6}"
860               includeAntRuntime="false"
861               includeJavaRuntime="false"
862               executable="${javac7}"
863               fork="true">
864    
865        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
866        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
867        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
868        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
869    
870      </javac>      </javac>
871    
# Line 949  Line 877 
877            depends="extra166ycompile"            depends="extra166ycompile"
878            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
879    
880      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
   
     <jar destfile="${extra166yproduct.jar}" index="true">  
881        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
882      </jar>      </jar>
883    
# Line 960  Line 886 
886    
887    
888    <target name="extra166ydocs"    <target name="extra166ydocs"
889            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
890    
891      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
892      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
893    
894      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
895               packagenames="extra166y"               packagenames="extra166y.*"
896               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
897               source="${build.sourcelevel}"               source="6"
898               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
899                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
900                 executable="${javadoc7}"
901               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
902    
903    </target>    </target>
904    
905    
906    <target name="extra166ydist"    <target name="extra166ydist"
907            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
908            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
909    
910    
911    
912    <target name="extra166yclean"    <target name="extra166yclean"
913            description="Removes all build products">            description="Removes all extra166y build products">
914    
915      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
916    
917    </target>    </target>
918    
# Line 996  Line 923 
923    
924    </target>    </target>
925    
   <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>  
   
926    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
927            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
928    
929      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
930    
931    </target>    </target>
932    
# Line 1031  Line 943 
943             debug="${build.debug}"             debug="${build.debug}"
944             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
945             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
946             source="1.7"             source="7"
947             classpath=""             classpath=""
948             includeAntRuntime="false"             includeAntRuntime="false"
949             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1053  Line 965 
965            depends="jsr166ecompile"            depends="jsr166ecompile"
966            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
967    
968      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
   
     <jar destfile="${jsr166eproduct.jar}" index="true">  
969        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
970      </jar>      </jar>
971    
# Line 1064  Line 974 
974    
975    
976    <target name="jsr166edocs"    <target name="jsr166edocs"
977            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
978    
979      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
980      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
981    
982      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
983               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
984               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
985               source="1.7"               source="7"
986               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
987               executable="${javadoc7}"               executable="${javadoc7}"
988               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
989      </javadoc>      </javadoc>
990    
991    </target>    </target>
992    
993    
994    <target name="jsr166edist"    <target name="jsr166edist"
995            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
996            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
997    
998    
999    
1000    <target name="jsr166eclean"    <target name="jsr166eclean"
1001            description="Removes all build products">            description="Removes all jsr166e build products">
1002    
1003      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
1004    
1005    </target>    </target>
1006    
1007    
   
1008    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1009            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1010    
1011    </target>    </target>
1012    
   <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>  
   
1013    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1014            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1015    
1016      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1017    
1018    </target>    </target>
1019    
Legend:
Removed from v.1.99  
changed lines
  Added in v.1.111
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27