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

Diff of /jsr166/build.xml

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

revision 1.78 by dl, Sat Aug 1 13:05:44 2009 UTC revision 1.89 by jsr166, Fri Jun 10 18:07:30 2011 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"/>
28    
29    <!-- Build locations -->    <!-- Build locations -->
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"/>
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"/>
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.jsr166x.dir"    location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40    
41    <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44    
45    <property name="build.extra166y.dir"    location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
46    <property name="build.extra166ylib.dir"        location="${build.dir}/extra166ylib"/>    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47    <property name="build.extra166yjavadocs.dir"   location="${build.dir}/extra166yjavadocs"/>    <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48    
49    <!-- Source locations -->    <!-- Source locations -->
50    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 57  Line 57 
57    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
58    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59    <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60    <property name="extra166ysrc.dir"       location="${basedir}/src/extra166y"/>    <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61      <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
62    <!-- Distribution locations -->    <!-- Distribution locations -->
63    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66    <property name="dist.extra166yjavadocs.dir"    location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
67    
68    <!-- Jar locations -->    <!-- Jar locations -->
69    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
70    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72    <property name="extra166yproduct.jar"   location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
74    
75    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
# Line 89  Line 89 
89    
90    <!-- Main targets -->    <!-- Main targets -->
91    
92      <target name="dists"
93              depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94              description="Builds all public jars and docs"/>
95    
96    <target name="compile"    <target name="compile"
97            depends="init, configure-compiler"            depends="init, configure-compiler"
# Line 105  Line 108 
108               fork="true">               fork="true">
109    
110        <include name="**/*.java"/>        <include name="**/*.java"/>
111        <compilerarg value="-XDignore.symbol.file"/>        <compilerarg value="-XDignore.symbol.file=true"/>
112    
113  <!--  <!--
114        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 145  Line 148 
148      <delete dir="${build.javadocs.dir}"/>      <delete dir="${build.javadocs.dir}"/>
149      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${build.javadocs.dir}"/>
150    
151      <javadoc destdir="${build.javadocs.dir}"      <!-- the packagenames="none" hack below prevents scanning the -->
152                  link="http://java.sun.com/javase/6/docs/api/"      <!-- sourcepath for packages -->
             overview="${src.dir}/intro.html"  
             sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"  
     >            
   
       <packageset dir="${src.dir}"/>  
153    
154        <javadoc destdir="${build.javadocs.dir}"
155                 packagenames="none"
156                 link="http://download.oracle.com/javase/7/docs/api/"
157                 overview="${src.dir}/intro.html"
158                 sourcepath="${src.dir}:${jdksrc.dir}"
159                 additionalparam="-XDignore.symbol.file=true" >
160          <fileset dir="${src.dir}" defaultexcludes="yes">
161          <include name="**/*.java"/>
162          </fileset>
163      </javadoc>      </javadoc>
164    
165    </target>    </target>
# Line 164  Line 171 
171            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
172    
173    
   
174    <target name="release"    <target name="release"
175            depends="dist"            depends="dist"
176            description="Puts entire CVS tree, plus distribution productions, in a jar">            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 211  Line 217 
217      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
218      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
219    
220      <javadoc destdir="${dist.javadocs.dir}"      <!-- the packagenames="none" hack below prevents scanning the -->
221              link="http://java.sun.com/javase/6/docs/api/"      <!-- sourcepath for packages -->
             overview="${src.dir}/intro.html"  
222    
223              sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"      <javadoc destdir="${dist.javadocs.dir}"
224       >               packagenames="none"
225  <!--               link="http://download.oracle.com/javase/7/docs/api/"
226        <packageset dir="${src.dir}" defaultexcludes="yes">               overview="${src.dir}/intro.html"
227        <include name="java/util/concurrent"/>               sourcepath="${src.dir}:${jdksrc.dir}"
228        <include name="java/util/concurrent/atomic"/>               additionalparam="-XDignore.symbol.file=true" >
229        <include name="java/util/concurrent/locks"/>        <fileset dir="${src.dir}" defaultexcludes="yes">
230        </packageset>        <include name="**/*.java"/>
 -->  
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
       <include name="main/java/util/concurrent/*.java"/>  
       <include name="main/java/util/concurrent/atomic/*.java"/>  
       <include name="main/java/util/concurrent/locks/*.java"/>  
       <include name="main/java/util/*.java"/>  
 <!--  
       <include name="main/java/util/concurrent/*.html"/>  
       <include name="main/java/util/concurrent/atomic/*.html"/>  
       <include name="main/java/util/concurrent/locks/*.html"/>  
       <include name="main/java/util/*.html"/>  
 -->  
 <!--      <include name="jsr166x/*.java"/> -->  
231        </fileset>        </fileset>
232      </javadoc>      </javadoc>
233    
# Line 279  Line 271 
271    
272        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
273        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
274          <compilerarg value="-XDignore.symbol.file=true"/>
275    
276        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
277    
# Line 296  Line 289 
289    
290        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
291        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
292          <compilerarg value="-XDignore.symbol.file=true"/>
293    
294        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
295    
# Line 312  Line 306 
306    
307        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
308        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
309          <compilerarg value="-XDignore.symbol.file=true"/>
310    
311        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
312    
# Line 452  Line 447 
447    
448        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
449        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
450          <compilerarg value="-XDignore.symbol.file=true"/>
451    
452      </javac>      </javac>
453    
# Line 481  Line 477 
477    
478        <include name="**/*.java"/>        <include name="**/*.java"/>
479        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
480          <compilerarg value="-XDignore.symbol.file=true"/>
481    
482      </javac>      </javac>
483    
# Line 509  Line 506 
506      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
507    
508      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${build.jsr166xjavadocs.dir}"
509               link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166x"
510                 link="http://download.oracle.com/javase/7/docs/api/"
511              sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               source="${build.sourcelevel}"
512                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
513      >               additionalparam="-XDignore.symbol.file=true" />
       <packageset dir="${topsrc.dir}" defaultexcludes="yes">  
       <include name="jsr166x"/>  
       </packageset>  
   
   
     </javadoc>  
514    
515    </target>    </target>
516    
# Line 554  Line 545 
545      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
546    
547      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
548                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166x"
549                source="${build.sourcelevel}">               link="http://download.oracle.com/javase/7/docs/api/"
550                 source="${build.sourcelevel}"
551        <packageset dir="${topsrc.dir}" defaultexcludes="yes">               sourcepath="${topsrc.dir}:${jdksrc.dir}"
552        <include name="jsr166x"/>               additionalparam="-XDignore.symbol.file=true" />
       </packageset>  
   
     </javadoc>  
553    
554    </target>    </target>
555    
# Line 591  Line 579 
579    
580        <include name="**/*.java"/>        <include name="**/*.java"/>
581        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
582          <compilerarg value="-XDignore.symbol.file=true"/>
583        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
584    
585  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 622  Line 611 
611      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
612    
613      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${build.jsr166yjavadocs.dir}"
614                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166y"
615              sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"               link="http://download.oracle.com/javase/7/docs/api/"
616                 source="${build.sourcelevel}"
617      >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
618        <packageset dir="${topsrc.dir}" defaultexcludes="no">               additionalparam="-XDignore.symbol.file=true" />
       <include name="jsr166y"/>  
       </packageset>  
   
   
     </javadoc>  
619    
620    </target>    </target>
621    
# Line 664  Line 648 
648      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
649    
650      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
651                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166y"
652                source="${build.sourcelevel}"               link="http://download.oracle.com/javase/7/docs/api/"
653              sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"               source="${build.sourcelevel}"
654              >                         sourcepath="${topsrc.dir}:${jdksrc.dir}"
655        <fileset dir="${topsrc.dir}" defaultexcludes="yes">               additionalparam="-XDignore.symbol.file=true" />
       <include name="jsr166y/*.java"/>  
             </fileset>  
     </javadoc>  
656    
657    </target>    </target>
658    
# Line 702  Line 683 
683    
684        <include name="**/*.java"/>        <include name="**/*.java"/>
685        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
686          <compilerarg value="-XDignore.symbol.file=true"/>
687        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
688    
689  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 733  Line 715 
715      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${build.extra166yjavadocs.dir}"/>
716    
717      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${build.extra166yjavadocs.dir}"
718                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="extra166y"
719              sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"               link="http://download.oracle.com/javase/7/docs/api/"
720                 source="${build.sourcelevel}"
721      >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
722        <packageset dir="${topsrc.dir}" defaultexcludes="no">               additionalparam="-XDignore.symbol.file=true" />
       <include name="extra166y"/>  
       </packageset>  
   
   
     </javadoc>  
723    
724    </target>    </target>
725    
# Line 775  Line 752 
752      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
753    
754      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
755                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="extra166y"
756                source="${build.sourcelevel}"               link="http://download.oracle.com/javase/7/docs/api/"
757              sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"               source="${build.sourcelevel}"
758              >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
759        <fileset dir="${topsrc.dir}" defaultexcludes="yes">               additionalparam="-XDignore.symbol.file=true" />
       <include name="extra166y/*.java"/>  
             </fileset>  
     </javadoc>  
760    
761    </target>    </target>
762    
Legend:
Removed from v.1.78  
changed lines
  Added in v.1.89
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27