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

Diff of /jsr166/build.xml

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

revision 1.101 by jsr166, Sat Jan 19 17:30:36 2013 UTC revision 1.119 by jsr166, Mon Jan 21 02:31:40 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               bootclasspath="@{product.jar}:${bootclasspath6}"
165               includeAntRuntime="false"
166               includeJavaRuntime="false"
167               executable="${javac@{target}}"
168               fork="true">
169    
170          <include name="JSR166TestCase.java"/>
171          <compilerarg value="-XDignore.symbol.file=true"/>
172          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
173          <compilerarg line="${build.args}"/>
174    
175        </javac>
176    
177        <java classname="JSR166TestCase"
178              failonerror="true"
179              jvm="${java@{target}}"
180              fork="true">
181            <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
182            <jvmarg line="@{jvmflags}"/>
183            <classpath>
184              <pathelement location="${junit.jar}"/>
185              <pathelement location="@{workdir}/tck-classes"/>
186            </classpath>
187        </java>
188    
189        </sequential>
190      </macrodef>
191    
192    <!-- ALoops classpath -->    <!-- ALoops classpath -->
193    <path id="loops.classpath">    <path id="loops.classpath">
194      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 177  Line 204 
204    <!-- Main targets -->    <!-- Main targets -->
205    
206    <target name="dists"    <target name="dists"
207            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
208            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
209    
210    <target name="compile"    <target name="compile"
211            depends="configure-compiler"            depends="configure-compiler"
212            description="Compiles src/main sources to build folder">            description="Compiles src/main sources to build dir">
213    
214      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
215    
# Line 198  Line 225 
225             fork="true">             fork="true">
226    
227        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
228        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
229        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
230        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
231    
232      </javac>      </javac>
   
233    </target>    </target>
234    
235    
   
236    <target name="jar"    <target name="jar"
237            depends="compile"            depends="compile"
238            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
239    
     <mkdir dir="${build.lib.dir}"/>  
   
240      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
241        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
242      </jar>      </jar>
   
243    </target>    </target>
244    
245    
   
246    <target name="test"    <target name="test"
247            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
248            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)" />
249    
250    
   
251    <target name="docs"    <target name="docs"
252            description="Builds javadocs for src/main">            description="Builds javadocs for src/main to dist dir">
253    
254      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
255      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
# Line 250  Line 264 
264               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
265               classpath=""               classpath=""
266               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
267        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
268          <include name="**/*.java"/>          <include name="**/*.java"/>
269        </fileset>        </fileset>
270          <arg value="-XDignore.symbol.file=true"/>
271          <arg value="-tag"/>
272          <arg value="${javadoc.jls.option}"/>
273      </javadoc>      </javadoc>
   
274    </target>    </target>
275    
276    
   
277    <target name="dist"    <target name="dist"
278            depends="init, dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, docs"
279            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
280    
281    
# Line 282  Line 294 
294        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
295        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
296      </jar>      </jar>
   
297    </target>    </target>
298    
299    
   
300    <target name="clean"    <target name="clean"
301            description="Removes all build products">            description="Removes all build products">
302    
303      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
304    
305    </target>    </target>
306    
307    
   
308    <target name="dist-clean"    <target name="dist-clean"
309            description="Removes all build and distribution products">            description="Removes all build and distribution products">
310    
# Line 306  Line 313 
313    </target>    </target>
314    
315    
   
316    <!-- Internal targets -->    <!-- Internal targets -->
317    
318    
   <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>  
   
   
319    <target name="dist-jar"    <target name="dist-jar"
320            depends="clean, jar">            depends="clean, jar">
321    
# Line 334  Line 330 
330      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
331    
332      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
333            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
334              debug="${build.debug}"             debug="${build.debug}"
335         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
336        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
337             source="${build.sourcelevel}"             source="6"
338               fork="true">             classpath="${junit.jar}"
339               bootclasspath="@{product.jar}:${bootclasspath6}"
340               includeAntRuntime="false"
341               includeJavaRuntime="false"
342               executable="${javac8}"
343               fork="true">
344    
345        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
346        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
347          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
348        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
349    
350      </javac>      </javac>
351    
352      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
353            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
354              debug="${build.debug}"             debug="${build.debug}"
355         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
356        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
357             source="${build.sourcelevel}"             source="6"
358               fork="true">             classpath=""
359               bootclasspath="@{product.jar}:${bootclasspath6}"
360        <include name="jsr166/test/**"/>             includeAntRuntime="false"
361               includeJavaRuntime="false"
362               executable="${javac8}"
363               fork="true">
364    
365        <compilerarg value="${bootclasspath.args}"/>        <include name="jsr166/test/**/*.java"/>
       <compilerarg line="${build.args}"/>  
366        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
367          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
368        <classpath refid="test.classpath"/>        <compilerarg line="${build.args}"/>
369    
370      </javac>      </javac>
371    
# Line 376  Line 378 
378             source="${build.sourcelevel}"             source="${build.sourcelevel}"
379               fork="true">               fork="true">
380    
381        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
382        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
383          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
384    
385      </javac>      </javac>
386  -->  -->
# Line 401  Line 401 
401            errorProperty="junit.failed"            errorProperty="junit.failed"
402          failureProperty="junit.failed"          failureProperty="junit.failed"
403                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
404                        jvm="${java8}"
405                     fork="true">                     fork="true">
406    
407        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
408        <jvmarg value="-server"/>        <jvmarg value="-server"/>
409        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
410    
# Line 504  Line 505 
505    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
506    
507    
508    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
509            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
510    
511      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 532  Line 533 
533    
534    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
535    
   
536    <target name="4jdk7compile"    <target name="4jdk7compile"
537            depends="configure-compiler"            depends="configure-compiler"
538            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 544  Line 544 
544             debug="${build.debug}"             debug="${build.debug}"
545             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
546             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
547             source="1.6"             source="6"
548             classpath=""             classpath=""
549             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
550             includeAntRuntime="false"             includeAntRuntime="false"
# Line 553  Line 553 
553             fork="true">             fork="true">
554    
555        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
556        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
557        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
558          <compilerarg line="${build.args}"/>
559    
560      </javac>      </javac>
561      </target>
562    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
563    
564      <jar destfile="${4jdk7product.jar}" index="true">    <target name="4jdk7-jar"
565              depends="4jdk7compile"
566              description="Builds library jar from compiled sources">
567    
568        <jar destfile="${4jdk7product.jar}">
569        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
570      </jar>      </jar>
571    
     <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>  
   
572    </target>    </target>
573    
574    
575    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
576            depends="4jdk7compile"            depends="4jdk7-jar"
577            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
578    
579      <run-tck-tests      <run-tck-tests
580        jvm="${java7}"        target="7"
581        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
582        product.jar="${4jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
583    </target>    </target>
584    
# Line 628  Line 611 
611      </junit>      </junit>
612    </target>    </target>
613    
614      <target name="4jdk7-test-jtreg"
615              depends="4jdk7compile"
616              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
617        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
618        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
619        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
620        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
621        <jtreg dir="${jtreg.src.dir}"
622               jdk="${jdk7.home}"
623               workDir="${build.4jdk7.dir}/JTwork"
624               reportDir="${build.4jdk7.dir}/JTreport">
625    
626          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
627          <arg value="-agentvm"/>
628          <arg value="-v:nopass,fail"/>
629          <arg value="-vmoptions:-esa -ea"/>
630          <arg value="-automatic"/>
631          <arg value="-k:!ignore"/>
632        </jtreg>
633      </target>
634    
635    
636      <target name="4jdk7-test"
637              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
638              description="Runs tck and jtreg tests for jsr166-4jdk7">
639      </target>
640    
641    
642    <target name="4jdk7docs"    <target name="4jdk7docs"
643            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
644    
645      <delete dir="${build.4jdk7.docs.dir}"/>      <delete dir="${dist.4jdk7.docs.dir}"/>
646      <mkdir dir="${build.4jdk7.docs.dir}"/>      <mkdir dir="${dist.4jdk7.docs.dir}"/>
647    
648      <javadoc destdir="${build.4jdk7.docs.dir}"      <javadoc destdir="${dist.4jdk7.docs.dir}"
649               packagenames="none"               packagenames="none"
650               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
651               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
652               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
653               classpath=""               classpath=""
654               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
655        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
656          <include name="**/*.java"/>          <include name="**/*.java"/>
657        </fileset>        </fileset>
658          <arg value="-XDignore.symbol.file=true"/>
659      </javadoc>      </javadoc>
   
660    </target>    </target>
661    
662    
663    <target name="4jdk7dist"    <target name="4jdk7dist"
664            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
665            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
666    
667    
   
668    <target name="4jdk7clean"    <target name="4jdk7clean"
669            description="Removes all build products">            description="Removes all 4jdk7 build products">
670    
671      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
672    
673    </target>    </target>
674    
675    
   
676    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
677            description="Removes all build and distribution products">            description="Removes all build and distribution products">
678    
679    </target>    </target>
680    
   <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>  
   
681    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
682            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7-jar">
683    
684      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
685    
686    </target>    </target>
687    
   <!-- jsr166x -->  
688    
689      <!-- jsr166x -->
690    
691    <target name="jsr166xcompile"    <target name="jsr166xcompile"
692            depends="init, configure-compiler"            depends="configure-compiler"
693            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
694    
695      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
696    
697      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
698            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
699              debug="${build.debug}"             debug="${build.debug}"
700         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
701        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
702             source="${build.sourcelevel}"             classpath=""
703               fork="true">             bootclasspath="${bootclasspath6}"
704               source="5"
705               includeAntRuntime="false"
706               includeJavaRuntime="false"
707               executable="${javac7}"
708               fork="true">
709    
710        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
711        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
712          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
713          <compilerarg line="${build.args}"/>
714    
715      </javac>      </javac>
   
716    </target>    </target>
717    
718    
719      <target name="jsr166x-jar"
   <target name="jsr166xjar"  
720            depends="jsr166xcompile"            depends="jsr166xcompile"
721            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
722    
723      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
724          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
725      </jar>      </jar>
726    
727    </target>    </target>
728    
729    
   
730    <target name="jsr166xdocs"    <target name="jsr166xdocs"
731            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
732    
733      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
734      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
735    
736      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
737               packagenames="jsr166x"               packagenames="jsr166x.*"
738               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
739               source="${build.sourcelevel}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
740               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
741               additionalparam="-XDignore.symbol.file=true" />               source="5"
742                 executable="${javadoc7}">
743          <arg value="-XDignore.symbol.file=true"/>
744    
745        </javadoc>
746    </target>    </target>
747    
748    
749    <target name="jsr166xdist"    <target name="jsr166xdist"
750            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
751            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
752    
753    
   
754    <target name="jsr166xclean"    <target name="jsr166xclean"
755            description="Removes all build products">            description="Removes all jsr166x build products">
756    
757      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
758    
759    </target>    </target>
760    
761    
   
762    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
763            description="Removes all build and distribution products">            description="Removes all build and distribution products">
764    
765    </target>    </target>
766    
767    
   
   <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>  
   
768    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
769            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166x-jar">
770    
771      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
772    
773    </target>    </target>
774    
# Line 805  Line 776 
776    
777    
778    <target name="jsr166ycompile"    <target name="jsr166ycompile"
779            depends="init, configure-compiler"            depends="configure-compiler"
780            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
781    
782      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
783    
784      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
785            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
786              debug="${build.debug}"             debug="${build.debug}"
787         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
788        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
789             source="${build.sourcelevel}"             source="6"
790               fork="true">             classpath=""
791               bootclasspath="${bootclasspath6}"
792               includeAntRuntime="false"
793               includeJavaRuntime="false"
794               executable="${javac7}"
795               fork="true">
796    
797        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
798        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
799        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
800          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
801    
802      </javac>      </javac>
   
803    </target>    </target>
804    
805    
806      <target name="jsr166y-jar"
   <target name="jsr166yjar"  
807            depends="jsr166ycompile"            depends="jsr166ycompile"
808            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
809    
810      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
811          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
812      </jar>      </jar>
813    
814    </target>    </target>
815    
816    
   
817    <target name="jsr166ydocs"    <target name="jsr166ydocs"
818            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
819    
820      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
821      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
822    
823      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
824               packagenames="jsr166y"               packagenames="jsr166y.*"
825               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
826               source="${build.sourcelevel}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
827               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
828               additionalparam="-XDignore.symbol.file=true" />               source="6"
829                 executable="${javadoc7}">
830          <arg value="-XDignore.symbol.file=true"/>
831    
832        </javadoc>
833    </target>    </target>
834    
835    
836    <target name="jsr166ydist"    <target name="jsr166ydist"
837            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
838            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
839    
840    
   
841    <target name="jsr166yclean"    <target name="jsr166yclean"
842            description="Removes all build products">            description="Removes all jsr166y build products">
843    
844      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
845    
846    </target>    </target>
847    
848    
   
849    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
850            description="Removes all build and distribution products">            description="Removes all build and distribution products">
851    
852    </target>    </target>
853    
   <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>  
   
854    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
855            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166y-jar">
856    
857      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
858    
859    </target>    </target>
860    
# Line 909  Line 863 
863    
864    
865    <target name="extra166ycompile"    <target name="extra166ycompile"
866            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166y-jar"
867            description="Compiles extra166y sources">            description="Compiles extra166y sources">
868    
869      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
870    
871      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
872            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
873              debug="${build.debug}"             debug="${build.debug}"
874              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
875         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
876        deprecation="${build.deprecation}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
877             source="${build.sourcelevel}"             classpath=""
878               fork="true">             source="6"
879               includeAntRuntime="false"
880               includeJavaRuntime="false"
881               executable="${javac7}"
882               fork="true">
883    
884        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
885        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
886        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
887          <compilerarg line="${build.args}"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
888    
889      </javac>      </javac>
   
890    </target>    </target>
891    
892    
893      <target name="extra166y-jar"
   <target name="extra166yjar"  
894            depends="extra166ycompile"            depends="extra166ycompile"
895            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
896    
897      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
898          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
899      </jar>      </jar>
900    
901    </target>    </target>
902    
903    
   
904    <target name="extra166ydocs"    <target name="extra166ydocs"
905            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
906    
907      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
908      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
909    
910      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
911               packagenames="extra166y"               packagenames="extra166y.*"
912               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
913               source="${build.sourcelevel}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
914               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
915               additionalparam="-XDignore.symbol.file=true" />               source="6"
916                 executable="${javadoc7}">
917          <arg value="-XDignore.symbol.file=true"/>
918    
919        </javadoc>
920    </target>    </target>
921    
922    
923    <target name="extra166ydist"    <target name="extra166ydist"
924            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
925            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
926    
927    
   
928    <target name="extra166yclean"    <target name="extra166yclean"
929            description="Removes all build products">            description="Removes all extra166y build products">
930    
931      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
932    
933    </target>    </target>
934    
935    
   
936    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
937            description="Removes all build and distribution products">            description="Removes all build and distribution products">
938    
939    </target>    </target>
940    
   <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>  
   
941    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
942            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166y-jar">
943    
944      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
945    
946    </target>    </target>
947    
# Line 1015  Line 951 
951            depends="configure-compiler"            depends="configure-compiler"
952            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
953    
954      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
955    
956      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
957             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
958             debug="${build.debug}"             debug="${build.debug}"
959             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
960             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
961             source="1.7"             source="7"
962             classpath=""             classpath=""
963             includeAntRuntime="false"             includeAntRuntime="false"
964             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1030  Line 966 
966             fork="true">             fork="true">
967    
968        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
969        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
970        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
971          <compilerarg line="${build.args}"/>
972    
973      </javac>      </javac>
   
974    </target>    </target>
975    
976    
977      <target name="jsr166e-jar"
   <target name="jsr166ejar"  
978            depends="jsr166ecompile"            depends="jsr166ecompile"
979            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
980    
981      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
982          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
983      </jar>      </jar>
984    
985    </target>    </target>
986    
987    
   
988    <target name="jsr166edocs"    <target name="jsr166edocs"
989            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
990    
991      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
992      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
993    
994      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
995               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
996               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
              source="1.7"  
997               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
998               executable="${javadoc7}"               source="7"
999               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
1000        <fileset dir="${topsrc.dir}" defaultexcludes="yes">        <arg value="-XDignore.symbol.file=true"/>
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
     </javadoc>  
1001    
1002        </javadoc>
1003    </target>    </target>
1004    
1005    
1006    <target name="jsr166edist"    <target name="jsr166edist"
1007            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1008            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1009    
1010    
   
1011    <target name="jsr166eclean"    <target name="jsr166eclean"
1012            description="Removes all build products">            description="Removes all jsr166e build products">
1013    
1014      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
1015    
1016    </target>    </target>
1017    
1018    
   
1019    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1020            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1021    
1022    </target>    </target>
1023    
   <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>  
   
1024    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1025            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166e-jar">
1026    
1027      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1028    
1029    </target>    </target>
1030    

Legend:
Removed from v.1.101  
changed lines
  Added in v.1.119

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