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

Diff of /jsr166/build.xml

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

revision 1.105 by jsr166, Sat Jan 19 21:54:53 2013 UTC revision 1.118 by jsr166, Mon Jan 21 01:05:01 2013 UTC
# Line 35  Line 35 
35    
36    
37    <!-- Compilation options -->    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 45  Line 45 
45    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
46    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.lib.dir"               location="${build.dir}/lib"/>  
   <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 -->    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61      <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62      <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63      <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64    
65      <!-- JDK locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
67    
68    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
# Line 81  Line 72 
72      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
73      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
74      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
     <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>  
75      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76      <property name="bootclasspath@{v}"      <local name="boot.jar.dir"/>
77       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
78        <path id="bootclasspath@{v}">
79          <pathelement path="${boot.jar.dir}/resources.jar"/>
80          <pathelement path="${boot.jar.dir}/rt.jar"/>
81          <pathelement path="${boot.jar.dir}/jsse.jar"/>
82          <pathelement path="${boot.jar.dir}/jce.jar"/>
83          <pathelement path="${boot.jar.dir}/charsets.jar"/>
84        </path>
85        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
86      </sequential>      </sequential>
87    </macrodef>    </macrodef>
88    
# Line 92  Line 90 
90    <defjdklocations v="7"/>    <defjdklocations v="7"/>
91    <defjdklocations v="8"/>    <defjdklocations v="8"/>
92    
   <macrodef name="run-tck-tests">  
     <attribute name="jvm"/>  
     <attribute name="tck.classes"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
     <sequential>  
     <java classname="JSR166TestCase"  
           jvm="@{jvm}" fork="true">  
         <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>  
         <jvmarg line="@{jvmflags}"/>  
         <classpath>  
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{tck.classes}"/>  
         </classpath>  
     </java>  
     </sequential>  
   </macrodef>  
   
93    <!-- Source locations -->    <!-- Source locations -->
94    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
95    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 124  Line 104 
104    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
105    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
106    <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"/>  
107    
108    <!-- Distribution locations -->    <!-- Distribution locations -->
109    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
110    <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
111    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
112    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
113    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
114    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
115    
116    <!-- Jar locations -->    <!-- Jar locations -->
117    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
118    <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
119    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
120    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
121    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
122    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
123    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
   
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
124    
125    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
126    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
# Line 154  Line 130 
130    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
131    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2012-11 -->
132    <!-- <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/"/> -->
133    
134      <!-- Default jdk api doc location (latest stable release seems best) -->
135    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
136    
137      <!-- Define the "jtreg" task -->
138      <!-- See the docs in "jtreg -onlineHelp" -->
139      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
140               classpath="${lib.dir}/jtreg.jar" />
141    
142    <!-- Test classpath -->    <!-- Test classpath -->
143    <path id="test.classpath">    <path id="test.classpath">
144      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
145      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
146    </path>    </path>
147    
148      <macrodef name="run-tck-tests">
149        <attribute name="target"/>
150        <attribute name="workdir"/>
151        <attribute name="product.jar" default="${product.jar}"/>
152        <attribute name="jvmflags" default=""/>
153        <sequential>
154    
155        <mkdir dir="@{workdir}/tck-classes"/>
156    
157        <javac srcdir="${tck.src.dir}"
158               destdir="@{workdir}/tck-classes"
159               debug="${build.debug}"
160               debuglevel="${build.debuglevel}"
161               deprecation="${build.deprecation}"
162               source="6"
163               classpath="${junit.jar}"
164               includeAntRuntime="false"
165               includeJavaRuntime="false"
166               executable="${javac@{target}}"
167               fork="true">
168    
169          <include name="**/*.java"/>
170          <bootclasspath path="@{product.jar}"/>
171          <bootclasspath path="${bootclasspath6}"/>
172          <compilerarg value="-XDignore.symbol.file=true"/>
173          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
174          <compilerarg line="${build.args}"/>
175    
176        </javac>
177    
178        <java classname="JSR166TestCase"
179              failonerror="true"
180              jvm="${java@{target}}"
181              fork="true">
182            <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
183            <jvmarg line="@{jvmflags}"/>
184            <classpath>
185              <pathelement location="${junit.jar}"/>
186              <pathelement location="@{workdir}/tck-classes"/>
187            </classpath>
188        </java>
189    
190        </sequential>
191      </macrodef>
192    
193    <!-- ALoops classpath -->    <!-- ALoops classpath -->
194    <path id="loops.classpath">    <path id="loops.classpath">
195      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 177  Line 205 
205    <!-- Main targets -->    <!-- Main targets -->
206    
207    <target name="dists"    <target name="dists"
208            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
209            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
210    
211    <target name="compile"    <target name="compile"
# Line 198  Line 226 
226             fork="true">             fork="true">
227    
228        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
229        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
230        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
231        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
232    
233      </javac>      </javac>
   
234    </target>    </target>
235    
236    
   
237    <target name="jar"    <target name="jar"
238            depends="compile"            depends="compile"
239            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
240    
     <mkdir dir="${build.lib.dir}"/>  
   
241      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
242        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
243      </jar>      </jar>
   
244    </target>    </target>
245    
246    
   
247    <target name="test"    <target name="test"
248            depends="configure-tests, report-tests"            depends="configure-tests, report-tests"
249            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)" />
250    
251    
   
252    <target name="docs"    <target name="docs"
253            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
254    
# Line 247  Line 262 
262               packagenames="none"               packagenames="none"
263               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
264               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
              sourcepath="${src.dir}:${jdk8src.dir}"  
265               classpath=""               classpath=""
266               executable="${javadoc8}">               executable="${javadoc8}">
267          <sourcepath path="${src.dir}"/>
268          <sourcepath path="${jdk8src.dir}"/>
269        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
270        <arg value="-tag"/>        <arg value="-tag"/>
271        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
# Line 257  Line 273 
273          <include name="**/*.java"/>          <include name="**/*.java"/>
274        </fileset>        </fileset>
275      </javadoc>      </javadoc>
   
276    </target>    </target>
277    
278    
   
279    <target name="dist"    <target name="dist"
280            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, docs"
281            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
# Line 282  Line 296 
296        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
297        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
298      </jar>      </jar>
   
299    </target>    </target>
300    
301    
   
302    <target name="clean"    <target name="clean"
303            description="Removes all build products">            description="Removes all build products">
304    
305      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
306    
307    </target>    </target>
308    
309    
   
310    <target name="dist-clean"    <target name="dist-clean"
311            description="Removes all build and distribution products">            description="Removes all build and distribution products">
312    
# Line 306  Line 315 
315    </target>    </target>
316    
317    
   
318    <!-- Internal targets -->    <!-- Internal targets -->
319    
320    
# Line 324  Line 332 
332      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
333    
334      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
335            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
336              debug="${build.debug}"             debug="${build.debug}"
337         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
338        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
339             source="${build.sourcelevel}"             source="6"
340               fork="true">             classpath="${junit.jar}"
341               includeAntRuntime="false"
342               includeJavaRuntime="false"
343               executable="${javac8}"
344               fork="true">
345    
346        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
347        <compilerarg line="${build.args}"/>        <bootclasspath path="@{product.jar}"/>
348          <bootclasspath path="${bootclasspath6}"/>
349        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
350          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
351        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
352    
353      </javac>      </javac>
354    
355      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
356            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
357              debug="${build.debug}"             debug="${build.debug}"
358         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
359        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
360             source="${build.sourcelevel}"             source="6"
361               fork="true">             classpath=""
362               includeAntRuntime="false"
363        <include name="jsr166/test/**"/>             includeJavaRuntime="false"
364               executable="${javac8}"
365               fork="true">
366    
367        <compilerarg value="${bootclasspath.args}"/>        <include name="jsr166/test/**/*.java"/>
368        <compilerarg line="${build.args}"/>        <bootclasspath path="${product.jar}"/>
369          <bootclasspath path="${bootclasspath6}"/>
370        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
371          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
372        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
373    
374      </javac>      </javac>
375    
# Line 366  Line 382 
382             source="${build.sourcelevel}"             source="${build.sourcelevel}"
383               fork="true">               fork="true">
384    
385        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
386        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
387          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
388    
389      </javac>      </javac>
390  -->  -->
# Line 391  Line 405 
405            errorProperty="junit.failed"            errorProperty="junit.failed"
406          failureProperty="junit.failed"          failureProperty="junit.failed"
407                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
408                        jvm="${java8}"
409                     fork="true">                     fork="true">
410    
411        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
412        <jvmarg value="-server"/>        <jvmarg value="-server"/>
413        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
414    
# Line 522  Line 537 
537    
538    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
539    
   
540    <target name="4jdk7compile"    <target name="4jdk7compile"
541            depends="configure-compiler"            depends="configure-compiler"
542            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 534  Line 548 
548             debug="${build.debug}"             debug="${build.debug}"
549             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
550             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
551             source="1.6"             source="6"
552             classpath=""             classpath=""
            bootclasspath="${bootclasspath6}"  
553             includeAntRuntime="false"             includeAntRuntime="false"
554             includeJavaRuntime="false"             includeJavaRuntime="false"
555             executable="${javac7}"             executable="${javac7}"
556             fork="true">             fork="true">
557    
558        <include name="**/*.java"/>        <include name="**/*.java"/>
559        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
560        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
561        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
562          <compilerarg line="${build.args}"/>
563    
564      </javac>      </javac>
565      </target>
566    
567    
568      <mkdir dir="${build.4jdk7.lib.dir}"/>    <target name="4jdk7-jar"
569              depends="4jdk7compile"
570              description="Builds library jar from compiled sources">
571    
572      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}">
573        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
574      </jar>      </jar>
575    
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.4jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="1.6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
   
     </javac>  
   
576    </target>    </target>
577    
578    
579    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
580            depends="4jdk7compile"            depends="4jdk7-jar"
581            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
582    
583      <run-tck-tests      <run-tck-tests
584        jvm="${java7}"        target="7"
585        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
586        product.jar="${4jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
587    </target>    </target>
588    
# Line 618  Line 615 
615      </junit>      </junit>
616    </target>    </target>
617    
618      <target name="4jdk7-test-jtreg"
619              depends="4jdk7compile"
620              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
621        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
622        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
623        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
624        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
625        <jtreg dir="${jtreg.src.dir}"
626               jdk="${jdk7.home}"
627               workDir="${build.4jdk7.dir}/JTwork"
628               reportDir="${build.4jdk7.dir}/JTreport">
629    
630          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
631          <arg value="-agentvm"/>
632          <arg value="-v:nopass,fail"/>
633          <arg value="-vmoptions:-esa -ea"/>
634          <arg value="-automatic"/>
635          <arg value="-k:!ignore"/>
636        </jtreg>
637      </target>
638    
639    
640      <target name="4jdk7-test"
641              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
642              description="Runs tck and jtreg tests for jsr166-4jdk7">
643      </target>
644    
645    
646    <target name="4jdk7docs"    <target name="4jdk7docs"
647            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
# Line 629  Line 653 
653               packagenames="none"               packagenames="none"
654               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
655               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"  
656               classpath=""               classpath=""
657               executable="${javadoc7}">               executable="${javadoc7}">
658          <sourcepath path="${4jdk7src.dir}"/>
659          <sourcepath path="${jdk7src.dir}"/>
660        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
661        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
662          <include name="**/*.java"/>          <include name="**/*.java"/>
663        </fileset>        </fileset>
664      </javadoc>      </javadoc>
   
665    </target>    </target>
666    
667    
# Line 646  Line 670 
670            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
671    
672    
   
673    <target name="4jdk7clean"    <target name="4jdk7clean"
674            description="Removes all build products">            description="Removes all 4jdk7 build products">
675    
676      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
677    
678    </target>    </target>
679    
680    
   
681    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
682            description="Removes all build and distribution products">            description="Removes all build and distribution products">
683    
684    </target>    </target>
685    
686    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
687            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7-jar">
688    
689      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
690    
691    </target>    </target>
692    
   <!-- jsr166x -->  
693    
694      <!-- jsr166x -->
695    
696    <target name="jsr166xcompile"    <target name="jsr166xcompile"
697            depends="configure-compiler"            depends="configure-compiler"
698            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
699    
700      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
701    
702      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
703             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
704             debug="${build.debug}"             debug="${build.debug}"
705             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
706             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
707             classpath=""             classpath=""
708             source="1.5"             source="5"
            bootclasspath="${bootclasspath6}"  
709             includeAntRuntime="false"             includeAntRuntime="false"
710             includeJavaRuntime="false"             includeJavaRuntime="false"
711             executable="${javac7}"             executable="${javac7}"
712             fork="true">             fork="true">
713    
714        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
715        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
716        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
717        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
718          <compilerarg line="${build.args}"/>
719    
720      </javac>      </javac>
   
721    </target>    </target>
722    
723    
724      <target name="jsr166x-jar"
   <target name="jsr166xjar"  
725            depends="jsr166xcompile"            depends="jsr166xcompile"
726            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
727    
728      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
729          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
730      </jar>      </jar>
731    
732    </target>    </target>
733    
734    
   
735    <target name="jsr166xdocs"    <target name="jsr166xdocs"
736            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
737    
738      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
739      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
740    
741      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
742               packagenames="jsr166x"               packagenames="jsr166x.*"
743               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
744               source="${build.sourcelevel}"               source="5"
745               sourcepath="${topsrc.dir}:${jdksrc.dir}"               executable="${javadoc7}">
746               additionalparam="-XDignore.symbol.file=true" />        <sourcepath path="${topsrc.dir}"/>
747          <sourcepath path="${jdk6src.dir}"/>
748          <bootclasspath path="${bootclasspath6}"/>
749          <arg value="-XDignore.symbol.file=true"/>
750    
751        </javadoc>
752    </target>    </target>
753    
754    
755    <target name="jsr166xdist"    <target name="jsr166xdist"
756            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
757            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
758    
759    
   
760    <target name="jsr166xclean"    <target name="jsr166xclean"
761            description="Removes all build products">            description="Removes all jsr166x build products">
762    
763      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
764    
765    </target>    </target>
766    
767    
   
768    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
769            description="Removes all build and distribution products">            description="Removes all build and distribution products">
770    
771    </target>    </target>
772    
773    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs to dist dir">  
   
     <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>  
   
774    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
775            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166x-jar">
776    
777      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
778    
779    </target>    </target>
780    
# Line 783  Line 785 
785            depends="configure-compiler"            depends="configure-compiler"
786            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
787    
788      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
789    
790      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
791             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
792             debug="${build.debug}"             debug="${build.debug}"
793             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
794             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
795             source="1.6"             source="6"
796             classpath=""             classpath=""
            bootclasspath="${bootclasspath6}"  
797             includeAntRuntime="false"             includeAntRuntime="false"
798             includeJavaRuntime="false"             includeJavaRuntime="false"
799             executable="${javac7}"             executable="${javac7}"
800             fork="true">             fork="true">
801    
802        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
803        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
804        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
805        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
806          <compilerarg line="${build.args}"/>
807    
808      </javac>      </javac>
809    </target>    </target>
810    
811    
812    <target name="jsr166yjar"    <target name="jsr166y-jar"
813            depends="jsr166ycompile"            depends="jsr166ycompile"
814            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
815    
816      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
817          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
818      </jar>      </jar>
819    
820    </target>    </target>
821    
822    
   
823    <target name="jsr166ydocs"    <target name="jsr166ydocs"
824            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
825    
826      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
827      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
828    
829      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
830               packagenames="jsr166y"               packagenames="jsr166y.*"
831               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
832               source="${build.sourcelevel}"               source="6"
833               sourcepath="${topsrc.dir}:${jdksrc.dir}"               executable="${javadoc7}">
834               additionalparam="-XDignore.symbol.file=true" />        <sourcepath path="${topsrc.dir}"/>
835          <sourcepath path="${jdk6src.dir}"/>
836          <bootclasspath path="${bootclasspath6}"/>
837          <arg value="-XDignore.symbol.file=true"/>
838    
839        </javadoc>
840    </target>    </target>
841    
842    
843    <target name="jsr166ydist"    <target name="jsr166ydist"
844            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
845            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
846    
847    
   
848    <target name="jsr166yclean"    <target name="jsr166yclean"
849            description="Removes all build products">            description="Removes all jsr166y build products">
850    
851      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
852    
853    </target>    </target>
854    
855    
   
856    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
857            description="Removes all build and distribution products">            description="Removes all build and distribution products">
858    
859    </target>    </target>
860    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <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>  
   
861    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
862            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166y-jar">
863    
864      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
865    
866    </target>    </target>
867    
# Line 884  Line 870 
870    
871    
872    <target name="extra166ycompile"    <target name="extra166ycompile"
873            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166y-jar"
874            description="Compiles extra166y sources">            description="Compiles extra166y sources">
875    
876      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
877    
878      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
879             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
880             debug="${build.debug}"             debug="${build.debug}"
881             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
882             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
883             classpath=""             classpath=""
884             source="1.6"             source="6"
            bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"  
885             includeAntRuntime="false"             includeAntRuntime="false"
886             includeJavaRuntime="false"             includeJavaRuntime="false"
887             executable="${javac7}"             executable="${javac7}"
888             fork="true">             fork="true">
889    
890        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
891        <compilerarg line="${build.args}"/>        <bootclasspath path="${jsr166y.jar}"/>
892          <bootclasspath path="${bootclasspath6}"/>
893        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
894        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
895          <compilerarg line="${build.args}"/>
896    
897      </javac>      </javac>
   
898    </target>    </target>
899    
900    
901      <target name="extra166y-jar"
   <target name="extra166yjar"  
902            depends="extra166ycompile"            depends="extra166ycompile"
903            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
904    
905      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
906          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
907      </jar>      </jar>
908    
909    </target>    </target>
910    
911    
   
912    <target name="extra166ydocs"    <target name="extra166ydocs"
913            description="Builds javadocs with custom tags to build dir">            description="Builds javadocs to build dir">
914    
915      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
916      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
917    
918      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
919               packagenames="extra166y"               packagenames="extra166y.*"
920               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
921               source="${build.sourcelevel}"               source="6"
922               sourcepath="${topsrc.dir}:${jdksrc.dir}"               executable="${javadoc7}">
923               additionalparam="-XDignore.symbol.file=true" />        <sourcepath path="${topsrc.dir}"/>
924          <sourcepath path="${jdk6src.dir}"/>
925          <bootclasspath path="${bootclasspath6}"/>
926          <arg value="-XDignore.symbol.file=true"/>
927    
928        </javadoc>
929    </target>    </target>
930    
931    
932    <target name="extra166ydist"    <target name="extra166ydist"
933            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
934            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
935    
936    
   
937    <target name="extra166yclean"    <target name="extra166yclean"
938            description="Removes all build products">            description="Removes all extra166y build products">
939    
940      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
941    
942    </target>    </target>
943    
944    
   
945    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
946            description="Removes all build and distribution products">            description="Removes all build and distribution products">
947    
948    </target>    </target>
949    
   <target name="extra166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <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>  
   
950    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
951            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166y-jar">
952    
953      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
954    
955    </target>    </target>
956    
# Line 992  Line 960 
960            depends="configure-compiler"            depends="configure-compiler"
961            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
962    
963      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
964    
965      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
966             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
967             debug="${build.debug}"             debug="${build.debug}"
968             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
969             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
970             source="1.7"             source="7"
971             classpath=""             classpath=""
972             includeAntRuntime="false"             includeAntRuntime="false"
973             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1007  Line 975 
975             fork="true">             fork="true">
976    
977        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
978        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
979        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
980          <compilerarg line="${build.args}"/>
981    
982      </javac>      </javac>
   
983    </target>    </target>
984    
985    
986      <target name="jsr166e-jar"
   <target name="jsr166ejar"  
987            depends="jsr166ecompile"            depends="jsr166ecompile"
988            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
989    
990      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
991          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
992      </jar>      </jar>
993    
994    </target>    </target>
995    
996    
   
997    <target name="jsr166edocs"    <target name="jsr166edocs"
998            description="Builds javadocs with custom tags to build dir">            description="Builds javadocs to build dir">
999    
1000      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
1001      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1002    
1003      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1004               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
1005               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
1006               source="1.7"               source="7"
1007               sourcepath="${topsrc.dir}:${jdk7src.dir}"               executable="${javadoc7}">
1008               executable="${javadoc7}"        <sourcepath path="${topsrc.dir}"/>
1009               additionalparam="-XDignore.symbol.file=true" >        <sourcepath path="${jdk7src.dir}"/>
1010        <fileset dir="${topsrc.dir}" defaultexcludes="yes">        <arg value="-XDignore.symbol.file=true"/>
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
     </javadoc>  
1011    
1012        </javadoc>
1013    </target>    </target>
1014    
1015    
1016    <target name="jsr166edist"    <target name="jsr166edist"
1017            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1018            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1019    
1020    
   
1021    <target name="jsr166eclean"    <target name="jsr166eclean"
1022            description="Removes all build products">            description="Removes all jsr166e build products">
1023    
1024      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
1025    
1026    </target>    </target>
1027    
1028    
   
1029    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1030            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1031    
1032    </target>    </target>
1033    
   <target name="jsr166edist-docs"  
           description="Builds javadocs to dist dir">  
   
     <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>  
   
1034    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1035            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166e-jar">
1036    
1037      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1038    
1039    </target>    </target>
1040    
Legend:
Removed from v.1.105  
changed lines
  Added in v.1.118
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27