[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.77, Thu Jul 23 13:06:55 2009 UTC revision 1.100, Sat Jan 19 17:15:44 2013 UTC
# Line 8  Line 8 
8    
9    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
10    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
11    
12      The repository contains all dependencies except for ant and the JDK
13      itself.  Because the JDK version matters and because different
14      targets require different JDKs, we assume that users have created a
15      hierarchy containing:
16      $HOME/jdk/jdk6
17      $HOME/jdk/jdk7
18      $HOME/jdk/jdk8
19      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 21  Line 35 
35    
36    
37    <!-- Compilation options -->    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.5"/>    <property name="build.sourcelevel"    value="1.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 34  Line 48 
48    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.lib.dir"        location="${build.dir}/lib"/>
49    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
50    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.reports.dir"    location="${build.dir}/reports"/>
51    
52      <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53      <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54      <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55      <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56      <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57    
58    <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
59    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
# Line 42  Line 63 
63    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65    
66      <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67      <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68      <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69    
70    <property name="build.extra166y.dir"    location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"    location="${build.dir}/extra166y"/>
71    <property name="build.extra166ylib.dir"        location="${build.dir}/extra166ylib"/>    <property name="build.extra166ylib.dir"        location="${build.dir}/extra166ylib"/>
72    <property name="build.extra166yjavadocs.dir"   location="${build.dir}/extra166yjavadocs"/>    <property name="build.extra166yjavadocs.dir"   location="${build.dir}/extra166yjavadocs"/>
73    
74      <!-- JDK binary locations -->
75      <property name="jdks.home"  location="${user.home}/jdk"/>
76    
77      <macrodef name="defjdklocations">
78        <attribute name="v"/>
79        <sequential>
80        <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81        <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82        <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83        <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84        <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86        <property name="bootclasspath@{v}"
87         value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88        </sequential>
89      </macrodef>
90    
91      <defjdklocations v="6"/>
92      <defjdklocations v="7"/>
93      <defjdklocations v="8"/>
94    
95      <macrodef name="run-tck-tests">
96        <attribute name="jvm"/>
97        <attribute name="tck.classes"/>
98        <attribute name="product.jar" default="${product.jar}"/>
99        <attribute name="jvmflags" default=""/>
100        <sequential>
101        <java classname="JSR166TestCase"
102              jvm="@{jvm}" fork="true">
103            <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104            <jvmarg line="@{jvmflags}"/>
105            <classpath>
106              <pathelement location="${junit.jar}"/>
107              <pathelement location="@{tck.classes}"/>
108            </classpath>
109        </java>
110        </sequential>
111      </macrodef>
112    
113    <!-- Source locations -->    <!-- Source locations -->
114    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
115    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 55  Line 119 
119    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
120    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
121    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
122    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123    <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124    <property name="extra166ysrc.dir"       location="${basedir}/src/extra166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125      <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126      <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127      <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128    
129    <!-- Distribution locations -->    <!-- Distribution locations -->
130    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
131      <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134      <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135    <property name="dist.extra166yjavadocs.dir"    location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir"    location="${dist.dir}/extra166ydocs"/>
136    
137    <!-- Jar locations -->    <!-- Jar locations -->
138    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139      <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142      <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143    <property name="extra166yproduct.jar"   location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166yproduct.jar"   location="${build.extra166ylib.dir}/extra166y.jar"/>
144    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
145    
146    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
147    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
148    
149      <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150      <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151      <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152      <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153    
154      <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155      <!-- The below does not yet exist as of 2012-11 -->
156      <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157      <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158    
159    <!-- Test classpath -->    <!-- Test classpath -->
160    <path id="test.classpath">    <path id="test.classpath">
161      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 86  Line 167 
167      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
168    </path>    </path>
169    
170      <!-- Support @jls tag, used in jdk8+ javadoc -->
171      <!-- TODO: How do we get &trade to work? -->
172      <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
173      <property name="javadoc.jls.cite" value="The Java Language Specification"/>
174      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
175    
176    <!-- Main targets -->    <!-- Main targets -->
177    
178      <target name="dists"
179              depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
180              description="Builds all public jars and docs"/>
181    
182    <target name="compile"    <target name="compile"
183            depends="init, configure-compiler"            depends="configure-compiler"
184            description="Compiles main sources to build folder">            description="Compiles src/main sources to build folder">
185    
186      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
187    
# Line 101  Line 190 
190              debug="${build.debug}"              debug="${build.debug}"
191         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
192        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
193             source="${build.sourcelevel}"             classpath=""
194               includeAntRuntime="false"
195               includeJavaRuntime="false"
196               executable="${javac8}"
197               fork="true">               fork="true">
198    
199        <include name="**/*.java"/>        <include name="**/*.java"/>
200        <compilerarg value="-XDignore.symbol.file"/>        <compilerarg line="${build.args}"/>
201          <compilerarg value="-XDignore.symbol.file=true"/>
202          <compilerarg value="-Xlint:all"/>
203    
204  <!--  <!--
205        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 140  Line 234 
234    
235    
236    <target name="docs"    <target name="docs"
237            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main">
   
     <delete dir="${build.javadocs.dir}"/>  
     <mkdir dir="${build.javadocs.dir}"/>  
238    
239      <javadoc destdir="${build.javadocs.dir}"      <delete dir="${dist.javadocs.dir}"/>
240                  link="http://java.sun.com/javase/6/docs/api/"      <mkdir dir="${dist.javadocs.dir}"/>
             overview="${src.dir}/intro.html"  
             sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"  
     >  
241    
242        <packageset dir="${src.dir}"/>      <!-- the packagenames="none" hack below prevents scanning the -->
243        <!-- sourcepath for packages -->
244    
245        <javadoc destdir="${dist.javadocs.dir}"
246                 packagenames="none"
247                 link="${jdkapi8docs.url}"
248                 overview="${src.dir}/intro.html"
249                 sourcepath="${src.dir}:${jdk8src.dir}"
250                 classpath=""
251                 executable="${javadoc8}">
252          <arg value="-XDignore.symbol.file=true"/>
253          <arg value="-tag"/>
254          <arg value="${javadoc.jls.option}"/>
255          <fileset dir="${src.dir}" defaultexcludes="yes">
256            <include name="**/*.java"/>
257          </fileset>
258      </javadoc>      </javadoc>
259    
260    </target>    </target>
# Line 160  Line 262 
262    
263    
264    <target name="dist"    <target name="dist"
265            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, docs"
266            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
267    
268    
   
269    <target name="release"    <target name="release"
270            depends="dist"            depends="dist"
271            description="Puts entire CVS tree, plus distribution productions, in a jar">            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 205  Line 306 
306    
307    
308    
   <target name="dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.javadocs.dir}"/>  
     <mkdir dir="${dist.javadocs.dir}"/>  
   
     <javadoc destdir="${dist.javadocs.dir}"  
             link="http://java.sun.com/javase/6/docs/api/"  
             overview="${src.dir}/intro.html"  
   
             sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"  
      >  
 <!--  
       <packageset dir="${src.dir}" defaultexcludes="yes">  
       <include name="java/util/concurrent"/>  
       <include name="java/util/concurrent/atomic"/>  
       <include name="java/util/concurrent/locks"/>  
       </packageset>  
 -->  
       <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"/> -->  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   
   
309    <!-- Internal targets -->    <!-- Internal targets -->
310    
311    
# Line 279  Line 342 
342    
343        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
344        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
345          <compilerarg value="-XDignore.symbol.file=true"/>
346    
347        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
348    
# Line 296  Line 360 
360    
361        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
362        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
363          <compilerarg value="-XDignore.symbol.file=true"/>
364    
365        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
366    
# Line 312  Line 377 
377    
378        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
379        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
380          <compilerarg value="-XDignore.symbol.file=true"/>
381    
382        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
383    
# Line 452  Line 518 
518    
519        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
520        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
521          <compilerarg value="-XDignore.symbol.file=true"/>
522    
523      </javac>      </javac>
524    
# Line 462  Line 529 
529    </target>    </target>
530    
531    
532      <!-- jsr166 4jdk7 -->
533    
534    
535      <target name="4jdk7compile"
536              depends="configure-compiler"
537              description="Compiles src/jdk7 sources, targeting jdk7">
538    
539        <mkdir dir="${build.4jdk7.classes.dir}"/>
540    
541        <javac srcdir="${4jdk7src.dir}"
542               destdir="${build.4jdk7.classes.dir}"
543               debug="${build.debug}"
544               debuglevel="${build.debuglevel}"
545               deprecation="${build.deprecation}"
546               source="1.6"
547               classpath=""
548               bootclasspath="${bootclasspath6}"
549               includeAntRuntime="false"
550               includeJavaRuntime="false"
551               executable="${javac7}"
552               fork="true">
553    
554          <include name="**/*.java"/>
555          <compilerarg line="${build.args}"/>
556          <compilerarg value="-XDignore.symbol.file=true"/>
557          <compilerarg value="-Xlint:all"/>
558    
559        </javac>
560    
561        <mkdir dir="${build.4jdk7.lib.dir}"/>
562    
563        <jar destfile="${4jdk7product.jar}" index="true">
564          <fileset dir="${build.4jdk7.classes.dir}"/>
565        </jar>
566    
567        <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
568    
569        <javac srcdir="${tck.src.dir}"
570               destdir="${build.4jdk7.tck.classes.dir}"
571               debug="${build.debug}"
572               debuglevel="${build.debuglevel}"
573               deprecation="${build.deprecation}"
574               source="1.6"
575               classpath="${junit.jar}"
576               bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
577               includeAntRuntime="false"
578               includeJavaRuntime="false"
579               executable="${javac7}"
580               fork="true">
581    
582          <include name="**/*.java"/>
583          <compilerarg line="${build.args}"/>
584          <compilerarg value="-XDignore.symbol.file=true"/>
585          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
586    
587        </javac>
588    
589      </target>
590    
591    
592      <target name="4jdk7-test-tck"
593              depends="4jdk7compile"
594              description="Runs tck tests for jsr166-4jdk7 directly">
595        <run-tck-tests
596          jvm="${java7}"
597          tck.classes="${build.4jdk7.tck.classes.dir}"
598          product.jar="${4jdk7product.jar}"/>
599      </target>
600    
601    
602      <target name="4jdk7-test-tck-junit"
603              depends="4jdk7compile"
604              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
605    
606        <junit printsummary="true"
607               showoutput="true"
608               errorProperty="junit.failed"
609               failureProperty="junit.failed"
610               includeantruntime="true"
611               jvm="${java7}"
612               fork="true">
613    
614          <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
615          <jvmarg value="-server"/>
616    
617          <classpath>
618            <pathelement location="${junit.jar}"/>
619            <pathelement location="${build.4jdk7.tck.classes.dir}"/>
620          </classpath>
621    
622          <formatter type="brief"/>
623    
624          <test name="JSR166TestCase" haltonfailure="no">
625          </test>
626    
627        </junit>
628      </target>
629    
630    
631      <target name="4jdk7docs"
632              description="Builds javadocs with custom tags to build folder">
633    
634        <delete dir="${build.4jdk7.docs.dir}"/>
635        <mkdir dir="${build.4jdk7.docs.dir}"/>
636    
637        <javadoc destdir="${build.4jdk7.docs.dir}"
638                 packagenames="none"
639                 link="${jdkapi7docs.url}"
640                 overview="${4jdk7src.dir}/intro.html"
641                 sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
642                 classpath=""
643                 executable="${javadoc7}">
644          <arg value="-XDignore.symbol.file=true"/>
645          <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
646            <include name="**/*.java"/>
647          </fileset>
648        </javadoc>
649    
650      </target>
651    
652    
653      <target name="4jdk7dist"
654              depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
655              description="Puts all distributable products in single hierarchy"/>
656    
657    
658    
659      <target name="4jdk7clean"
660              description="Removes all build products">
661    
662        <delete dir="${build.4jdk7.dir}"/>
663    
664      </target>
665    
666    
667    
668      <target name="4jdk7dist-clean"
669              description="Removes all build and distribution products">
670    
671      </target>
672    
673      <target name="4jdk7dist-docs"
674              description="Builds javadocs without custom tags to dist folder">
675    
676        <delete dir="${dist.4jdk7.docs.dir}"/>
677        <mkdir dir="${dist.4jdk7.docs.dir}"/>
678    
679        <javadoc destdir="${dist.4jdk7.docs.dir}"
680                 packagenames="none"
681                 link="${jdkapi7docs.url}"
682                 overview="${4jdk7src.dir}/intro.html"
683                 sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
684                 classpath=""
685                 executable="${javadoc7}">
686          <arg value="-XDignore.symbol.file=true"/>
687          <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
688            <include name="**/*.java"/>
689          </fileset>
690        </javadoc>
691    
692      </target>
693    
694      <target name="4jdk7dist-jar"
695              depends="4jdk7clean, 4jdk7compile">
696    
697        <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
698    
699      </target>
700    
701    <!-- jsr166x -->    <!-- jsr166x -->
702    
703    
# Line 481  Line 717 
717    
718        <include name="**/*.java"/>        <include name="**/*.java"/>
719        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
720          <compilerarg value="-XDignore.symbol.file=true"/>
721    
722      </javac>      </javac>
723    
# Line 509  Line 746 
746      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
747    
748      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${build.jsr166xjavadocs.dir}"
749               link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166x"
750                 link="${jdkapidocs.url}"
751              sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               source="${build.sourcelevel}"
752                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
753      >               additionalparam="-XDignore.symbol.file=true" />
       <packageset dir="${topsrc.dir}" defaultexcludes="yes">  
       <include name="jsr166x"/>  
       </packageset>  
   
   
     </javadoc>  
754    
755    </target>    </target>
756    
# Line 554  Line 785 
785      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
786    
787      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
788                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166x"
789                source="${build.sourcelevel}">               link="${jdkapidocs.url}"
790                 source="${build.sourcelevel}"
791        <packageset dir="${topsrc.dir}" defaultexcludes="yes">               sourcepath="${topsrc.dir}:${jdksrc.dir}"
792        <include name="jsr166x"/>               additionalparam="-XDignore.symbol.file=true" />
       </packageset>  
   
     </javadoc>  
793    
794    </target>    </target>
795    
# Line 591  Line 819 
819    
820        <include name="**/*.java"/>        <include name="**/*.java"/>
821        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
822          <compilerarg value="-XDignore.symbol.file=true"/>
823        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
824    
825  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 622  Line 851 
851      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
852    
853      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${build.jsr166yjavadocs.dir}"
854                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166y"
855              sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               link="${jdkapidocs.url}"
856                 source="${build.sourcelevel}"
857      >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
858        <packageset dir="${topsrc.dir}" defaultexcludes="no">               additionalparam="-XDignore.symbol.file=true" />
       <include name="jsr166y"/>  
       </packageset>  
   
   
     </javadoc>  
859    
860    </target>    </target>
861    
# Line 664  Line 888 
888      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
889    
890      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
891                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166y"
892                source="${build.sourcelevel}">               link="${jdkapidocs.url}"
893        <fileset dir="${topsrc.dir}" defaultexcludes="yes">               source="${build.sourcelevel}"
894        <include name="jsr166y/*.java"/>               sourcepath="${topsrc.dir}:${jdksrc.dir}"
895              </fileset>               additionalparam="-XDignore.symbol.file=true" />
     </javadoc>  
896    
897    </target>    </target>
898    
# Line 680  Line 903 
903    
904    </target>    </target>
905    
906    
907    <!-- extra166y -->    <!-- extra166y -->
908    
909    
# Line 700  Line 924 
924    
925        <include name="**/*.java"/>        <include name="**/*.java"/>
926        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
927          <compilerarg value="-XDignore.symbol.file=true"/>
928        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
929    
930  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 731  Line 956 
956      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${build.extra166yjavadocs.dir}"/>
957    
958      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${build.extra166yjavadocs.dir}"
959                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="extra166y"
960              sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               link="${jdkapidocs.url}"
961                 source="${build.sourcelevel}"
962      >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
963        <packageset dir="${topsrc.dir}" defaultexcludes="no">               additionalparam="-XDignore.symbol.file=true" />
       <include name="extra166y"/>  
       </packageset>  
   
   
     </javadoc>  
964    
965    </target>    </target>
966    
# Line 773  Line 993 
993      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
994    
995      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
996                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="extra166y"
997                source="${build.sourcelevel}">               link="${jdkapidocs.url}"
998        <fileset dir="${topsrc.dir}" defaultexcludes="yes">               source="${build.sourcelevel}"
999        <include name="extra166y/*.java"/>               sourcepath="${topsrc.dir}:${jdksrc.dir}"
1000              </fileset>               additionalparam="-XDignore.symbol.file=true" />
     </javadoc>  
1001    
1002    </target>    </target>
1003    
# Line 789  Line 1008 
1008    
1009    </target>    </target>
1010    
1011      <!-- jsr166e -->
1012    
1013      <target name="jsr166ecompile"
1014              depends="configure-compiler"
1015              description="Compiles jsr166e sources">
1016    
1017        <mkdir dir="${build.jsr166e.dir}"/>
1018    
1019        <javac srcdir="${topsrc.dir}"
1020               destdir="${build.jsr166e.dir}"
1021               debug="${build.debug}"
1022               debuglevel="${build.debuglevel}"
1023               deprecation="${build.deprecation}"
1024               source="1.7"
1025               classpath=""
1026               includeAntRuntime="false"
1027               includeJavaRuntime="false"
1028               executable="${javac7}"
1029               fork="true">
1030    
1031          <include name="jsr166e/**/*.java"/>
1032          <compilerarg line="${build.args}"/>
1033          <compilerarg value="-XDignore.symbol.file=true"/>
1034          <compilerarg value="-Xlint:all"/>
1035    
1036        </javac>
1037    
1038      </target>
1039    
1040    
1041    
1042      <target name="jsr166ejar"
1043              depends="jsr166ecompile"
1044              description="Builds library jar from compiled sources">
1045    
1046        <mkdir dir="${build.jsr166elib.dir}"/>
1047    
1048        <jar destfile="${jsr166eproduct.jar}" index="true">
1049          <fileset dir="${build.jsr166e.dir}"/>
1050        </jar>
1051    
1052      </target>
1053    
1054    
1055    
1056      <target name="jsr166edocs"
1057              description="Builds javadocs with custom tags to build folder">
1058    
1059        <delete dir="${build.jsr166ejavadocs.dir}"/>
1060        <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1061    
1062        <javadoc destdir="${build.jsr166ejavadocs.dir}"
1063                 packagenames="jsr166e,jsr166e.extra"
1064                 link="${jdkapi7docs.url}"
1065                 source="1.7"
1066                 sourcepath="${topsrc.dir}:${jdk7src.dir}"
1067                 executable="${javadoc7}"
1068                 additionalparam="-XDignore.symbol.file=true" >
1069          <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1070            <include name="jsr166e/**/*.java"/>
1071          </fileset>
1072        </javadoc>
1073    
1074      </target>
1075    
1076    
1077      <target name="jsr166edist"
1078              depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1079              description="Puts all distributable products in single hierarchy"/>
1080    
1081    
1082    
1083      <target name="jsr166eclean"
1084              description="Removes all build products">
1085    
1086        <delete dir="${build.jsr166e.dir}"/>
1087        <delete dir="${build.jsr166elib.dir}"/>
1088    
1089      </target>
1090    
1091    
1092    
1093      <target name="jsr166edist-clean"
1094              description="Removes all build and distribution products">
1095    
1096      </target>
1097    
1098      <target name="jsr166edist-docs"
1099              description="Builds javadocs without custom tags to dist folder">
1100    
1101        <delete dir="${dist.jsr166ejavadocs.dir}"/>
1102        <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1103    
1104        <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1105                 packagenames="jsr166e,jsr166e.extra"
1106                 link="${jdkapidocs.url}"
1107                 source="1.7"
1108                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
1109                 additionalparam="-XDignore.symbol.file=true" />
1110    
1111      </target>
1112    
1113      <target name="jsr166edist-jar"
1114              depends="jsr166eclean, jsr166ejar">
1115    
1116        <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1117    
1118      </target>
1119    
1120  </project>  </project>

Legend:
Removed from v.1.77  
changed lines
  Added in v.1.100

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8