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

Diff of /jsr166/build.xml

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

revision 1.70, Wed Aug 11 10:57:33 2004 UTC revision 1.92, Mon Jan 14 07:08:06 2013 UTC
# Line 21  Line 21 
21    
22    
23    <!-- Compilation options -->    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>    <property name="build.sourcelevel"    value="1.6"/>
25    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 30  Line 30 
30    <property name="build.dir"            location="build"/>    <property name="build.dir"            location="build"/>
31    <property name="build.classes.dir"    location="${build.dir}/classes"/>    <property name="build.classes.dir"    location="${build.dir}/classes"/>
32    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
   <property name="build.j1.dir"         location="${build.dir}/j1"/>  
33    <property name="build.loops.dir"      location="${build.dir}/loops"/>    <property name="build.loops.dir"      location="${build.dir}/loops"/>
34    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.lib.dir"        location="${build.dir}/lib"/>
   <property name="build.ant.dir"        location="${build.dir}/ant"/>  
35    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
36    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.reports.dir"    location="${build.dir}/reports"/>
37    <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>  
38    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>    <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
39    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
40    <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
41      <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
42    
43    <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
44    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
45    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
46    
47      <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
48      <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
49      <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
50    
51      <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
52      <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
53      <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
54    
55      <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
56      <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
57      <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
58    
59      <!-- JDK binary locations -->
60      <property name="jdks.home"  location="${user.home}/jdk"/>
61      <property name="jdk6.home"  location="${jdks.home}/jdk1.6.0"/>
62      <property name="jdk7.home"  location="${jdks.home}/jdk1.7.0"/>
63      <property name="jdk8.home"  location="${jdks.home}/jdk1.8.0"/>
64      <property name="javac6"     location="${jdk6.home}/bin/javac"/>
65      <property name="javac7"     location="${jdk7.home}/bin/javac"/>
66      <property name="javac8"     location="${jdk8.home}/bin/javac"/>
67      <property name="javadoc6"   location="${jdk6.home}/bin/javadoc"/>
68      <property name="javadoc7"   location="${jdk7.home}/bin/javadoc"/>
69      <property name="javadoc8"   location="${jdk8.home}/bin/javadoc"/>
70      <property name="bootdir6"   location="${jdk6.home}/jre/lib"/>
71      <property name="bootdir7"   location="${jdk7.home}/jre/lib"/>
72      <property name="bootdir8"   location="${jdk8.home}/jre/lib"/>
73      <property name="bootclasspath6"   value="${bootdir6}/resources.jar:${bootdir6}/rt.jar:${bootdir6}/jsse.jar:${bootdir6}/jce.jar:${bootdir6}/:${bootdir6}/charsets.jar"/>
74      <property name="bootclasspath7"   value="${bootdir7}/resources.jar:${bootdir7}/rt.jar:${bootdir7}/jsse.jar:${bootdir7}/jce.jar:${bootdir7}/:${bootdir7}/charsets.jar"/>
75      <property name="bootclasspath8"   value="${bootdir8}/resources.jar:${bootdir8}/rt.jar:${bootdir8}/jsse.jar:${bootdir8}/jce.jar:${bootdir8}/:${bootdir8}/charsets.jar"/>
76    
77    <!-- Source locations -->    <!-- Source locations -->
78    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
79    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
   <property name="j1.src.dir"           location="${basedir}/src/javaone"/>  
80    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
81    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
82    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
   <property name="ant.src.dir"          location="${basedir}/etc/ant"/>  
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>  
83    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
84    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
85    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
86    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
87      <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
88      <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
89      <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
90      <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
91      <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
92    
93    <!-- Distribution locations -->    <!-- Distribution locations -->
94    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
95      <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
96    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
97      <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
98      <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
99      <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
100    
101    <!-- Jar locations -->    <!-- Jar locations -->
102    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
103      <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
104    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
105      <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
106      <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
107      <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
108    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
   <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>  
109    
110    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
111    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
112    
113      <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
114      <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
115      <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
116      <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
117    
118      <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
119      <!-- The below does not yet exist as of 2012-11 -->
120      <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
121      <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
122    
123    <!-- Test classpath -->    <!-- Test classpath -->
124    <path id="test.classpath">    <path id="test.classpath">
125      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 82  Line 131 
131      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
132    </path>    </path>
133    
   <!-- J1 classpath -->  
   <path id="j1.classpath">  
     <pathelement location="${build.j1.dir}"/>  
     <pathelement location="${junit.jar}"/>  
     <pathelement location="${concurrent.jar}"/>  
   </path>  
   
134    
135    <!-- Main targets -->    <!-- Main targets -->
136    
137      <target name="dists"
138              depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
139              description="Builds all public jars and docs"/>
140    
141    <target name="compile"    <target name="compile"
142            depends="init, configure-compiler"            depends="init, configure-compiler"
# Line 108  Line 153 
153               fork="true">               fork="true">
154    
155        <include name="**/*.java"/>        <include name="**/*.java"/>
156          <compilerarg value="-XDignore.symbol.file=true"/>
157    
158    <!--
159        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
160        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
161          <compilerarg line="-Xlint -Xmaxwarns 1000"/>
162    -->
163    
164      </javac>      </javac>
165    
# Line 143  Line 193 
193      <delete dir="${build.javadocs.dir}"/>      <delete dir="${build.javadocs.dir}"/>
194      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${build.javadocs.dir}"/>
195    
196        <!-- the packagenames="none" hack below prevents scanning the -->
197        <!-- sourcepath for packages -->
198    
199      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${build.javadocs.dir}"
200                  link="http://java.sun.com/j2se/1.4.1/docs/api"               packagenames="none"
201                 link="${jdkapidocs.url}"
202              overview="${src.dir}/intro.html"              overview="${src.dir}/intro.html"
203                source="${build.sourcelevel}">               sourcepath="${src.dir}:${jdksrc.dir}"
204                 additionalparam="-XDignore.symbol.file=true" >
205        <tag name="revised" description="Last revised:"/>        <fileset dir="${src.dir}" defaultexcludes="yes">
206        <tag name="spec"    description="Specified by:"/>          <include name="**/*.java"/>
207          </fileset>
       <packageset dir="${src.dir}"/>  
   
     </javadoc>  
   
   </target>  
   
   
   
   <target name="doccheck"  
           depends="filter-doccheck"  
           description="Reports on javadoc style errors">  
   
     <delete dir="${build.doccheck.dir}"/>  
     <mkdir dir="${build.doccheck.dir}"/>  
   
     <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"  
          docletpath="${lib.dir}/doccheck.jar"  
             destdir="${build.doccheck.dir}">  
       <packageset dir="${build.dc-filter.dir}"/>  
208      </javadoc>      </javadoc>
209    
     <echo>DocCheck output is in ${build.doccheck.dir}</echo>  
   
   </target>  
   
   
   
   <target name="checkstyle"  
           depends="filter-src"  
           description="Reports on style errors in Java source (verbose, mostly chaff)">  
   
     <taskdef resource="checkstyletask.properties"  
             classpath="${lib.dir}/checkstyle-all-3.1.jar"/>  
   
     <mkdir dir="${build.checkstyle.dir}"/>  
   
     <checkstyle config="etc/checkstyle/sun_checks.xml"  
        failOnViolation="false">  
       <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>  
       <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>  
     </checkstyle>  
   
     <style in="${build.checkstyle.dir}/checkstyle-report.xml"  
           out="${build.checkstyle.dir}/checkstyle-report.html"  
         style="${stylesheet.dir}/checkstyle-frames.xsl"/>  
   
210    </target>    </target>
211    
212    
# Line 206  Line 216 
216            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
217    
218    
   
219    <target name="release"    <target name="release"
220            depends="dist"            depends="dist"
221            description="Puts entire CVS tree, plus distribution productions, in a jar">            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 253  Line 262 
262      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
263      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
264    
265        <!-- the packagenames="none" hack below prevents scanning the -->
266        <!-- sourcepath for packages -->
267    
268      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${dist.javadocs.dir}"
269                  link="http://java.sun.com/j2se/1.4.2/docs/api"               packagenames="none"
270                 link="${jdkapidocs.url}"
271              overview="${src.dir}/intro.html"              overview="${src.dir}/intro.html"
272                source="${build.sourcelevel}">               sourcepath="${src.dir}:${jdksrc.dir}"
273                 additionalparam="-XDignore.symbol.file=true" >
274        <packageset dir="${src.dir}"/>        <fileset dir="${src.dir}" defaultexcludes="yes">
275            <include name="**/*.java"/>
276          </fileset>
277      </javadoc>      </javadoc>
278    
279    </target>    </target>
# Line 287  Line 301 
301    </target>    </target>
302    
303    
   <target name="compile-ant-filter"  
           depends="init">  
   
     <mkdir dir="${build.ant.dir}"/>  
   
     <javac srcdir="${ant.src.dir}"  
           destdir="${build.ant.dir}"  
            source="1.4"/>  
   
   </target>  
   
   
   <target name="filter-src"  
           depends="compile-ant-filter">  
   
     <mkdir dir="${build.filter.src.dir}"/>  
   
     <copy todir="${build.filter.src.dir}">  
       <fileset dir="${src.dir}">  
         <include name="**/*.html"/>  
       </fileset>  
     </copy>  
   
     <copy todir="${build.filter.src.dir}">  
       <fileset dir="${src.dir}">  
         <exclude name="**/*.html"/>  
         <!-- Files excluded from dist-docs -->  
         <exclude name="java/util/Random.*"/>  
         <exclude name="sun/misc/Unsafe.*"/>  
       </fileset>  
       <!--  
       <filterchain>  
       -->  
   
         <!--  
          # This filter gets rid of angle-bracketed type parameters  
          # so that javadoc can run on the result. The following  
          # heuristic seems to work:  
          #  
          # For all lines not starting with space(s)-asterisk-space(s),  
          #   replace <something> with a space, where there may be more  
          #   than one right angle bracket at the end, and "something"  
          #   must not contain parens or pipes. (This may need some  
          #   tweaking.)  
          -->  
   
         <!--  
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
           <param name="notmatching" value="^\s+\*\s.*$"/>  
           <param name="pattern"     value="&lt;[^|>()]+?>+"/>  
           <param name="replacement" value=" "/>  
         </filterreader>  
         -->  
   
       <!--  
       </filterchain>  
       -->  
     </copy>  
   
   </target>  
   
   
   <target name="filter-doccheck"  
           depends="filter-src">  
   
     <mkdir dir="${build.dc-filter.dir}"/>  
   
     <copy todir="${build.dc-filter.dir}">  
       <fileset dir="${build.filter.src.dir}">  
         <include name="**/*.html"/>  
       </fileset>  
     </copy>  
   
     <property name="generic.declarations"  
              value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"  
     />  
   
     <copy todir="${build.dc-filter.dir}">  
       <fileset dir="${build.filter.src.dir}">  
         <exclude name="**/*.html"/>  
       </fileset>  
       <filterchain>  
         <!--  
          # These two filters try to make the source look like  
          # something that doccheck can process. The first removes  
          # -source 1.4 assertions and the second adds in a bunch  
          # of single letter public nested marker interfaces so that  
          # the generic type parameters are recognized.  
          -->  
   
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
           <param name="matching"    value="^\s*assert[\s ].*$"/>  
           <param name="pattern"     value="assert"/>  
           <param name="replacement" value="//assert"/>  
         </filterreader>  
   
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
           <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>  
           <param name="pattern"     value="$"/>  
           <param name="replacement" value=" ${generic.declarations}"/>  
         </filterreader>  
   
       </filterchain>  
     </copy>  
   
   </target>  
   
   
304    <target name="compile-tests"    <target name="compile-tests"
305            depends="jar">            depends="jar">
306    
# Line 413  Line 316 
316    
317        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
318        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
319          <compilerarg value="-XDignore.symbol.file=true"/>
320    
321        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
322    
# Line 430  Line 334 
334    
335        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
336        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
337          <compilerarg value="-XDignore.symbol.file=true"/>
338    
339        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
340    
# Line 446  Line 351 
351    
352        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
353        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
354          <compilerarg value="-XDignore.symbol.file=true"/>
355    
356        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
357    
# Line 518  Line 424 
424        <fileset dir="${build.reports.dir}">        <fileset dir="${build.reports.dir}">
425          <include name="TEST-*.xml"/>          <include name="TEST-*.xml"/>
426        </fileset>        </fileset>
427        <report styledir="${stylesheet.dir}"        <report format="${junit.report.format}" todir="${build.reports.dir}"
                 format="${junit.report.format}"  
                  todir="${build.reports.dir}"  
428        />        />
429      </junitreport>      </junitreport>
430    
# Line 570  Line 474 
474    </target>    </target>
475    
476    
   
   <!-- Anthill targets -->  
   
   <target name="anthill-build">  
   
     <!-- Override this in user.properties -->  
     <property name="tiger.home" location="e:/j2sdk1.5.0"/>  
   
     <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">  
       <arg value="-Xmx256000000"/>  
       <!-- classpath of new JVM -->  
       <arg value="-classpath"/> <arg path="${java.class.path}"/>  
       <!-- location of Ant home directory -->  
       <arg value="-Dant.home=${ant.home}"/>  
       <!-- the Ant main class -->  
       <arg value="org.apache.tools.ant.Main"/>  
       <!-- The build file -->  
       <arg value="-buildfile"/>  <arg value="build.xml"/>  
       <!-- the target to build on the new Ant instance -->  
       <arg value="-DJAVA_HOME=${tiger.home}"/>  
       <arg value="do-anthill-build"/>  
     </exec>  
   </target>  
   
   <target name="do-anthill-build"  
           depends="jar, test, docs, dist-docs"/>  
   
   <target name="anthill-publish">  
   
     <copy todir="${deployDir}/docs/private">  
       <fileset dir="${build.javadocs.dir}"/>  
     </copy>  
   
     <copy todir="${deployDir}/docs/public">  
       <fileset dir="${dist.javadocs.dir}"/>  
     </copy>  
   
     <copy tofile="${deployDir}/index.html"  
           file="${basedir}/etc/anthill-index.html"/>  
   
     <copy todir="${deployDir}/notes">  
       <fileset dir="${basedir}/etc/notes"/>  
     </copy>  
   
   </target>  
   
   
   
477    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
478    
479    
   <target name="sample" depends="init, configure-compiler"  
           description="Standalone demo program">  
   
     <mkdir dir="${build.testcases.dir}"/>  
   
     <javac srcdir="${test.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <include name="jsr166/test/Sample.java"/>  
   
     </javac>  
   
     <copy todir="${build.testcases.dir}">  
       <fileset dir="${test.src.dir}">  
         <include name="**/*.properties"/>  
       </fileset>  
     </copy>  
   
   
     <java classname="jsr166.test.Sample" fork="true">  
       <classpath refid="test.classpath"/>  
       <!-- <jvmarg value="-ea"/> -->  
       <!-- <jvmarg value="-server"/> -->  
       <!-- <arg value="1000"/> -->  
     </java>  
   </target>  
   
   
480    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="init, configure-compiler"
481            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
482    
# Line 669  Line 492 
492    
493        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
494        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
495          <compilerarg value="-XDignore.symbol.file=true"/>
496    
497      </javac>      </javac>
498    
# Line 679  Line 503 
503    </target>    </target>
504    
505    
506    <target name="compile-j1" depends="init, configure-compiler">    <!-- jdk7 -->
507    
508    
509      <mkdir dir="${build.j1.dir}"/>    <target name="jdk7compile"
510              depends="configure-compiler"
511              description="Compiles src/jdk7 sources">
512    
513      <javac srcdir="${j1.src.dir}"      <mkdir dir="${build.jdk7.classes.dir}"/>
514            destdir="${build.j1.dir}"  
515        <javac srcdir="${jdk7src.dir}"
516               destdir="${build.jdk7.classes.dir}"
517              debug="${build.debug}"              debug="${build.debug}"
518         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
519        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
520             source="${build.sourcelevel}" >             source="1.6"
521               classpath=""
522               bootclasspath="${bootclasspath6}"
523               includeAntRuntime="false"
524               includeJavaRuntime="false"
525               executable="${javac6}"
526               fork="true">
527    
528        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="**/dijkstra/**"/>  
   
529        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
530        <classpath refid="j1.classpath"/>        <compilerarg value="-XDignore.symbol.file=true"/>
531          <compilerarg value="-Xlint:all"/>
532    
533      </javac>      </javac>
534    
535    </target>    </target>
536    
537    
   <target name="sw" depends="compile-j1"  
           description="Runs the SwingWorker demo">  
538    
539      <!--    <target name="jdk7jar"
540      <java classname="jsr166.swing.SwingWorkerDemo" fork="true">            depends="jdk7compile"
541        <classpath refid="j1.classpath"/>            description="Builds library jar from compiled sources">
     </java>  
     -->  
542    
543      <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>      <mkdir dir="${build.jdk7.lib.dir}"/>
544    
545      <exec dir="${build.j1.dir}" executable="appletviewer.exe">      <jar destfile="${jdk7product.jar}" index="true">
546        <arg value="${build.j1.dir}/SwingWorker.html"/>        <fileset dir="${build.jdk7.classes.dir}"/>
547      </exec>      </jar>
548    
549    </target>    </target>
550    
   <target name="j1" depends="compile-j1"  
           description="Runs a standalone JavaOne program">  
551    
     <java classname="${j1.test}" fork="true">  
       <classpath refid="j1.classpath"/>  
       <jvmarg value="-client"/>  
552    
553        <!-- TestPseudoRandom args -->    <target name="jdk7docs"
554        <arg value="2"/>            description="Builds javadocs with custom tags to build folder">
       <arg value="25"/>  
       <arg value="100000"/>  
555    
556        <!-- WebCrawler args -->      <delete dir="${build.jdk7.docs.dir}"/>
557        <!--      <mkdir dir="${build.jdk7.docs.dir}"/>
       <arg value="jsr166.webcrawler.WebCrawler3"/>  
       <arg value="http://www.priorartisans.com"/>  
       <arg value="25"/>  
       -->  
558    
559      </java>      <javadoc destdir="${build.jdk7.docs.dir}"
560                 packagenames="none"
561                 link="${jdkapi7docs.url}"
562                 overview="${jdk7src.dir}/intro.html"
563                 sourcepath="${jdk7src.dir}"
564                 bootclasspath="${bootclasspath6}"
565                 classpath=""
566                 source="1.6"
567                 executable="${javadoc7}"
568                 additionalparam="-XDignore.symbol.file=true" >
569          <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
570            <include name="**/*.java"/>
571          </fileset>
572        </javadoc>
573    
574    </target>    </target>
575    
576    
577    <target name="test-j1" depends="compile-j1"    <target name="jdk7dist"
578            description="Runs testcases from the JavaOne source directories">            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
579              description="Puts all distributable products in single hierarchy"/>
580    
     <junit printsummary="true"  
              showoutput="true"  
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.j1.dir}"  
                    fork="true">  
581    
       <!-- <jvmarg value="-server"/> -->  
       <classpath refid="j1.classpath"/>  
       <formatter type="xml"/>  
582    
583        <batchtest todir="${build.j1.dir}">    <target name="jdk7clean"
584          <fileset dir="${j1.src.dir}">            description="Removes all build products">
           <include name="**/*Test.java"/>  
         </fileset>  
       </batchtest>  
585    
586      </junit>      <delete dir="${build.jdk7.dir}"/>
587    
588      <available property="junit.report.format"    </target>
                   value="frames"  
               classname="org.apache.xalan.lib.Redirect"/>  
     <property name="junit.report.format" value="noframes"/>  
589    
590      <junitreport todir="${build.j1.dir}">  
591        <fileset dir="${build.j1.dir}">  
592          <include name="TEST-*.xml"/>    <target name="jdk7dist-clean"
593              description="Removes all build and distribution products">
594    
595      </target>
596    
597      <target name="jdk7dist-docs"
598              description="Builds javadocs without custom tags to dist folder">
599    
600        <delete dir="${dist.jdk7.docs.dir}"/>
601        <mkdir dir="${dist.jdk7.docs.dir}"/>
602    
603        <javadoc destdir="${dist.jdk7.docs.dir}"
604                 packagenames="none"
605                 link="${jdkapi7docs.url}"
606                 overview="${jdk7src.dir}/intro.html"
607                 sourcepath="${jdk7src.dir}"
608                 classpath=""
609                 executable="${javadoc7}"
610                 bootclasspath="${bootclasspath6}"
611                 source="1.6">
612          <arg value="-XDignore.symbol.file=true"/>
613          <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
614            <include name="**/*.java"/>
615        </fileset>        </fileset>
616        <report styledir="${stylesheet.dir}"      </javadoc>
                 format="${junit.report.format}"  
                  todir="${build.j1.dir}"  
       />  
     </junitreport>  
617    
618      <fail message="Test Cases Failed" if="junit.failed"/>    </target>
619    
620      <target name="jdk7dist-jar"
621              depends="jdk7clean, jdk7jar">
622    
623        <copy file="${jdk7product.jar}" todir="${dist.dir}"/>
624    
625    </target>    </target>
626    
627      <!-- jsr166x -->
628    
629    
630      <target name="jsr166xcompile"
631              depends="init, configure-compiler"
632              description="Compiles jsr166x sources">
633    
634        <mkdir dir="${build.jsr166x.dir}"/>
635    
636        <javac srcdir="${jsr166xsrc.dir}"
637              destdir="${build.jsr166x.dir}"
638                debug="${build.debug}"
639           debuglevel="${build.debuglevel}"
640          deprecation="${build.deprecation}"
641               source="${build.sourcelevel}"
642                 fork="true">
643    
644    <!-- C++ and JNI definitions and demos -->        <include name="**/*.java"/>
645          <compilerarg line="${build.args}"/>
646          <compilerarg value="-XDignore.symbol.file=true"/>
647    
648    <target name="configure-cpp">      </javac>
649    
650      <!-- Define tasks and types -->    </target>
651    
     <path id="cpptasks.path">  
       <pathelement location="${lib.dir}/cpptasks.jar"/>  
     </path>  
     <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>  
     <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>  
652    
     <!-- Set platform property for JNI includes -->  
653    
654      <condition property="platform" value="linux">    <target name="jsr166xjar"
655        <os name="Linux"/>            depends="jsr166xcompile"
656      </condition>            description="Builds library jar from compiled sources">
657      <condition property="platform" value="win32">  
658        <os family="windows"/>      <mkdir dir="${build.jsr166xlib.dir}"/>
659      </condition>  
660      <condition property="platform" value="solaris">      <jar destfile="${jsr166xproduct.jar}">
661        <os name="SunOS"/>        <fileset dir="${build.jsr166x.dir}"/>
662      </condition>      </jar>
663    
664    </target>    </target>
665    
666    
   <target name="cppdemo" depends="configure-cpp">  
667    
668      <mkdir dir="${build.dir}"/>    <target name="jsr166xdocs"
669              description="Builds javadocs with custom tags to build folder">
670    
671      <cc multithreaded="true"      <delete dir="${build.jsr166xjavadocs.dir}"/>
672                   name="g++"      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
                objdir="${build.dir}"  
               outfile="${build.dir}/CppDemo">  
       <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>  
       <libset libs="stdc++"/>  
     </cc>  
673    
674      <exec executable="${build.dir}/CppDemo">      <javadoc destdir="${build.jsr166xjavadocs.dir}"
675        <arg line="count in word frequency of word in command line count"/>               packagenames="jsr166x"
676      </exec>               link="${jdkapidocs.url}"
677                 source="${build.sourcelevel}"
678                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
679                 additionalparam="-XDignore.symbol.file=true" />
680    
681    </target>    </target>
682    
683    
684    <target name="jnidemo" depends="init, configure-compiler, configure-cpp">    <target name="jsr166xdist"
685              depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
686              description="Puts all distributable products in single hierarchy"/>
687    
688    
     <mkdir dir="${build.testcases.dir}"/>  
689    
690      <javac srcdir="${test.src.dir}"    <target name="jsr166xclean"
691            destdir="${build.testcases.dir}"            description="Removes all build products">
692    
693        <delete dir="${build.jsr166x.dir}"/>
694        <delete dir="${build.jsr166xlib.dir}"/>
695    
696      </target>
697    
698    
699    
700      <target name="jsr166xdist-clean"
701              description="Removes all build and distribution products">
702    
703      </target>
704    
705    
706    
707      <target name="jsr166xdist-docs"
708              description="Builds javadocs without custom tags to dist folder">
709    
710        <delete dir="${dist.jsr166xjavadocs.dir}"/>
711        <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
712    
713        <javadoc destdir="${dist.jsr166xjavadocs.dir}"
714                 packagenames="jsr166x"
715                 link="${jdkapidocs.url}"
716                 source="${build.sourcelevel}"
717                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
718                 additionalparam="-XDignore.symbol.file=true" />
719    
720      </target>
721    
722      <target name="jsr166xdist-jar"
723              depends="jsr166xclean, jsr166xjar">
724    
725        <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
726    
727      </target>
728    
729      <!-- jsr166y -->
730    
731    
732      <target name="jsr166ycompile"
733              depends="init, configure-compiler"
734              description="Compiles jsr166y sources">
735    
736        <mkdir dir="${build.jsr166y.dir}"/>
737    
738        <javac srcdir="${jsr166ysrc.dir}"
739              destdir="${build.jsr166y.dir}"
740              debug="${build.debug}"              debug="${build.debug}"
741         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
742        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
743             source="${build.sourcelevel}"             source="${build.sourcelevel}"
744               fork="true">               fork="true">
745        <compilerarg value="${bootclasspath.args}"/>  
746          <include name="**/*.java"/>
747        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
748        <classpath refid="test.classpath"/>        <compilerarg value="-XDignore.symbol.file=true"/>
749        <include name="JniDemo.java"/>        <compilerarg value="${bootclasspath.args}"/>
750    
751    <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
752    
753      </javac>      </javac>
754    
755      <javah destdir="${build.testcases.dir}"    </target>
756        classpathref="test.classpath">  
757        <class name="JniDemo"/>  
758      </javah>  
759      <target name="jsr166yjar"
760      <cc multithreaded="true"            depends="jsr166ycompile"
761                   name="g++"            description="Builds library jar from compiled sources">
762                 objdir="${build.dir}"  
763                outfile="${build.dir}/JniDemo"      <mkdir dir="${build.jsr166ylib.dir}"/>
764                outtype="shared">  
765        <jar destfile="${jsr166yproduct.jar}" index="true">
766        <compiler>        <fileset dir="${build.jsr166y.dir}"/>
767          <defineset>      </jar>
           <define name="__int64" value="long long"/>  
         </defineset>  
         <includepath location="${java.home}/../include"/>  
         <includepath location="${java.home}/../include/${platform}"/>  
         <compilerarg value="-mno-cygwin"/>  
       </compiler>  
   
       <linker>  
         <linkerarg value="--add-stdcall-alias"/>  
       </linker>  
   
       <includepath location="${build.testcases.dir}"/>  
   
       <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>  
   
       <libset libs="stdc++"/>  
   
     </cc>  
   
     <!-- Necessary if windows, harmless if not -->  
     <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>  
   
     <java classname="JniDemo" fork="true">  
       <!-- Watch out: path separator hardwired to semicolon here! -->  
       <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>  
       <classpath refid="test.classpath"/>  
       <arg line="count in word frequency of word in command line count"/>  
     </java>  
768    
769    </target>    </target>
770    
771    
772    
773    <!-- Backward compatibility, work in progress (some files not checked in) -->    <target name="jsr166ydocs"
774              description="Builds javadocs with custom tags to build folder">
775    
776        <delete dir="${build.jsr166yjavadocs.dir}"/>
777        <mkdir dir="${build.jsr166yjavadocs.dir}"/>
778    
779        <javadoc destdir="${build.jsr166yjavadocs.dir}"
780                 packagenames="jsr166y"
781                 link="${jdkapidocs.url}"
782                 source="${build.sourcelevel}"
783                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
784                 additionalparam="-XDignore.symbol.file=true" />
785    
786      </target>
787    
788    
789      <target name="jsr166ydist"
790              depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
791              description="Puts all distributable products in single hierarchy"/>
792    
   <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>  
   <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>  
   <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>  
   <property name="pretiger.sourcelevel" value="1.4"/>  
793    
   <target name="defang"  
        depends="init"  
    description="Generates pre-Tiger compatible source">  
794    
795      <delete dir="${pretiger.src.dir}"/>    <target name="jsr166yclean"
796      <mkdir dir="${pretiger.src.dir}"/>            description="Removes all build products">
797    
798      <exec executable="perl">      <delete dir="${build.jsr166y.dir}"/>
799        <arg file="etc/defang.pl"/>      <delete dir="${build.jsr166ylib.dir}"/>
       <!-- <arg value="-v"/> -->  
       <arg value="-s"/> <arg file="${src.dir}"/>  
       <arg value="-t"/> <arg file="${pretiger.src.dir}"/>  
     </exec>  
800    
801    </target>    </target>
802    
   <target name="compile-pretiger"  
           depends="init, configure-compiler, defang"  
           description="Compiles pre-Tiger sources to build folder">  
803    
     <mkdir dir="${build.pretiger.dir}"/>  
804    
805      <javac srcdir="${pretiger.src.dir}"    <target name="jsr166ydist-clean"
806            destdir="${build.pretiger.dir}"            description="Removes all build and distribution products">
807    
808      </target>
809    
810      <target name="jsr166ydist-docs"
811              description="Builds javadocs without custom tags to dist folder">
812    
813        <delete dir="${dist.jsr166yjavadocs.dir}"/>
814        <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
815    
816        <javadoc destdir="${dist.jsr166yjavadocs.dir}"
817                 packagenames="jsr166y"
818                 link="${jdkapidocs.url}"
819                 source="${build.sourcelevel}"
820                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
821                 additionalparam="-XDignore.symbol.file=true" />
822    
823      </target>
824    
825      <target name="jsr166ydist-jar"
826              depends="jsr166yclean, jsr166yjar">
827    
828        <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
829    
830      </target>
831    
832    
833      <!-- extra166y -->
834    
835    
836      <target name="extra166ycompile"
837              depends="init, configure-compiler, jsr166ycompile"
838              description="Compiles extra166y sources">
839    
840        <mkdir dir="${build.extra166y.dir}"/>
841    
842        <javac srcdir="${extra166ysrc.dir}"
843              destdir="${build.extra166y.dir}"
844              debug="${build.debug}"              debug="${build.debug}"
845                classpath="${jsr166yproduct.jar}"
846         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
847        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
848             source="${pretiger.sourcelevel}"             source="${build.sourcelevel}"
849               fork="true">               fork="true">
850    
851          <include name="**/*.java"/>
852        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
853        <exclude name="**/Thread.java"/>        <compilerarg value="-XDignore.symbol.file=true"/>
854          <compilerarg value="${bootclasspath.args}"/>
855    
856    <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
857    
858      </javac>      </javac>
859    
860    </target>    </target>
861    
   <target name="pretiger" depends="compile-pretiger">  
862    
     <mkdir dir="${build.lib.dir}"/>  
863    
864      <jar destfile="${pretiger.jar}">    <target name="extra166yjar"
865        <fileset dir="${build.pretiger.dir}">            depends="extra166ycompile"
866        </fileset>            description="Builds library jar from compiled sources">
867    
868        <mkdir dir="${build.extra166ylib.dir}"/>
869    
870        <jar destfile="${extra166yproduct.jar}" index="true">
871          <fileset dir="${build.extra166y.dir}"/>
872      </jar>      </jar>
873    
874    </target>    </target>
875    
   <!-- jsr166x -->  
876    
877    
878    <target name="jsr166xcompile"    <target name="extra166ydocs"
879              description="Builds javadocs with custom tags to build folder">
880    
881        <delete dir="${build.extra166yjavadocs.dir}"/>
882        <mkdir dir="${build.extra166yjavadocs.dir}"/>
883    
884        <javadoc destdir="${build.extra166yjavadocs.dir}"
885                 packagenames="extra166y"
886                 link="${jdkapidocs.url}"
887                 source="${build.sourcelevel}"
888                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
889                 additionalparam="-XDignore.symbol.file=true" />
890    
891      </target>
892    
893    
894      <target name="extra166ydist"
895              depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
896              description="Puts all distributable products in single hierarchy"/>
897    
898    
899    
900      <target name="extra166yclean"
901              description="Removes all build products">
902    
903        <delete dir="${build.extra166y.dir}"/>
904        <delete dir="${build.extra166ylib.dir}"/>
905    
906      </target>
907    
908    
909    
910      <target name="extra166ydist-clean"
911              description="Removes all build and distribution products">
912    
913      </target>
914    
915      <target name="extra166ydist-docs"
916              description="Builds javadocs without custom tags to dist folder">
917    
918        <delete dir="${dist.extra166yjavadocs.dir}"/>
919        <mkdir dir="${dist.extra166yjavadocs.dir}"/>
920    
921        <javadoc destdir="${dist.extra166yjavadocs.dir}"
922                 packagenames="extra166y"
923                 link="${jdkapidocs.url}"
924                 source="${build.sourcelevel}"
925                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
926                 additionalparam="-XDignore.symbol.file=true" />
927    
928      </target>
929    
930      <target name="extra166ydist-jar"
931              depends="extra166yclean, extra166yjar">
932    
933        <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
934    
935      </target>
936    
937      <!-- jsr166e -->
938    
939    
940      <target name="jsr166ecompile"
941            depends="init, configure-compiler"            depends="init, configure-compiler"
942            description="Compiles jsr166x sources">            description="Compiles jsr166e sources">
943    
944      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166e.dir}"/>
945    
946      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${jsr166esrc.dir}"
947            destdir="${build.jsr166x.dir}"            destdir="${build.jsr166e.dir}"
948              debug="${build.debug}"              debug="${build.debug}"
949         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
950        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
951             source="${build.sourcelevel}"             source="1.7"
952               fork="true">               fork="true">
953    
954        <include name="**/*.java"/>        <include name="**/*.java"/>
955        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
956          <compilerarg value="-XDignore.symbol.file=true"/>
957          <compilerarg value="${bootclasspath.args}"/>
958    
959    <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
960    
961      </javac>      </javac>
962    
# Line 977  Line 964 
964    
965    
966    
967    <target name="jsr166xjar"    <target name="jsr166ejar"
968            depends="jsr166xcompile"            depends="jsr166ecompile"
969            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
970    
971      <mkdir dir="${build.jsr166xlib.dir}"/>      <mkdir dir="${build.jsr166elib.dir}"/>
972    
973      <jar destfile="${jsr166xproduct.jar}">      <jar destfile="${jsr166eproduct.jar}" index="true">
974        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
975      </jar>      </jar>
976    
977    </target>    </target>
978    
979    
980    
981    <target name="jsr166xdocs"    <target name="jsr166edocs"
982            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs with custom tags to build folder">
983    
984      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${build.jsr166ejavadocs.dir}"/>
985      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${build.jsr166ejavadocs.dir}"/>
   
     <javadoc destdir="${build.jsr166xjavadocs.dir}"  
                 link="http://java.sun.com/j2se/1.5.0/docs/api/"  
     >  
       <packageset dir="${topsrc.dir}" defaultexcludes="yes">  
       <include name="jsr166x"/>  
       </packageset>  
   
986    
987      </javadoc>      <javadoc destdir="${build.jsr166ejavadocs.dir}"
988                 packagenames="jsr166e,jsr166e.extra"
989                 link="${jdkapidocs.url}"
990                 source="1.7"
991                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
992                 additionalparam="-XDignore.symbol.file=true" />
993    
994    </target>    </target>
995    
996    
997    <target name="jsr166xdist"    <target name="jsr166edist"
998            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
999            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1000    
1001    
1002    
1003    <target name="jsr166xclean"    <target name="jsr166eclean"
1004            description="Removes all build products">            description="Removes all build products">
1005    
1006      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
1007      <delete dir="${build.jsr166xlib.dir}"/>      <delete dir="${build.jsr166elib.dir}"/>
1008    
1009    </target>    </target>
1010    
1011    
1012    
1013    <target name="jsr166xdist-clean"    <target name="jsr166edist-clean"
1014            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1015    
1016    </target>    </target>
1017    
1018      <target name="jsr166edist-docs"
   
   <target name="jsr166xdist-docs"  
1019            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs without custom tags to dist folder">
1020    
1021      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
1022      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
   
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
                 link="http://java.sun.com/j2se/1.5.0/docs/api/"  
               source="${build.sourcelevel}">  
1023    
1024        <packageset dir="${topsrc.dir}" defaultexcludes="yes">      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1025        <include name="jsr166x"/>               packagenames="jsr166e,jsr166e.extra"
1026        </packageset>               link="${jdkapidocs.url}"
1027                 source="1.7"
1028      </javadoc>               sourcepath="${topsrc.dir}:${jdksrc.dir}"
1029                 additionalparam="-XDignore.symbol.file=true" />
1030    
1031    </target>    </target>
1032    
1033    <target name="jsr166xdist-jar"    <target name="jsr166edist-jar"
1034            depends="jsr166xclean, jsr166xjar">            depends="jsr166eclean, jsr166ejar">
1035    
1036      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1037    
1038    </target>    </target>
1039    

Legend:
Removed from v.1.70  
changed lines
  Added in v.1.92

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8