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

Diff of /jsr166/build.xml

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

revision 1.98 by jsr166, Wed Jan 16 07:39:51 2013 UTC revision 1.116 by jsr166, Sun Jan 20 07:24:52 2013 UTC
# Line 16  Line 16 
16    $HOME/jdk/jdk6    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8    $HOME/jdk/jdk8
19    where each of the above is a JDK or a symlink to same.    where each of the above is a JDK or a symlink to same, and
20      $HOME/jdk/src/jdk6
21      $HOME/jdk/src/jdk7
22      $HOME/jdk/src/jdk8
23      where each of the above is a complete JDK source tree
24      (e.g. mercurial forest) or a symlink to same.
25  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
26    </description>    </description>
27    
# Line 30  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 40  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.jdk7.dir"              location="${build.dir}/jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53    <property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.jdk7.docs.dir"         location="${build.jdk7.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"/>
59    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
60    <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>    <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 binary locations -->    <!-- JDK binary locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 72  Line 68 
68    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
69      <attribute name="v"/>      <attribute name="v"/>
70      <sequential>      <sequential>
71      <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
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"/>
75      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>      <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
76        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
77      <property name="bootclasspath@{v}"      <property name="bootclasspath@{v}"
78       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
79      </sequential>      </sequential>
# Line 87  Line 84 
84    <defjdklocations v="8"/>    <defjdklocations v="8"/>
85    
86    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
87      <attribute name="jvm"/>      <attribute name="target"/>
88      <attribute name="tck.classes"/>      <attribute name="workdir"/>
89      <attribute name="product.jar" default="${product.jar}"/>      <attribute name="product.jar" default="${product.jar}"/>
90      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
91      <sequential>      <sequential>
92      <java classname="JSR166TestCase"  
93            jvm="@{jvm}" fork="true">      <mkdir dir="@{workdir}/tck-classes"/>
94    
95        <javac srcdir="${tck.src.dir}"
96               destdir="@{workdir}/tck-classes"
97               debug="${build.debug}"
98               debuglevel="${build.debuglevel}"
99               deprecation="${build.deprecation}"
100               source="6"
101               classpath="${junit.jar}"
102               bootclasspath="@{product.jar}:${bootclasspath6}"
103               includeAntRuntime="false"
104               includeJavaRuntime="false"
105               executable="${javac@{target}}"
106               fork="true">
107    
108          <include name="**/*.java"/>
109          <compilerarg value="-XDignore.symbol.file=true"/>
110          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111          <compilerarg line="${build.args}"/>
112        </javac>
113    
114        <java classname="JSR166TestCase" jvm="${java@{target}}" fork="true">
115          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
116          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
117          <classpath>          <classpath>
118            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
119            <pathelement location="@{tck.classes}"/>            <pathelement location="@{workdir}/tck-classes"/>
120          </classpath>          </classpath>
121      </java>      </java>
122    
123      </sequential>      </sequential>
124    </macrodef>    </macrodef>
125    
# Line 113  Line 132 
132    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
133    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
134    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
135    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
136    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
137    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
138    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
139    <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"/>  
140    
141    <!-- Distribution locations -->    <!-- Distribution locations -->
142    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
143    <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
144    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
145    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
146    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
147    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
148    
149    <!-- Jar locations -->    <!-- Jar locations -->
150    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
151    <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
152    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
153    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
154    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
155    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
156    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
157    
158    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
159    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 148  Line 166 
166    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
167    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2012-11 -->
168    <!-- <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/"/> -->
169    
170      <!-- Default jdk api doc location (latest stable release seems best) -->
171    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
172    
173      <!-- Define the "jtreg" task -->
174      <!-- See the docs in "jtreg -onlineHelp" -->
175      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
176               classpath="${lib.dir}/jtreg.jar" />
177    
178    <!-- Test classpath -->    <!-- Test classpath -->
179    <path id="test.classpath">    <path id="test.classpath">
180      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 161  Line 186 
186      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
187    </path>    </path>
188    
189      <!-- Support @jls tag, used in jdk8+ javadoc -->
190      <!-- TODO: How do we get &trade to work? -->
191      <!-- TODO: Why isn't @jls a "standard" tag? -->
192      <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
193      <property name="javadoc.jls.cite" value="The Java Language Specification"/>
194      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
195    
196    <!-- Main targets -->    <!-- Main targets -->
197    
198    <target name="dists"    <target name="dists"
199            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
200            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
201    
202    <target name="compile"    <target name="compile"
203            depends="init, configure-compiler"            depends="configure-compiler"
204            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
205    
206      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
207    
208      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
209            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
210              debug="${build.debug}"             debug="${build.debug}"
211         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
212        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
213             source="${build.sourcelevel}"             classpath=""
214               fork="true">             includeAntRuntime="false"
215               includeJavaRuntime="false"
216               executable="${javac8}"
217               fork="true">
218    
219        <include name="**/*.java"/>        <include name="**/*.java"/>
220          <compilerarg line="${build.args}"/>
221        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
222          <compilerarg value="-Xlint:all"/>
223    
224  <!--  <!--
225        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 201  Line 237 
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>
# Line 212  Line 246 
246    
247    
248    <target name="test"    <target name="test"
249            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
250            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)" />
251    
252    
253    
254    <target name="docs"    <target name="docs"
255            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
256    
257      <delete dir="${build.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
258      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
259    
260      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
261      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
262    
263      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${dist.javadocs.dir}"
264               packagenames="none"               packagenames="none"
265               link="${jdkapidocs.url}"               link="${jdkapi8docs.url}"
266               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
267               sourcepath="${src.dir}:${jdksrc.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
268               additionalparam="-XDignore.symbol.file=true" >               classpath=""
269                 executable="${javadoc8}">
270          <arg value="-XDignore.symbol.file=true"/>
271          <arg value="-tag"/>
272          <arg value="${javadoc.jls.option}"/>
273        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
274          <include name="**/*.java"/>          <include name="**/*.java"/>
275        </fileset>        </fileset>
# Line 242  Line 280 
280    
281    
282    <target name="dist"    <target name="dist"
283            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, docs"
284            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
285    
286    
# Line 270  Line 308 
308            description="Removes all build products">            description="Removes all build products">
309    
310      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
311    
312    </target>    </target>
313    
# Line 286  Line 322 
322    
323    
324    
   <target name="dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.javadocs.dir}"/>  
     <mkdir dir="${dist.javadocs.dir}"/>  
   
     <!-- the packagenames="none" hack below prevents scanning the -->  
     <!-- sourcepath for packages -->  
   
     <javadoc destdir="${dist.javadocs.dir}"  
              packagenames="none"  
              link="${jdkapidocs.url}"  
              overview="${src.dir}/intro.html"  
              sourcepath="${src.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   
   
325    <!-- Internal targets -->    <!-- Internal targets -->
326    
327    
   <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>  
   
   
328    <target name="dist-jar"    <target name="dist-jar"
329            depends="clean, jar">            depends="clean, jar">
330    
# Line 337  Line 339 
339      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
340    
341      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
342            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
343              debug="${build.debug}"             debug="${build.debug}"
344         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
345        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
346             source="${build.sourcelevel}"             source="6"
347               fork="true">             classpath="${junit.jar}"
348               bootclasspath="${product.jar}:${bootclasspath6}"
349               includeAntRuntime="false"
350               includeJavaRuntime="false"
351               executable="${javac8}"
352               fork="true">
353    
354        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
355        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
356        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
357          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
358    
359      </javac>      </javac>
360    
361      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
362            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
363              debug="${build.debug}"             debug="${build.debug}"
364         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
365        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
366             source="${build.sourcelevel}"             source="6"
367               fork="true">             classpath=""
368               bootclasspath="${product.jar}:${bootclasspath6}"
369               includeAntRuntime="false"
370               includeJavaRuntime="false"
371               executable="${javac8}"
372               fork="true">
373    
374        <include name="jsr166/test/**"/>        <include name="jsr166/test/**/*.java"/>
375    
       <compilerarg value="${bootclasspath.args}"/>  
376        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
377        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
378          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
379    
380      </javac>      </javac>
381    
# Line 383  Line 392 
392        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
393        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
394    
       <classpath refid="test.classpath"/>  
   
395      </javac>      </javac>
396  -->  -->
397    
# Line 404  Line 411 
411            errorProperty="junit.failed"            errorProperty="junit.failed"
412          failureProperty="junit.failed"          failureProperty="junit.failed"
413                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
414                        jvm="${java8}"
415                     fork="true">                     fork="true">
416    
417        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
418        <jvmarg value="-server"/>        <jvmarg value="-server"/>
419        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
420    
# Line 507  Line 515 
515    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
516    
517    
518    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
519            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
520    
521      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 533  Line 541 
541    </target>    </target>
542    
543    
544    <!-- jdk7 -->    <!-- jsr166 4jdk7 -->
545    
546    
547    <target name="jdk7compile"    <target name="4jdk7compile"
548            depends="configure-compiler"            depends="configure-compiler"
549            description="Compiles src/jdk7 sources">            description="Compiles src/jdk7 sources, targeting jdk7">
550    
551      <mkdir dir="${build.jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
552    
553      <javac srcdir="${jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
554             destdir="${build.jdk7.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
555             debug="${build.debug}"             debug="${build.debug}"
556             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
557             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
558             source="1.6"             source="6"
559             classpath=""             classpath=""
560             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
561             includeAntRuntime="false"             includeAntRuntime="false"
# Line 562  Line 570 
570    
571      </javac>      </javac>
572    
573      <mkdir dir="${build.jdk7.lib.dir}"/>    </target>
   
     <jar destfile="${jdk7product.jar}" index="true">  
       <fileset dir="${build.jdk7.classes.dir}"/>  
     </jar>  
   
     <mkdir dir="${build.jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="1.6"  
            classpath="${junit.jar}"  
            bootclasspath="${jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
574    
575        <include name="**/*.java"/>    <target name="4jdk7-jar"
576        <compilerarg line="${build.args}"/>            depends="4jdk7compile"
577        <compilerarg value="-XDignore.symbol.file=true"/>            description="Builds library jar from compiled sources">
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
578    
579      </javac>      <jar destfile="${4jdk7product.jar}">
580          <fileset dir="${build.4jdk7.classes.dir}"/>
581        </jar>
582    
583    </target>    </target>
584    
585    
586    <target name="run-jdk7-tck-tests"    <target name="4jdk7-test-tck"
587            depends="jdk7compile"            depends="4jdk7-jar"
588            description="Runs tck tests for jsr166-jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
589    
590      <run-tck-tests      <run-tck-tests
591        jvm="${java7}"        target="7"
592        tck.classes="${build.jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
593        product.jar="${jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
594    </target>    </target>
595    
596    
597    <target name="run-jdk7-tck-tests-via-junit-task"    <target name="4jdk7-test-tck-junit"
598            depends="jdk7compile">            depends="4jdk7compile"
599              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
600    
601      <junit printsummary="true"      <junit printsummary="true"
602             showoutput="true"             showoutput="true"
# Line 614  Line 606 
606             jvm="${java7}"             jvm="${java7}"
607             fork="true">             fork="true">
608    
609        <jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>        <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
610        <jvmarg value="-server"/>        <jvmarg value="-server"/>
611    
612        <classpath>        <classpath>
613          <pathelement location="${junit.jar}"/>          <pathelement location="${junit.jar}"/>
614          <pathelement location="${build.jdk7.tck.classes.dir}"/>          <pathelement location="${build.4jdk7.tck.classes.dir}"/>
615        </classpath>        </classpath>
616    
617        <formatter type="brief"/>        <formatter type="brief"/>
# Line 630  Line 622 
622      </junit>      </junit>
623    </target>    </target>
624    
625      <target name="4jdk7-test-jtreg"
626              depends="4jdk7compile"
627              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
628        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
629        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
630        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
631        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
632        <jtreg dir="${jtreg.src.dir}"
633               jdk="${jdk7.home}"
634               workDir="${build.4jdk7.dir}/JTwork"
635               reportDir="${build.4jdk7.dir}/JTreport">
636    
637    <target name="jdk7docs"        <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
638            description="Builds javadocs with custom tags to build folder">        <arg value="-agentvm"/>
639          <arg value="-v:nopass,fail"/>
640          <arg value="-vmoptions:-esa -ea"/>
641          <arg value="-automatic"/>
642          <arg value="-k:!ignore"/>
643        </jtreg>
644      </target>
645    
     <delete dir="${build.jdk7.docs.dir}"/>  
     <mkdir dir="${build.jdk7.docs.dir}"/>  
646    
647      <javadoc destdir="${build.jdk7.docs.dir}"    <target name="4jdk7-test"
648              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
649              description="Runs tck and jtreg tests for jsr166-4jdk7">
650      </target>
651    
652    
653      <target name="4jdk7docs"
654              description="Builds javadocs for src/jdk7 to dist dir">
655    
656        <delete dir="${dist.4jdk7.docs.dir}"/>
657        <mkdir dir="${dist.4jdk7.docs.dir}"/>
658    
659        <javadoc destdir="${dist.4jdk7.docs.dir}"
660               packagenames="none"               packagenames="none"
661               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
662               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
663               sourcepath="${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
              bootclasspath="${bootclasspath6}"  
664               classpath=""               classpath=""
665               source="1.6"               executable="${javadoc7}">
666               executable="${javadoc7}"        <arg value="-XDignore.symbol.file=true"/>
667               additionalparam="-XDignore.symbol.file=true" >        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
668          <include name="**/*.java"/>          <include name="**/*.java"/>
669        </fileset>        </fileset>
670      </javadoc>      </javadoc>
# Line 655  Line 672 
672    </target>    </target>
673    
674    
675    <target name="jdk7dist"    <target name="4jdk7dist"
676            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
677            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
678    
679    
680    
681    <target name="jdk7clean"    <target name="4jdk7clean"
682            description="Removes all build products">            description="Removes all 4jdk7 build products">
683    
684      <delete dir="${build.jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
685    
686    </target>    </target>
687    
688    
689    
690    <target name="jdk7dist-clean"    <target name="4jdk7dist-clean"
691            description="Removes all build and distribution products">            description="Removes all build and distribution products">
692    
693    </target>    </target>
694    
695    <target name="jdk7dist-docs"    <target name="4jdk7dist-jar"
696            description="Builds javadocs without custom tags to dist folder">            depends="4jdk7clean, 4jdk7compile">
   
     <delete dir="${dist.jdk7.docs.dir}"/>  
     <mkdir dir="${dist.jdk7.docs.dir}"/>  
697    
698      <javadoc destdir="${dist.jdk7.docs.dir}"      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${jdk7src.dir}/intro.html"  
              sourcepath="${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}"  
              bootclasspath="${bootclasspath6}"  
              source="1.6">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
699    
700    </target>    </target>
701    
   <target name="jdk7dist-jar"  
           depends="jdk7clean, jdk7compile">  
   
     <copy file="${jdk7product.jar}" todir="${dist.dir}"/>  
   
   </target>  
702    
703    <!-- jsr166x -->    <!-- jsr166x -->
704    
   
705    <target name="jsr166xcompile"    <target name="jsr166xcompile"
706            depends="init, configure-compiler"            depends="configure-compiler"
707            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
708    
709      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
710    
711      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
712            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
713              debug="${build.debug}"             debug="${build.debug}"
714         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
715        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
716             source="${build.sourcelevel}"             classpath=""
717               fork="true">             source="5"
718               bootclasspath="${bootclasspath6}"
719               includeAntRuntime="false"
720               includeJavaRuntime="false"
721               executable="${javac7}"
722               fork="true">
723    
724        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
725        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
726        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
727          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
728    
729      </javac>      </javac>
730    
# Line 736  Line 736 
736            depends="jsr166xcompile"            depends="jsr166xcompile"
737            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
738    
739      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
740          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
741      </jar>      </jar>
742    
743    </target>    </target>
# Line 747  Line 745 
745    
746    
747    <target name="jsr166xdocs"    <target name="jsr166xdocs"
748            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
749    
750      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
751      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
752    
753      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
754               packagenames="jsr166x"               packagenames="jsr166x.*"
755               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
756               source="${build.sourcelevel}"               source="5"
757               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
758               additionalparam="-XDignore.symbol.file=true" />               sourcepath="${topsrc.dir}:${jdk6src.dir}"
759                 executable="${javadoc7}"
760                 additionalparam="-XDignore.symbol.file=true"/>
761    
762    </target>    </target>
763    
764    
765    <target name="jsr166xdist"    <target name="jsr166xdist"
766            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
767            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
768    
769    
770    
771    <target name="jsr166xclean"    <target name="jsr166xclean"
772            description="Removes all build products">            description="Removes all jsr166x build products">
773    
774      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
775    
776    </target>    </target>
777    
# Line 784  Line 783 
783    </target>    </target>
784    
785    
   
   <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>  
   
786    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
787            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
788    
789      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
790    
791    </target>    </target>
792    
# Line 811  Line 794 
794    
795    
796    <target name="jsr166ycompile"    <target name="jsr166ycompile"
797            depends="init, configure-compiler"            depends="configure-compiler"
798            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
799    
800      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
801    
802      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
803            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
804              debug="${build.debug}"             debug="${build.debug}"
805         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
806        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
807             source="${build.sourcelevel}"             source="6"
808               fork="true">             classpath=""
809               bootclasspath="${bootclasspath6}"
810               includeAntRuntime="false"
811               includeJavaRuntime="false"
812               executable="${javac7}"
813               fork="true">
814    
815        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
816        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
817        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
818        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
819      </javac>      </javac>
   
820    </target>    </target>
821    
822    
   
823    <target name="jsr166yjar"    <target name="jsr166yjar"
824            depends="jsr166ycompile"            depends="jsr166ycompile"
825            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
826    
827      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
828          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
829      </jar>      </jar>
830    
831    </target>    </target>
# Line 852  Line 833 
833    
834    
835    <target name="jsr166ydocs"    <target name="jsr166ydocs"
836            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
837    
838      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
839      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
840    
841      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
842               packagenames="jsr166y"               packagenames="jsr166y.*"
843               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
844               source="${build.sourcelevel}"               source="6"
845               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
846               additionalparam="-XDignore.symbol.file=true" />               sourcepath="${topsrc.dir}:${jdk6src.dir}"
847                 executable="${javadoc7}"
848                 additionalparam="-XDignore.symbol.file=true"/>
849    
850    </target>    </target>
851    
852    
853    <target name="jsr166ydist"    <target name="jsr166ydist"
854            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
855            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
856    
857    
858    
859    <target name="jsr166yclean"    <target name="jsr166yclean"
860            description="Removes all build products">            description="Removes all jsr166y build products">
861    
862      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
863    
864    </target>    </target>
865    
# Line 888  Line 870 
870    
871    </target>    </target>
872    
   <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>  
   
873    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
874            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
875    
876      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
877    
878    </target>    </target>
879    
# Line 915  Line 882 
882    
883    
884    <target name="extra166ycompile"    <target name="extra166ycompile"
885            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
886            description="Compiles extra166y sources">            description="Compiles extra166y sources">
887    
888      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
889    
890      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
891            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
892              debug="${build.debug}"             debug="${build.debug}"
893              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
894         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
895        deprecation="${build.deprecation}"             classpath=""
896             source="${build.sourcelevel}"             source="6"
897               fork="true">             bootclasspath="${jsr166y.jar}:${bootclasspath6}"
898               includeAntRuntime="false"
899               includeJavaRuntime="false"
900               executable="${javac7}"
901               fork="true">
902    
903        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
904        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
905        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
906        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
907    
908      </javac>      </javac>
909    
# Line 946  Line 915 
915            depends="extra166ycompile"            depends="extra166ycompile"
916            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
917    
918      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
919          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
920      </jar>      </jar>
921    
922    </target>    </target>
# Line 957  Line 924 
924    
925    
926    <target name="extra166ydocs"    <target name="extra166ydocs"
927            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
928    
929      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
930      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
931    
932      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
933               packagenames="extra166y"               packagenames="extra166y.*"
934               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
935               source="${build.sourcelevel}"               source="6"
936               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
937               additionalparam="-XDignore.symbol.file=true" />               sourcepath="${topsrc.dir}:${jdk6src.dir}"
938                 executable="${javadoc7}"
939                 additionalparam="-XDignore.symbol.file=true"/>
940    
941    </target>    </target>
942    
943    
944    <target name="extra166ydist"    <target name="extra166ydist"
945            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
946            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
947    
948    
949    
950    <target name="extra166yclean"    <target name="extra166yclean"
951            description="Removes all build products">            description="Removes all extra166y build products">
952    
953      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
954    
955    </target>    </target>
956    
# Line 993  Line 961 
961    
962    </target>    </target>
963    
   <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>  
   
964    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
965            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
966    
967      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
968    
969    </target>    </target>
970    
# Line 1021  Line 974 
974            depends="configure-compiler"            depends="configure-compiler"
975            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
976    
977      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
978    
979      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
980             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
981             debug="${build.debug}"             debug="${build.debug}"
982             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
983             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
984             source="1.7"             source="7"
985             classpath=""             classpath=""
986             includeAntRuntime="false"             includeAntRuntime="false"
987             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1050  Line 1003 
1003            depends="jsr166ecompile"            depends="jsr166ecompile"
1004            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1005    
1006      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
1007          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
1008      </jar>      </jar>
1009    
1010    </target>    </target>
# Line 1061  Line 1012 
1012    
1013    
1014    <target name="jsr166edocs"    <target name="jsr166edocs"
1015            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
1016    
1017      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
1018      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1019    
1020      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1021               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
1022               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
1023               source="1.7"               source="7"
1024               sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1025               executable="${javadoc7}"               executable="${javadoc7}"
1026               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
1027      </javadoc>      </javadoc>
1028    
1029    </target>    </target>
1030    
1031    
1032    <target name="jsr166edist"    <target name="jsr166edist"
1033            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1034            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1035    
1036    
1037    
1038    <target name="jsr166eclean"    <target name="jsr166eclean"
1039            description="Removes all build products">            description="Removes all jsr166e build products">
1040    
1041      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
1042    
1043    </target>    </target>
1044    
1045    
   
1046    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1047            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1048    
1049    </target>    </target>
1050    
   <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>  
   
1051    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1052            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1053    
1054      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1055    
1056    </target>    </target>
1057    

Legend:
Removed from v.1.98  
changed lines
  Added in v.1.116

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