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

Diff of /jsr166/build.xml

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

revision 1.87 by jsr166, Sat May 28 02:32:19 2011 UTC revision 1.113 by jsr166, Sun Jan 20 03:51:38 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 31  Line 45 
45    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
46    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.lib.dir"               location="${build.dir}/lib"/>  
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
48    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
   <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>  
   <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>  
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>  
49    
50    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53      <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54    
55      <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56      <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57      <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
60    <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>    <!-- JDK binary locations -->
61      <property name="jdks.home"  location="${user.home}/jdk"/>
62    
63      <macrodef name="defjdklocations">
64        <attribute name="v"/>
65        <sequential>
66        <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
67        <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
68        <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
69        <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
70        <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
71        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
72        <property name="bootclasspath@{v}"
73         value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
74        </sequential>
75      </macrodef>
76    
77      <defjdklocations v="6"/>
78      <defjdklocations v="7"/>
79      <defjdklocations v="8"/>
80    
81      <macrodef name="run-tck-tests">
82        <attribute name="jvm"/>
83        <attribute name="tck.classes"/>
84        <attribute name="product.jar" default="${product.jar}"/>
85        <attribute name="jvmflags" default=""/>
86        <sequential>
87        <java classname="JSR166TestCase"
88              jvm="@{jvm}" fork="true">
89            <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
90            <jvmarg line="@{jvmflags}"/>
91            <classpath>
92              <pathelement location="${junit.jar}"/>
93              <pathelement location="@{tck.classes}"/>
94            </classpath>
95        </java>
96        </sequential>
97      </macrodef>
98    
99    <!-- Source locations -->    <!-- Source locations -->
100    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 55  Line 105 
105    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
106    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
107    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
108    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
109    <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
110    <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112      <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113    
114    <!-- Distribution locations -->    <!-- Distribution locations -->
115    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119      <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120      <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121    
122    <!-- Jar locations -->    <!-- Jar locations -->
123    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128      <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129      <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130    
131    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
132    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
133    
134      <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
135      <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
136      <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
137      <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
138    
139      <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140      <!-- The below does not yet exist as of 2012-11 -->
141      <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142    
143      <!-- Default jdk api doc location (latest stable release seems best) -->
144      <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
145    
146    <!-- Test classpath -->    <!-- Test classpath -->
147    <path id="test.classpath">    <path id="test.classpath">
148      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 86  Line 154 
154      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
155    </path>    </path>
156    
157      <!-- Support @jls tag, used in jdk8+ javadoc -->
158      <!-- TODO: How do we get &trade to work? -->
159      <!-- TODO: Why isn't @jls a "standard" tag? -->
160      <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161      <property name="javadoc.jls.cite" value="The Java Language Specification"/>
162      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
163    
164    <!-- Main targets -->    <!-- Main targets -->
165    
166    <target name="dists"    <target name="dists"
167            depends="dist, jsr166xdist, jsr166ydist, extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
168            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
169    
170    <target name="compile"    <target name="compile"
171            depends="init, configure-compiler"            depends="configure-compiler"
172            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
173    
174      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
175    
176      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
177            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
178              debug="${build.debug}"             debug="${build.debug}"
179         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
180        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
181             source="${build.sourcelevel}"             classpath=""
182               fork="true">             includeAntRuntime="false"
183               includeJavaRuntime="false"
184               executable="${javac8}"
185               fork="true">
186    
187        <include name="**/*.java"/>        <include name="**/*.java"/>
188          <compilerarg line="${build.args}"/>
189        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
190          <compilerarg value="-Xlint:all"/>
191    
192  <!--  <!--
193        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 126  Line 205 
205            depends="compile"            depends="compile"
206            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
207    
     <mkdir dir="${build.lib.dir}"/>  
   
208      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
209        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
210      </jar>      </jar>
# Line 137  Line 214 
214    
215    
216    <target name="test"    <target name="test"
217            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
218            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)" />
219    
220    
221    
222    <target name="docs"    <target name="docs"
223            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
224    
225      <delete dir="${build.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
226      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
   
     <javadoc destdir="${build.javadocs.dir}"  
                 link="http://download.oracle.com/javase/7/docs/api/"  
             overview="${src.dir}/intro.html"  
             sourcepath="${src.dir}:${jdksrc.dir}"  
     >  
227    
228        <packageset dir="${src.dir}"/>      <!-- the packagenames="none" hack below prevents scanning the -->
229        <!-- sourcepath for packages -->
230    
231        <javadoc destdir="${dist.javadocs.dir}"
232                 packagenames="none"
233                 link="${jdkapi8docs.url}"
234                 overview="${src.dir}/intro.html"
235                 sourcepath="${src.dir}:${jdk8src.dir}"
236                 classpath=""
237                 executable="${javadoc8}">
238          <arg value="-XDignore.symbol.file=true"/>
239          <arg value="-tag"/>
240          <arg value="${javadoc.jls.option}"/>
241          <fileset dir="${src.dir}" defaultexcludes="yes">
242            <include name="**/*.java"/>
243          </fileset>
244      </javadoc>      </javadoc>
245    
246    </target>    </target>
# Line 163  Line 248 
248    
249    
250    <target name="dist"    <target name="dist"
251            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, docs"
252            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
253    
254    
# Line 191  Line 276 
276            description="Removes all build products">            description="Removes all build products">
277    
278      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
279    
280    </target>    </target>
281    
# Line 207  Line 290 
290    
291    
292    
   <target name="dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.javadocs.dir}"/>  
     <mkdir dir="${dist.javadocs.dir}"/>  
   
     <!-- the packagenames="none" hack below prevents scanning the -->  
     <!-- sourcepath for packages -->  
   
     <javadoc destdir="${dist.javadocs.dir}"  
              packagenames="none"  
              link="http://download.oracle.com/javase/7/docs/api/"  
              overview="${src.dir}/intro.html"  
              sourcepath="${src.dir}:${jdksrc.dir}" >  
       <fileset dir="${src.dir}" defaultexcludes="yes">  
       <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   
   
293    <!-- Internal targets -->    <!-- Internal targets -->
294    
295    
   <target name="init">  
   
     <!-- Version is kept in a separate file -->  
     <loadfile property="version" srcFile="version.properties"/>  
     <echo>Building JSR-166 version ${version}</echo>  
     <echo>java.home is ${java.home}</echo>  
   
   </target>  
   
   
296    <target name="dist-jar"    <target name="dist-jar"
297            depends="clean, jar">            depends="clean, jar">
298    
# Line 257  Line 307 
307      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
308    
309      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
310            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
311              debug="${build.debug}"             debug="${build.debug}"
312         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
313        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
314             source="${build.sourcelevel}"             source="6"
315               fork="true">             classpath="${junit.jar}"
316               bootclasspath="${product.jar}:${bootclasspath6}"
317               includeAntRuntime="false"
318               includeJavaRuntime="false"
319               executable="${javac8}"
320               fork="true">
321    
322        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
323        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
324        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
325          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
326    
327      </javac>      </javac>
328    
329      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
330            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
331              debug="${build.debug}"             debug="${build.debug}"
332         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
333        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
334             source="${build.sourcelevel}"             source="6"
335               fork="true">             classpath=""
336               bootclasspath="${product.jar}:${bootclasspath6}"
337               includeAntRuntime="false"
338               includeJavaRuntime="false"
339               executable="${javac8}"
340               fork="true">
341    
342        <include name="jsr166/test/**"/>        <include name="jsr166/test/**/*.java"/>
343    
       <compilerarg value="${bootclasspath.args}"/>  
344        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
345        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
346          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
347    
348      </javac>      </javac>
349    
# Line 303  Line 360 
360        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
361        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
362    
       <classpath refid="test.classpath"/>  
   
363      </javac>      </javac>
364  -->  -->
365    
# Line 324  Line 379 
379            errorProperty="junit.failed"            errorProperty="junit.failed"
380          failureProperty="junit.failed"          failureProperty="junit.failed"
381                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
382                        jvm="${java8}"
383                     fork="true">                     fork="true">
384    
385        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
386        <jvmarg value="-server"/>        <jvmarg value="-server"/>
387        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
388    
# Line 427  Line 483 
483    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
484    
485    
486    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
487            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
488    
489      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 453  Line 509 
509    </target>    </target>
510    
511    
512    <!-- jsr166x -->    <!-- jsr166 4jdk7 -->
513    
514    
515      <target name="4jdk7compile"
516              depends="configure-compiler"
517              description="Compiles src/jdk7 sources, targeting jdk7">
518    
519        <mkdir dir="${build.4jdk7.classes.dir}"/>
520    
521        <javac srcdir="${4jdk7src.dir}"
522               destdir="${build.4jdk7.classes.dir}"
523               debug="${build.debug}"
524               debuglevel="${build.debuglevel}"
525               deprecation="${build.deprecation}"
526               source="6"
527               classpath=""
528               bootclasspath="${bootclasspath6}"
529               includeAntRuntime="false"
530               includeJavaRuntime="false"
531               executable="${javac7}"
532               fork="true">
533    
534          <include name="**/*.java"/>
535          <compilerarg line="${build.args}"/>
536          <compilerarg value="-XDignore.symbol.file=true"/>
537          <compilerarg value="-Xlint:all"/>
538    
539        </javac>
540    
541        <jar destfile="${4jdk7product.jar}" index="true">
542          <fileset dir="${build.4jdk7.classes.dir}"/>
543        </jar>
544    
545        <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
546    
547        <javac srcdir="${tck.src.dir}"
548               destdir="${build.4jdk7.tck.classes.dir}"
549               debug="${build.debug}"
550               debuglevel="${build.debuglevel}"
551               deprecation="${build.deprecation}"
552               source="6"
553               classpath="${junit.jar}"
554               bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
555               includeAntRuntime="false"
556               includeJavaRuntime="false"
557               executable="${javac7}"
558               fork="true">
559    
560          <include name="**/*.java"/>
561          <compilerarg line="${build.args}"/>
562          <compilerarg value="-XDignore.symbol.file=true"/>
563          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
564    
565        </javac>
566    
567      </target>
568    
569    
570      <target name="4jdk7-test-tck"
571              depends="4jdk7compile"
572              description="Runs tck tests for jsr166-4jdk7 directly">
573        <run-tck-tests
574          jvm="${java7}"
575          tck.classes="${build.4jdk7.tck.classes.dir}"
576          product.jar="${4jdk7product.jar}"/>
577      </target>
578    
579    
580      <target name="4jdk7-test-tck-junit"
581              depends="4jdk7compile"
582              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
583    
584        <junit printsummary="true"
585               showoutput="true"
586               errorProperty="junit.failed"
587               failureProperty="junit.failed"
588               includeantruntime="true"
589               jvm="${java7}"
590               fork="true">
591    
592          <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
593          <jvmarg value="-server"/>
594    
595          <classpath>
596            <pathelement location="${junit.jar}"/>
597            <pathelement location="${build.4jdk7.tck.classes.dir}"/>
598          </classpath>
599    
600          <formatter type="brief"/>
601    
602          <test name="JSR166TestCase" haltonfailure="no">
603          </test>
604    
605        </junit>
606      </target>
607    
608    
609      <target name="4jdk7docs"
610              description="Builds javadocs for src/jdk7 to dist dir">
611    
612        <delete dir="${dist.4jdk7.docs.dir}"/>
613        <mkdir dir="${dist.4jdk7.docs.dir}"/>
614    
615        <javadoc destdir="${dist.4jdk7.docs.dir}"
616                 packagenames="none"
617                 link="${jdkapi7docs.url}"
618                 overview="${4jdk7src.dir}/intro.html"
619                 sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
620                 classpath=""
621                 executable="${javadoc7}">
622          <arg value="-XDignore.symbol.file=true"/>
623          <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
624            <include name="**/*.java"/>
625          </fileset>
626        </javadoc>
627    
628      </target>
629    
630    
631      <target name="4jdk7dist"
632              depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
633              description="Puts all distributable products in single hierarchy"/>
634    
635    
636    
637      <target name="4jdk7clean"
638              description="Removes all 4jdk7 build products">
639    
640        <delete dir="${build.4jdk7.dir}"/>
641    
642      </target>
643    
644    
645    
646      <target name="4jdk7dist-clean"
647              description="Removes all build and distribution products">
648    
649      </target>
650    
651      <target name="4jdk7dist-jar"
652              depends="4jdk7clean, 4jdk7compile">
653    
654        <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
655    
656      </target>
657    
658    
659      <!-- jsr166x -->
660    
661    <target name="jsr166xcompile"    <target name="jsr166xcompile"
662            depends="init, configure-compiler"            depends="configure-compiler"
663            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
664    
665      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.dir}"/>
666    
667      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
668            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.dir}"
669              debug="${build.debug}"             debug="${build.debug}"
670         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
671        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
672             source="${build.sourcelevel}"             classpath=""
673               fork="true">             source="5"
674               bootclasspath="${bootclasspath6}"
675               includeAntRuntime="false"
676               includeJavaRuntime="false"
677               executable="${javac7}"
678               fork="true">
679    
680        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
681        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
682        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
683          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
684    
685      </javac>      </javac>
686    
# Line 484  Line 692 
692            depends="jsr166xcompile"            depends="jsr166xcompile"
693            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
694    
695      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
   
     <jar destfile="${jsr166xproduct.jar}">  
696        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.dir}"/>
697      </jar>      </jar>
698    
# Line 495  Line 701 
701    
702    
703    <target name="jsr166xdocs"    <target name="jsr166xdocs"
704            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
705    
706      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
707      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
708    
709      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
710               packagenames="jsr166x"               packagenames="jsr166x.*"
711               link="http://download.oracle.com/javase/7/docs/api/"               link="${jdkapidocs.url}"
712               source="${build.sourcelevel}"               source="5"
713               sourcepath="${topsrc.dir}:${jdksrc.dir}" />               bootclasspath="${bootclasspath6}"
714                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
715                 executable="${javadoc7}"
716                 additionalparam="-XDignore.symbol.file=true" />
717    
718    </target>    </target>
719    
720    
721    <target name="jsr166xdist"    <target name="jsr166xdist"
722            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
723            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
724    
725    
726    
727    <target name="jsr166xclean"    <target name="jsr166xclean"
728            description="Removes all build products">            description="Removes all jsr166x build products">
729    
730      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
731    
732    </target>    </target>
733    
# Line 531  Line 739 
739    </target>    </target>
740    
741    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166xjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
              packagenames="jsr166x"  
              link="http://download.oracle.com/javase/7/docs/api/"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}" />  
   
   </target>  
   
742    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
743            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
744    
745      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
746    
747    </target>    </target>
748    
# Line 557  Line 750 
750    
751    
752    <target name="jsr166ycompile"    <target name="jsr166ycompile"
753            depends="init, configure-compiler"            depends="configure-compiler"
754            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
755    
756      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.dir}"/>
757    
758      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
759            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.dir}"
760              debug="${build.debug}"             debug="${build.debug}"
761         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
762        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
763             source="${build.sourcelevel}"             source="6"
764               fork="true">             classpath=""
765               bootclasspath="${bootclasspath6}"
766               includeAntRuntime="false"
767               includeJavaRuntime="false"
768               executable="${javac7}"
769               fork="true">
770    
771        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
772        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
773        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
774        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
775      </javac>      </javac>
   
776    </target>    </target>
777    
778    
   
779    <target name="jsr166yjar"    <target name="jsr166yjar"
780            depends="jsr166ycompile"            depends="jsr166ycompile"
781            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
782    
783      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
   
     <jar destfile="${jsr166yproduct.jar}" index="true">  
784        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.dir}"/>
785      </jar>      </jar>
786    
# Line 598  Line 789 
789    
790    
791    <target name="jsr166ydocs"    <target name="jsr166ydocs"
792            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
793    
794      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
795      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
796    
797      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
798               packagenames="jsr166y"               packagenames="jsr166y.*"
799               link="http://download.oracle.com/javase/7/docs/api/"               link="${jdkapidocs.url}"
800               source="${build.sourcelevel}"               source="6"
801               sourcepath="${topsrc.dir}:${jdksrc.dir}" />               bootclasspath="${bootclasspath6}"
802                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
803                 executable="${javadoc7}"
804                 additionalparam="-XDignore.symbol.file=true" />
805    
806    </target>    </target>
807    
808    
809    <target name="jsr166ydist"    <target name="jsr166ydist"
810            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
811            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
812    
813    
814    
815    <target name="jsr166yclean"    <target name="jsr166yclean"
816            description="Removes all build products">            description="Removes all jsr166y build products">
817    
818      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
819    
820    </target>    </target>
821    
# Line 633  Line 826 
826    
827    </target>    </target>
828    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166yjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"  
              packagenames="jsr166y"  
              link="http://download.oracle.com/javase/7/docs/api/"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}" />  
   
   </target>  
   
829    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
830            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
831    
832      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
833    
834    </target>    </target>
835    
836    
837    <!-- extra166y -->    <!-- extra166y -->
838    
839    
840    <target name="extra166ycompile"    <target name="extra166ycompile"
841            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
842            description="Compiles extra166y sources">            description="Compiles extra166y sources">
843    
844      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.dir}"/>
845    
846      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
847            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.dir}"
848              debug="${build.debug}"             debug="${build.debug}"
849              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
850         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
851        deprecation="${build.deprecation}"             classpath=""
852             source="${build.sourcelevel}"             source="6"
853               fork="true">             bootclasspath="${jsr166y.jar}:${bootclasspath6}"
854               includeAntRuntime="false"
855               includeJavaRuntime="false"
856               executable="${javac7}"
857               fork="true">
858    
859        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
860        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
861        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
862        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
863    
864      </javac>      </javac>
865    
# Line 689  Line 871 
871            depends="extra166ycompile"            depends="extra166ycompile"
872            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
873    
874      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
   
     <jar destfile="${extra166yproduct.jar}" index="true">  
875        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
876      </jar>      </jar>
877    
# Line 700  Line 880 
880    
881    
882    <target name="extra166ydocs"    <target name="extra166ydocs"
883            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
884    
885      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
886      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
887    
888      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
889               packagenames="extra166y"               packagenames="extra166y.*"
890               link="http://download.oracle.com/javase/7/docs/api/"               link="${jdkapidocs.url}"
891               source="${build.sourcelevel}"               source="6"
892               sourcepath="${topsrc.dir}:${jdksrc.dir}" />               bootclasspath="${bootclasspath6}"
893                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
894                 executable="${javadoc7}"
895                 additionalparam="-XDignore.symbol.file=true" />
896    
897    </target>    </target>
898    
899    
900    <target name="extra166ydist"    <target name="extra166ydist"
901            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
902            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
903    
904    
905    
906    <target name="extra166yclean"    <target name="extra166yclean"
907            description="Removes all build products">            description="Removes all extra166y build products">
908    
909      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
910    
911    </target>    </target>
912    
# Line 735  Line 917 
917    
918    </target>    </target>
919    
920    <target name="extra166ydist-docs"    <target name="extra166ydist-jar"
921            description="Builds javadocs without custom tags to dist folder">            depends="extra166yclean, extra166yjar">
922    
923      <delete dir="${dist.extra166yjavadocs.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
924    
925      <javadoc destdir="${dist.extra166yjavadocs.dir}"    </target>
926               packagenames="extra166y"  
927               link="http://download.oracle.com/javase/7/docs/api/"    <!-- jsr166e -->
928               source="${build.sourcelevel}"  
929               sourcepath="${topsrc.dir}:${jdksrc.dir}" />    <target name="jsr166ecompile"
930              depends="configure-compiler"
931              description="Compiles jsr166e sources">
932    
933        <mkdir dir="${build.jsr166e.dir}"/>
934    
935        <javac srcdir="${topsrc.dir}"
936               destdir="${build.jsr166e.dir}"
937               debug="${build.debug}"
938               debuglevel="${build.debuglevel}"
939               deprecation="${build.deprecation}"
940               source="7"
941               classpath=""
942               includeAntRuntime="false"
943               includeJavaRuntime="false"
944               executable="${javac7}"
945               fork="true">
946    
947          <include name="jsr166e/**/*.java"/>
948          <compilerarg line="${build.args}"/>
949          <compilerarg value="-XDignore.symbol.file=true"/>
950          <compilerarg value="-Xlint:all"/>
951    
952        </javac>
953    
954    </target>    </target>
955    
   <target name="extra166ydist-jar"  
           depends="extra166yclean, extra166yjar">  
956    
957      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>  
958      <target name="jsr166ejar"
959              depends="jsr166ecompile"
960              description="Builds library jar from compiled sources">
961    
962        <jar destfile="${jsr166e.jar}" index="true">
963          <fileset dir="${build.jsr166e.dir}"/>
964        </jar>
965    
966      </target>
967    
968    
969    
970      <target name="jsr166edocs"
971              description="Builds javadocs to build dir">
972    
973        <delete dir="${dist.jsr166ejavadocs.dir}"/>
974        <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
975    
976        <javadoc destdir="${dist.jsr166ejavadocs.dir}"
977                 packagenames="jsr166e.*"
978                 link="${jdkapidocs.url}"
979                 source="7"
980                 sourcepath="${topsrc.dir}:${jdk7src.dir}"
981                 executable="${javadoc7}"
982                 additionalparam="-XDignore.symbol.file=true" >
983        </javadoc>
984    
985      </target>
986    
987    
988      <target name="jsr166edist"
989              depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
990              description="Puts all distributable products in single hierarchy"/>
991    
992    
993    
994      <target name="jsr166eclean"
995              description="Removes all jsr166e build products">
996    
997        <delete dir="${build.jsr166e.dir}"/>
998    
999      </target>
1000    
1001    
1002      <target name="jsr166edist-clean"
1003              description="Removes all build and distribution products">
1004    
1005      </target>
1006    
1007      <target name="jsr166edist-jar"
1008              depends="jsr166eclean, jsr166ejar">
1009    
1010        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1011    
1012    </target>    </target>
1013    

Legend:
Removed from v.1.87  
changed lines
  Added in v.1.113

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