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

Diff of /jsr166/build.xml

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

revision 1.118 by jsr166, Mon Jan 21 01:05:01 2013 UTC revision 1.130 by jsr166, Mon Jan 28 22:00:34 2013 UTC
# Line 25  Line 25 
25  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
26    </description>    </description>
27    
28    <target name="usage" description="Advises user to run with -projecthelp">    <target name="usage" description="Display main targets by running 'ant -projecthelp'">
29      <echo>Run "ant -projecthelp" for full usage information.</echo>      <java classname="org.apache.tools.ant.Main">
30          <arg value="-projecthelp" />
31        </java>
32    </target>    </target>
33    
34    
# Line 39  Line 41 
41    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
42    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
43    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
44      <property name="build.javadoc.access" value="protected"/>
45    
46    <!-- Build locations -->    <!-- Build locations -->
47    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 57  Line 60 
60    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
61    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
62    
63    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>    <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
64    <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>    <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
65    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>    <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
66    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>    <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
67    
68    <!-- JDK locations -->    <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 86  Line 89 
89      </sequential>      </sequential>
90    </macrodef>    </macrodef>
91    
92      <macrodef name="mirror-dir">
93        <attribute name="src"/>
94        <attribute name="dst"/>
95        <sequential>
96        <delete dir="@{dst}"/>
97        <mkdir dir="@{dst}"/>
98        <copy todir="@{dst}" preservelastmodified="true">
99          <fileset dir="@{src}"/>
100        </copy>
101        </sequential>
102      </macrodef>
103    
104    <defjdklocations v="6"/>    <defjdklocations v="6"/>
105    <defjdklocations v="7"/>    <defjdklocations v="7"/>
106    <defjdklocations v="8"/>    <defjdklocations v="8"/>
# Line 105  Line 120 
120    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
121    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
122    
123    <!-- Distribution locations -->    <!-- Javadoc locations -->
124    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
125    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
126    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
127    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
128    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
129    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
130    
131      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
132      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
133      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
134      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
135      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
136      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
137    
138    <!-- Jar locations -->    <!-- Jar locations -->
139    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128  Line 150 
150    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
151    
152    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
153    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
154    <!-- <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/"/> -->
155    
156    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
# Line 146  Line 168 
168    </path>    </path>
169    
170    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
171        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
172        <attribute name="source" default="6"/>
173      <attribute name="target"/>      <attribute name="target"/>
174      <attribute name="workdir"/>      <attribute name="workdir"/>
175      <attribute name="product.jar" default="${product.jar}"/>      <attribute name="classes"/>
176      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
177      <sequential>      <sequential>
178    
179      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
180    
181      <javac srcdir="${tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
182             destdir="@{workdir}/tck-classes"             destdir="@{workdir}/tck-classes"
183             debug="${build.debug}"             debug="${build.debug}"
184             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
185             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
186             source="6"             source="@{source}"
187             classpath="${junit.jar}"             classpath="${junit.jar}"
188               bootclasspath="@{classes}:${bootclasspath@{source}}"
189             includeAntRuntime="false"             includeAntRuntime="false"
190             includeJavaRuntime="false"             includeJavaRuntime="false"
191             executable="${javac@{target}}"             executable="${javac@{target}}"
192             fork="true">             fork="true">
193    
194        <include name="**/*.java"/>        <include name="*.java"/>
       <bootclasspath path="@{product.jar}"/>  
       <bootclasspath path="${bootclasspath6}"/>  
195        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
196        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
197        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 179  Line 202 
202            failonerror="true"            failonerror="true"
203            jvm="${java@{target}}"            jvm="${java@{target}}"
204            fork="true">            fork="true">
205          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
206          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
207          <classpath>          <classpath>
208            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
# Line 196  Line 219 
219    </path>    </path>
220    
221    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
222    <!-- TODO: How do we get &trade to work? -->    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <!-- TODO: Why isn't @jls a "standard" tag? -->  
   <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->  
   <property name="javadoc.jls.cite" value="The Java Language Specification"/>  
223    <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;:"/>
224    
225    <!-- Main targets -->    <!-- Main targets -->
# Line 252  Line 272 
272    <target name="docs"    <target name="docs"
273            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
274    
275      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
276      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
277    
278      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
279      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
280    
281      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
282               packagenames="none"               packagenames="none"
283               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
284               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
285                 access="${build.javadoc.access}"
286                 sourcepath="${src.dir}:${jdk8src.dir}"
287               classpath=""               classpath=""
288               executable="${javadoc8}">               executable="${javadoc8}">
       <sourcepath path="${src.dir}"/>  
       <sourcepath path="${jdk8src.dir}"/>  
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
289        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
290          <include name="**/*.java"/>          <include name="**/*.java"/>
291        </fileset>        </fileset>
292          <arg value="-XDignore.symbol.file=true"/>
293          <arg value="-tag"/>
294          <arg value="${javadoc.jls.option}"/>
295      </javadoc>      </javadoc>
296    </target>    </target>
297    
298    
299    <target name="dist"    <target name="dist"
300            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
301            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
302    
303    
# Line 320  Line 340 
340    
341    <target name="dist-jar"    <target name="dist-jar"
342            depends="clean, jar">            depends="clean, jar">
   
343      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
344      </target>
345    
346      <target name="dist-docs"
347              depends="clean, docs">
348        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
349    </target>    </target>
350    
351    
# Line 338  Line 361 
361             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
362             source="6"             source="6"
363             classpath="${junit.jar}"             classpath="${junit.jar}"
364               bootclasspath="@{product.jar}:${bootclasspath6}"
365             includeAntRuntime="false"             includeAntRuntime="false"
366             includeJavaRuntime="false"             includeJavaRuntime="false"
367             executable="${javac8}"             executable="${javac8}"
368             fork="true">             fork="true">
369    
370        <include name="**/*.java"/>        <include name="**/*.java"/>
       <bootclasspath path="@{product.jar}"/>  
       <bootclasspath path="${bootclasspath6}"/>  
371        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
372        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
373        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 359  Line 381 
381             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
382             source="6"             source="6"
383             classpath=""             classpath=""
384               bootclasspath="@{product.jar}:${bootclasspath6}"
385             includeAntRuntime="false"             includeAntRuntime="false"
386             includeJavaRuntime="false"             includeJavaRuntime="false"
387             executable="${javac8}"             executable="${javac8}"
388             fork="true">             fork="true">
389    
390        <include name="jsr166/test/**/*.java"/>        <include name="jsr166/test/**/*.java"/>
       <bootclasspath path="${product.jar}"/>  
       <bootclasspath path="${bootclasspath6}"/>  
391        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
392        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
393        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 550  Line 571 
571             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
572             source="6"             source="6"
573             classpath=""             classpath=""
574               bootclasspath="${bootclasspath6}"
575             includeAntRuntime="false"             includeAntRuntime="false"
576             includeJavaRuntime="false"             includeJavaRuntime="false"
577             executable="${javac7}"             executable="${javac7}"
578             fork="true">             fork="true">
579    
580        <include name="**/*.java"/>        <include name="**/*.java"/>
       <bootclasspath path="${bootclasspath6}"/>  
581        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
582        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
583        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 565  Line 586 
586    </target>    </target>
587    
588    
589    <target name="4jdk7-jar"    <target name="4jdk7jar"
590            depends="4jdk7compile"            depends="4jdk7compile"
591            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
592    
# Line 577  Line 598 
598    
599    
600    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
601            depends="4jdk7-jar"            depends="4jdk7jar"
602            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
603    
604      <run-tck-tests      <run-tck-tests
605        target="7"        target="7"
606        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
607        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}"/>
608    </target>    </target>
609    
610    
# Line 646  Line 667 
667    <target name="4jdk7docs"    <target name="4jdk7docs"
668            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
669    
670      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
671      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
672    
673      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
674               packagenames="none"               packagenames="none"
675               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
676               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
677                 access="${build.javadoc.access}"
678                 sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
679               classpath=""               classpath=""
680               executable="${javadoc7}">               executable="${javadoc7}">
       <sourcepath path="${4jdk7src.dir}"/>  
       <sourcepath path="${jdk7src.dir}"/>  
       <arg value="-XDignore.symbol.file=true"/>  
681        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
682          <include name="**/*.java"/>          <include name="**/*.java"/>
683        </fileset>        </fileset>
684          <arg value="-XDignore.symbol.file=true"/>
685      </javadoc>      </javadoc>
686    </target>    </target>
687    
688    
689    <target name="4jdk7dist"    <target name="4jdk7dist"
690            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
691            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
692    
693    
# Line 684  Line 705 
705    </target>    </target>
706    
707    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
708            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
709      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
710      </target>
711    
712    
713      <target name="4jdk7dist-docs"
714              depends="4jdk7clean, 4jdk7docs">
715        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
716    </target>    </target>
717    
718    
# Line 705  Line 730 
730             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
731             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
732             classpath=""             classpath=""
733               bootclasspath="${bootclasspath6}"
734             source="5"             source="5"
735             includeAntRuntime="false"             includeAntRuntime="false"
736             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 712  Line 738 
738             fork="true">             fork="true">
739    
740        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <bootclasspath path="${bootclasspath6}"/>  
741        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
742        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
743        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 721  Line 746 
746    </target>    </target>
747    
748    
749    <target name="jsr166x-jar"    <target name="jsr166xjar"
750            depends="jsr166xcompile"            depends="jsr166xcompile"
751            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
752    
# Line 735  Line 760 
760    <target name="jsr166xdocs"    <target name="jsr166xdocs"
761            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
762    
763      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
764      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
765    
766      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
767               packagenames="jsr166x.*"               packagenames="jsr166x.*"
768               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
769                 access="${build.javadoc.access}"
770                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
771                 bootclasspath="${bootclasspath6}"
772               source="5"               source="5"
773               executable="${javadoc7}">               executable="${javadoc7}">
       <sourcepath path="${topsrc.dir}"/>  
       <sourcepath path="${jdk6src.dir}"/>  
       <bootclasspath path="${bootclasspath6}"/>  
774        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
775    
776      </javadoc>      </javadoc>
# Line 753  Line 778 
778    
779    
780    <target name="jsr166xdist"    <target name="jsr166xdist"
781            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
782            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
783    
784    
# Line 772  Line 797 
797    
798    
799    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
800            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
801      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
802      </target>
803    
804      <target name="jsr166xdist-docs"
805              depends="jsr166xclean, jsr166xdocs">
806        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
807    </target>    </target>
808    
809    <!-- jsr166y -->    <!-- jsr166y -->
# Line 794  Line 822 
822             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
823             source="6"             source="6"
824             classpath=""             classpath=""
825               bootclasspath="${bootclasspath6}"
826             includeAntRuntime="false"             includeAntRuntime="false"
827             includeJavaRuntime="false"             includeJavaRuntime="false"
828             executable="${javac7}"             executable="${javac7}"
829             fork="true">             fork="true">
830    
831        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <bootclasspath path="${bootclasspath6}"/>  
832        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
833        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
834        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 809  Line 837 
837    </target>    </target>
838    
839    
840    <target name="jsr166y-jar"    <target name="jsr166yjar"
841            depends="jsr166ycompile"            depends="jsr166ycompile"
842            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
843    
# Line 823  Line 851 
851    <target name="jsr166ydocs"    <target name="jsr166ydocs"
852            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
853    
854      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
855      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
856    
857      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
858               packagenames="jsr166y.*"               packagenames="jsr166y.*"
859               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
860                 access="${build.javadoc.access}"
861                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
862                 bootclasspath="${bootclasspath6}"
863               source="6"               source="6"
864               executable="${javadoc7}">               executable="${javadoc7}">
       <sourcepath path="${topsrc.dir}"/>  
       <sourcepath path="${jdk6src.dir}"/>  
       <bootclasspath path="${bootclasspath6}"/>  
865        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
866    
867      </javadoc>      </javadoc>
# Line 841  Line 869 
869    
870    
871    <target name="jsr166ydist"    <target name="jsr166ydist"
872            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
873            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
874    
875    
# Line 859  Line 887 
887    </target>    </target>
888    
889    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
890            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
891      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
892      </target>
893    
894      <target name="jsr166ydist-docs"
895              depends="jsr166yclean, jsr166ydocs">
896        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
897    </target>    </target>
898    
899    
# Line 870  Line 901 
901    
902    
903    <target name="extra166ycompile"    <target name="extra166ycompile"
904            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
905            description="Compiles extra166y sources">            description="Compiles extra166y sources">
906    
907      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 880  Line 911 
911             debug="${build.debug}"             debug="${build.debug}"
912             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
913             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
914               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
915             classpath=""             classpath=""
916             source="6"             source="6"
917             includeAntRuntime="false"             includeAntRuntime="false"
# Line 888  Line 920 
920             fork="true">             fork="true">
921    
922        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <bootclasspath path="${jsr166y.jar}"/>  
       <bootclasspath path="${bootclasspath6}"/>  
923        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
924        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
925        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 898  Line 928 
928    </target>    </target>
929    
930    
931    <target name="extra166y-jar"    <target name="extra166yjar"
932            depends="extra166ycompile"            depends="extra166ycompile"
933            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
934    
# Line 912  Line 942 
942    <target name="extra166ydocs"    <target name="extra166ydocs"
943            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
944    
945      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
946      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
947    
948      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
949               packagenames="extra166y.*"               packagenames="extra166y.*"
950               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
951                 access="${build.javadoc.access}"
952                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
953                 bootclasspath="${bootclasspath6}"
954               source="6"               source="6"
955               executable="${javadoc7}">               executable="${javadoc7}">
       <sourcepath path="${topsrc.dir}"/>  
       <sourcepath path="${jdk6src.dir}"/>  
       <bootclasspath path="${bootclasspath6}"/>  
956        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
957    
958      </javadoc>      </javadoc>
# Line 930  Line 960 
960    
961    
962    <target name="extra166ydist"    <target name="extra166ydist"
963            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
964            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
965    
966    
# Line 948  Line 978 
978    </target>    </target>
979    
980    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
981            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
982      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
983      </target>
984    
985      <target name="extra166ydist-docs"
986              depends="extra166yclean, extra166ydocs">
987        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
988    </target>    </target>
989    
990    <!-- jsr166e -->    <!-- jsr166e -->
# Line 983  Line 1016 
1016    </target>    </target>
1017    
1018    
1019    <target name="jsr166e-jar"    <target name="jsr166ejar"
1020            depends="jsr166ecompile"            depends="jsr166ecompile"
1021            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1022    
# Line 997  Line 1030 
1030    <target name="jsr166edocs"    <target name="jsr166edocs"
1031            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1032    
1033      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1034      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1035    
1036      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1037               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1038               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1039                 access="${build.javadoc.access}"
1040                 sourcepath="${topsrc.dir}:${jdk7src.dir}"
1041               source="7"               source="7"
1042               executable="${javadoc7}">               executable="${javadoc7}">
       <sourcepath path="${topsrc.dir}"/>  
       <sourcepath path="${jdk7src.dir}"/>  
1043        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1044    
1045      </javadoc>      </javadoc>
1046    </target>    </target>
1047    
1048    
1049      <target name="jsr166e-test-tck"
1050              depends="jsr166ejar"
1051              description="Runs tck tests for jsr166e">
1052    
1053        <run-tck-tests
1054          tck.src.dir="${test.src.dir}/tck-jsr166e"
1055          source="7"
1056          target="8"
1057          workdir="${build.jsr166e.dir}"
1058          classes="${jsr166e.jar}"/>
1059      </target>
1060    
1061    
1062    <target name="jsr166edist"    <target name="jsr166edist"
1063            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1064            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1065    
1066    
1067    <target name="jsr166eclean"    <target name="jsr166eclean"
1068            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1069      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1070    </target>    </target>
1071    
1072    
# Line 1032  Line 1076 
1076    </target>    </target>
1077    
1078    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1079            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166ejar">
   
1080      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1081      </target>
1082    
1083      <target name="jsr166edist-docs"
1084              depends="jsr166eclean, jsr166edocs">
1085        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1086    </target>    </target>
1087    
1088    
1089    <!-- Find buglets that can be detected by static build tools -->
1090    
1091      <target name="lint">
1092        <antcall target="dists">
1093          <param name="build.javadoc.access" value="private"/>
1094        </antcall>
1095      </target>
1096    
1097    
1098  </project>  </project>

Legend:
Removed from v.1.118  
changed lines
  Added in v.1.130

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