[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.103, Sat Jan 19 21:35:40 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      <!-- TODO: Why isn't @jls a "standard" tag? -->
173      <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174      <property name="javadoc.jls.cite" value="The Java Language Specification"/>
175      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176    
177    <!-- Main targets -->    <!-- Main targets -->
178    
179      <target name="dists"
180              depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
181              description="Builds all public jars and docs"/>
182    
183    <target name="compile"    <target name="compile"
184            depends="init, configure-compiler"            depends="configure-compiler"
185            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
186    
187      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
188    
# Line 101  Line 191 
191              debug="${build.debug}"              debug="${build.debug}"
192         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
193        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
194             source="${build.sourcelevel}"             classpath=""
195               includeAntRuntime="false"
196               includeJavaRuntime="false"
197               executable="${javac8}"
198               fork="true">               fork="true">
199    
200        <include name="**/*.java"/>        <include name="**/*.java"/>
201        <compilerarg value="-XDignore.symbol.file"/>        <compilerarg line="${build.args}"/>
202          <compilerarg value="-XDignore.symbol.file=true"/>
203          <compilerarg value="-Xlint:all"/>
204    
205  <!--  <!--
206        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 134  Line 229 
229    
230    
231    <target name="test"    <target name="test"
232            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
233            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
234    
235    
236    
237    <target name="docs"    <target name="docs"
238            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
239    
240      <delete dir="${build.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
241      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
   
     <javadoc destdir="${build.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"  
     >  
242    
243        <packageset dir="${src.dir}"/>      <!-- the packagenames="none" hack below prevents scanning the -->
244        <!-- sourcepath for packages -->
245    
246        <javadoc destdir="${dist.javadocs.dir}"
247                 packagenames="none"
248                 link="${jdkapi8docs.url}"
249                 overview="${src.dir}/intro.html"
250                 sourcepath="${src.dir}:${jdk8src.dir}"
251                 classpath=""
252                 executable="${javadoc8}">
253          <arg value="-XDignore.symbol.file=true"/>
254          <arg value="-tag"/>
255          <arg value="${javadoc.jls.option}"/>
256          <fileset dir="${src.dir}" defaultexcludes="yes">
257            <include name="**/*.java"/>
258          </fileset>
259      </javadoc>      </javadoc>
260    
261    </target>    </target>
# Line 160  Line 263 
263    
264    
265    <target name="dist"    <target name="dist"
266            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, docs"
267            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
268    
269    
   
270    <target name="release"    <target name="release"
271            depends="dist"            depends="dist"
272            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 307 
307    
308    
309    
   <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>  
   
   
   
310    <!-- Internal targets -->    <!-- Internal targets -->
311    
312    
313    <target name="init">  <!--   <target name="init"> -->
314    
315      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
316      <loadfile property="version" srcFile="version.properties"/>  <!--     <loadfile property="version" srcFile="version.properties"/> -->
317      <echo>Building JSR-166 version ${version}</echo>  <!--     <echo>Building JSR-166 version ${version}</echo> -->
318      <echo>java.home is ${java.home}</echo>  <!--     <echo>java.home is ${java.home}</echo> -->
319    
320    </target>  <!--   </target> -->
321    
322    
323    <target name="dist-jar"    <target name="dist-jar"
# Line 279  Line 343 
343    
344        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
345        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
346          <compilerarg value="-XDignore.symbol.file=true"/>
347    
348        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
349    
# Line 296  Line 361 
361    
362        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
363        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
364          <compilerarg value="-XDignore.symbol.file=true"/>
365    
366        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
367    
# Line 312  Line 378 
378    
379        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
380        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
381          <compilerarg value="-XDignore.symbol.file=true"/>
382    
383        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
384    
# Line 437  Line 504 
504    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
505    
506    
507    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
508            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
509    
510      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 452  Line 519 
519    
520        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
521        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
522          <compilerarg value="-XDignore.symbol.file=true"/>
523    
524      </javac>      </javac>
525    
# Line 462  Line 530 
530    </target>    </target>
531    
532    
533      <!-- jsr166 4jdk7 -->
534    
535    
536      <target name="4jdk7compile"
537              depends="configure-compiler"
538              description="Compiles src/jdk7 sources, targeting jdk7">
539    
540        <mkdir dir="${build.4jdk7.classes.dir}"/>
541    
542        <javac srcdir="${4jdk7src.dir}"
543               destdir="${build.4jdk7.classes.dir}"
544               debug="${build.debug}"
545               debuglevel="${build.debuglevel}"
546               deprecation="${build.deprecation}"
547               source="1.6"
548               classpath=""
549               bootclasspath="${bootclasspath6}"
550               includeAntRuntime="false"
551               includeJavaRuntime="false"
552               executable="${javac7}"
553               fork="true">
554    
555          <include name="**/*.java"/>
556          <compilerarg line="${build.args}"/>
557          <compilerarg value="-XDignore.symbol.file=true"/>
558          <compilerarg value="-Xlint:all"/>
559    
560        </javac>
561    
562        <mkdir dir="${build.4jdk7.lib.dir}"/>
563    
564        <jar destfile="${4jdk7product.jar}" index="true">
565          <fileset dir="${build.4jdk7.classes.dir}"/>
566        </jar>
567    
568        <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
569    
570        <javac srcdir="${tck.src.dir}"
571               destdir="${build.4jdk7.tck.classes.dir}"
572               debug="${build.debug}"
573               debuglevel="${build.debuglevel}"
574               deprecation="${build.deprecation}"
575               source="1.6"
576               classpath="${junit.jar}"
577               bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
578               includeAntRuntime="false"
579               includeJavaRuntime="false"
580               executable="${javac7}"
581               fork="true">
582    
583          <include name="**/*.java"/>
584          <compilerarg line="${build.args}"/>
585          <compilerarg value="-XDignore.symbol.file=true"/>
586          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
587    
588        </javac>
589    
590      </target>
591    
592    
593      <target name="4jdk7-test-tck"
594              depends="4jdk7compile"
595              description="Runs tck tests for jsr166-4jdk7 directly">
596        <run-tck-tests
597          jvm="${java7}"
598          tck.classes="${build.4jdk7.tck.classes.dir}"
599          product.jar="${4jdk7product.jar}"/>
600      </target>
601    
602    
603      <target name="4jdk7-test-tck-junit"
604              depends="4jdk7compile"
605              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
606    
607        <junit printsummary="true"
608               showoutput="true"
609               errorProperty="junit.failed"
610               failureProperty="junit.failed"
611               includeantruntime="true"
612               jvm="${java7}"
613               fork="true">
614    
615          <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
616          <jvmarg value="-server"/>
617    
618          <classpath>
619            <pathelement location="${junit.jar}"/>
620            <pathelement location="${build.4jdk7.tck.classes.dir}"/>
621          </classpath>
622    
623          <formatter type="brief"/>
624    
625          <test name="JSR166TestCase" haltonfailure="no">
626          </test>
627    
628        </junit>
629      </target>
630    
631    
632      <target name="4jdk7docs"
633              description="Builds javadocs for src/jdk7 to dist dir">
634    
635        <delete dir="${dist.4jdk7.docs.dir}"/>
636        <mkdir dir="${dist.4jdk7.docs.dir}"/>
637    
638        <javadoc destdir="${dist.4jdk7.docs.dir}"
639                 packagenames="none"
640                 link="${jdkapi7docs.url}"
641                 overview="${4jdk7src.dir}/intro.html"
642                 sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
643                 classpath=""
644                 executable="${javadoc7}">
645          <arg value="-XDignore.symbol.file=true"/>
646          <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
647            <include name="**/*.java"/>
648          </fileset>
649        </javadoc>
650    
651      </target>
652    
653    
654      <target name="4jdk7dist"
655              depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
656              description="Puts all distributable products in single hierarchy"/>
657    
658    
659    
660      <target name="4jdk7clean"
661              description="Removes all build products">
662    
663        <delete dir="${build.4jdk7.dir}"/>
664    
665      </target>
666    
667    
668    
669      <target name="4jdk7dist-clean"
670              description="Removes all build and distribution products">
671    
672      </target>
673    
674      <target name="4jdk7dist-jar"
675              depends="4jdk7clean, 4jdk7compile">
676    
677        <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
678    
679      </target>
680    
681    <!-- jsr166x -->    <!-- jsr166x -->
682    
683    
684    <target name="jsr166xcompile"    <target name="jsr166xcompile"
685            depends="init, configure-compiler"            depends="configure-compiler"
686            description="Compiles jsr166x sources">            description="Compiles jsr166x sources">
687    
688      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.dir}"/>
# Line 481  Line 697 
697    
698        <include name="**/*.java"/>        <include name="**/*.java"/>
699        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
700          <compilerarg value="-XDignore.symbol.file=true"/>
701    
702      </javac>      </javac>
703    
# Line 503  Line 720 
720    
721    
722    <target name="jsr166xdocs"    <target name="jsr166xdocs"
723            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
724    
725      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${build.jsr166xjavadocs.dir}"/>
726      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
727    
728      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${build.jsr166xjavadocs.dir}"
729               link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166x"
730                 link="${jdkapidocs.url}"
731              sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               source="${build.sourcelevel}"
732                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
733      >               additionalparam="-XDignore.symbol.file=true" />
       <packageset dir="${topsrc.dir}" defaultexcludes="yes">  
       <include name="jsr166x"/>  
       </packageset>  
   
   
     </javadoc>  
734    
735    </target>    </target>
736    
# Line 548  Line 759 
759    
760    
761    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs"
762            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs to dist dir">
763    
764      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
765      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
766    
767      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
768                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166x"
769                source="${build.sourcelevel}">               link="${jdkapidocs.url}"
770                 source="${build.sourcelevel}"
771        <packageset dir="${topsrc.dir}" defaultexcludes="yes">               sourcepath="${topsrc.dir}:${jdksrc.dir}"
772        <include name="jsr166x"/>               additionalparam="-XDignore.symbol.file=true" />
       </packageset>  
   
     </javadoc>  
773    
774    </target>    </target>
775    
# Line 576  Line 784 
784    
785    
786    <target name="jsr166ycompile"    <target name="jsr166ycompile"
787            depends="init, configure-compiler"            depends="configure-compiler"
788            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
789    
790      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.dir}"/>
791    
792      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
793            destdir="${build.jsr166y.dir}"            destdir="${build.jsr166y.dir}"
794              debug="${build.debug}"              debug="${build.debug}"
795         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
796        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
797             source="${build.sourcelevel}"             source="1.6"
798               classpath=""
799               bootclasspath="${bootclasspath6}"
800               includeAntRuntime="false"
801               includeJavaRuntime="false"
802               executable="${javac7}"
803               fork="true">               fork="true">
804    
805        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
806        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
807        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-XDignore.symbol.file=true"/>
808          <compilerarg value="-Xlint:all"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
809      </javac>      </javac>
   
810    </target>    </target>
811    
812    
   
813    <target name="jsr166yjar"    <target name="jsr166yjar"
814            depends="jsr166ycompile"            depends="jsr166ycompile"
815            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 616  Line 825 
825    
826    
827    <target name="jsr166ydocs"    <target name="jsr166ydocs"
828            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
829    
830      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${build.jsr166yjavadocs.dir}"/>
831      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
832    
833      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${build.jsr166yjavadocs.dir}"
834                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166y"
835              sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               link="${jdkapidocs.url}"
836                 source="${build.sourcelevel}"
837      >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
838        <packageset dir="${topsrc.dir}" defaultexcludes="no">               additionalparam="-XDignore.symbol.file=true" />
       <include name="jsr166y"/>  
       </packageset>  
   
   
     </javadoc>  
839    
840    </target>    </target>
841    
# Line 658  Line 862 
862    </target>    </target>
863    
864    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs"
865            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs to dist dir">
866    
867      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
868      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
869    
870      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
871                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166y"
872                source="${build.sourcelevel}">               link="${jdkapidocs.url}"
873        <fileset dir="${topsrc.dir}" defaultexcludes="yes">               source="${build.sourcelevel}"
874        <include name="jsr166y/*.java"/>               sourcepath="${topsrc.dir}:${jdksrc.dir}"
875              </fileset>               additionalparam="-XDignore.symbol.file=true" />
     </javadoc>  
876    
877    </target>    </target>
878    
# Line 680  Line 883 
883    
884    </target>    </target>
885    
886    
887    <!-- extra166y -->    <!-- extra166y -->
888    
889    
890    <target name="extra166ycompile"    <target name="extra166ycompile"
891            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
892            description="Compiles extra166y sources">            description="Compiles extra166y sources">
893    
894      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.dir}"/>
895    
896      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
897            destdir="${build.extra166y.dir}"            destdir="${build.extra166y.dir}"
898              debug="${build.debug}"              debug="${build.debug}"
899              classpath="${jsr166yproduct.jar}"             classpath=""
900         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
901        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
902             source="${build.sourcelevel}"             source="1.6"
903               bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
904               includeAntRuntime="false"
905               includeJavaRuntime="false"
906               executable="${javac7}"
907               fork="true">               fork="true">
908    
909        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
910        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
911        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-XDignore.symbol.file=true"/>
912          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
913    
914      </javac>      </javac>
915    
# Line 725  Line 932 
932    
933    
934    <target name="extra166ydocs"    <target name="extra166ydocs"
935            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs with custom tags to build dir">
936    
937      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${build.extra166yjavadocs.dir}"/>
938      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${build.extra166yjavadocs.dir}"/>
939    
940      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${build.extra166yjavadocs.dir}"
941                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="extra166y"
942              sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               link="${jdkapidocs.url}"
943                 source="${build.sourcelevel}"
944      >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
945        <packageset dir="${topsrc.dir}" defaultexcludes="no">               additionalparam="-XDignore.symbol.file=true" />
       <include name="extra166y"/>  
       </packageset>  
   
   
     </javadoc>  
946    
947    </target>    </target>
948    
# Line 767  Line 969 
969    </target>    </target>
970    
971    <target name="extra166ydist-docs"    <target name="extra166ydist-docs"
972            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs to dist dir">
973    
974      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
975      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
976    
977      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
978                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="extra166y"
979                source="${build.sourcelevel}">               link="${jdkapidocs.url}"
980        <fileset dir="${topsrc.dir}" defaultexcludes="yes">               source="${build.sourcelevel}"
981        <include name="extra166y/*.java"/>               sourcepath="${topsrc.dir}:${jdksrc.dir}"
982              </fileset>               additionalparam="-XDignore.symbol.file=true" />
     </javadoc>  
983    
984    </target>    </target>
985    
# Line 789  Line 990 
990    
991    </target>    </target>
992    
993      <!-- jsr166e -->
994    
995      <target name="jsr166ecompile"
996              depends="configure-compiler"
997              description="Compiles jsr166e sources">
998    
999        <mkdir dir="${build.jsr166e.dir}"/>
1000    
1001        <javac srcdir="${topsrc.dir}"
1002               destdir="${build.jsr166e.dir}"
1003               debug="${build.debug}"
1004               debuglevel="${build.debuglevel}"
1005               deprecation="${build.deprecation}"
1006               source="1.7"
1007               classpath=""
1008               includeAntRuntime="false"
1009               includeJavaRuntime="false"
1010               executable="${javac7}"
1011               fork="true">
1012    
1013          <include name="jsr166e/**/*.java"/>
1014          <compilerarg line="${build.args}"/>
1015          <compilerarg value="-XDignore.symbol.file=true"/>
1016          <compilerarg value="-Xlint:all"/>
1017    
1018        </javac>
1019    
1020      </target>
1021    
1022    
1023    
1024      <target name="jsr166ejar"
1025              depends="jsr166ecompile"
1026              description="Builds library jar from compiled sources">
1027    
1028        <mkdir dir="${build.jsr166elib.dir}"/>
1029    
1030        <jar destfile="${jsr166eproduct.jar}" index="true">
1031          <fileset dir="${build.jsr166e.dir}"/>
1032        </jar>
1033    
1034      </target>
1035    
1036    
1037    
1038      <target name="jsr166edocs"
1039              description="Builds javadocs with custom tags to build dir">
1040    
1041        <delete dir="${build.jsr166ejavadocs.dir}"/>
1042        <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1043    
1044        <javadoc destdir="${build.jsr166ejavadocs.dir}"
1045                 packagenames="jsr166e,jsr166e.extra"
1046                 link="${jdkapi7docs.url}"
1047                 source="1.7"
1048                 sourcepath="${topsrc.dir}:${jdk7src.dir}"
1049                 executable="${javadoc7}"
1050                 additionalparam="-XDignore.symbol.file=true" >
1051          <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1052            <include name="jsr166e/**/*.java"/>
1053          </fileset>
1054        </javadoc>
1055    
1056      </target>
1057    
1058    
1059      <target name="jsr166edist"
1060              depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1061              description="Puts all distributable products in single hierarchy"/>
1062    
1063    
1064    
1065      <target name="jsr166eclean"
1066              description="Removes all build products">
1067    
1068        <delete dir="${build.jsr166e.dir}"/>
1069        <delete dir="${build.jsr166elib.dir}"/>
1070    
1071      </target>
1072    
1073    
1074    
1075      <target name="jsr166edist-clean"
1076              description="Removes all build and distribution products">
1077    
1078      </target>
1079    
1080      <target name="jsr166edist-docs"
1081              description="Builds javadocs to dist dir">
1082    
1083        <delete dir="${dist.jsr166ejavadocs.dir}"/>
1084        <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1085    
1086        <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1087                 packagenames="jsr166e,jsr166e.extra"
1088                 link="${jdkapidocs.url}"
1089                 source="1.7"
1090                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
1091                 additionalparam="-XDignore.symbol.file=true" />
1092    
1093      </target>
1094    
1095      <target name="jsr166edist-jar"
1096              depends="jsr166eclean, jsr166ejar">
1097    
1098        <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1099    
1100      </target>
1101    
1102  </project>  </project>

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8