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

Diff of /jsr166/build.xml

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

revision 1.97 by jsr166, Tue Jan 15 01:15:02 2013 UTC revision 1.108 by jsr166, Sat Jan 19 23:58:12 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 32  Line 46 
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"/>
48    <property name="build.lib.dir"               location="${build.dir}/lib"/>    <property name="build.lib.dir"               location="${build.dir}/lib"/>
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
49    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
50    
51    <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
52    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
53    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
54    <property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
55    <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
56    
57    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
58    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>  
59    
60    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
61    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
62    
63    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
64    <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>    <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
65    
66    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
67    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
   <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>  
68    
69    <!-- JDK binary locations -->    <!-- JDK binary locations -->
70    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 63  Line 72 
72    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
73      <attribute name="v"/>      <attribute name="v"/>
74      <sequential>      <sequential>
75      <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
76      <property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
77      <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
78      <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
79      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>      <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
80        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
81      <property name="bootclasspath@{v}"      <property name="bootclasspath@{v}"
82       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
83      </sequential>      </sequential>
# Line 104  Line 114 
114    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
116    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
117    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
118    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
119    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
120    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 112  Line 122 
122    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
123    
124    <!-- Distribution locations -->    <!-- Distribution locations -->
125    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
126    <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
127    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
128    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
129    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
130    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
131    
132    <!-- Jar locations -->    <!-- Jar locations -->
133    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
134    <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
135    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
136    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
137    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
138    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
139    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
140    
141    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
142    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 139  Line 149 
149    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
150    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2012-11 -->
151    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
152    
153      <!-- Default jdk api doc location (latest stable release seems best) -->
154    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
155    
156    <!-- Test classpath -->    <!-- Test classpath -->
# Line 152  Line 164 
164      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
165    </path>    </path>
166    
167      <!-- Support @jls tag, used in jdk8+ javadoc -->
168      <!-- TODO: How do we get &trade to work? -->
169      <!-- TODO: Why isn't @jls a "standard" tag? -->
170      <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
171      <property name="javadoc.jls.cite" value="The Java Language Specification"/>
172      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
173    
174    <!-- Main targets -->    <!-- Main targets -->
175    
176    <target name="dists"    <target name="dists"
177            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
178            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
179    
180    <target name="compile"    <target name="compile"
181            depends="init, configure-compiler"            depends="configure-compiler"
182            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
183    
184      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
185    
186      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
187            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
188              debug="${build.debug}"             debug="${build.debug}"
189         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
190        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
191             source="${build.sourcelevel}"             classpath=""
192               fork="true">             includeAntRuntime="false"
193               includeJavaRuntime="false"
194               executable="${javac8}"
195               fork="true">
196    
197        <include name="**/*.java"/>        <include name="**/*.java"/>
198          <compilerarg line="${build.args}"/>
199        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
200          <compilerarg value="-Xlint:all"/>
201    
202  <!--  <!--
203        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 203  Line 226 
226    
227    
228    <target name="test"    <target name="test"
229            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
230            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)" />
231    
232    
233    
234    <target name="docs"    <target name="docs"
235            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
236    
237      <delete dir="${build.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
238      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
239    
240      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
241      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
242    
243      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${dist.javadocs.dir}"
244               packagenames="none"               packagenames="none"
245               link="${jdkapidocs.url}"               link="${jdkapi8docs.url}"
246               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
247               sourcepath="${src.dir}:${jdksrc.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
248               additionalparam="-XDignore.symbol.file=true" >               classpath=""
249                 executable="${javadoc8}">
250          <arg value="-XDignore.symbol.file=true"/>
251          <arg value="-tag"/>
252          <arg value="${javadoc.jls.option}"/>
253        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
254          <include name="**/*.java"/>          <include name="**/*.java"/>
255        </fileset>        </fileset>
# Line 233  Line 260 
260    
261    
262    <target name="dist"    <target name="dist"
263            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, docs"
264            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
265    
266    
# Line 277  Line 304 
304    
305    
306    
   <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="${jdkapidocs.url}"  
              overview="${src.dir}/intro.html"  
              sourcepath="${src.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   
   
307    <!-- Internal targets -->    <!-- Internal targets -->
308    
309    
   <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>  
   
   
310    <target name="dist-jar"    <target name="dist-jar"
311            depends="clean, jar">            depends="clean, jar">
312    
# Line 498  Line 491 
491    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
492    
493    
494    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
495            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
496    
497      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 524  Line 517 
517    </target>    </target>
518    
519    
520    <!-- jdk7 -->    <!-- jsr166 4jdk7 -->
521    
522    
523    <target name="jdk7compile"    <target name="4jdk7compile"
524            depends="configure-compiler"            depends="configure-compiler"
525            description="Compiles src/jdk7 sources">            description="Compiles src/jdk7 sources, targeting jdk7">
526    
527      <mkdir dir="${build.jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
528    
529      <javac srcdir="${jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
530             destdir="${build.jdk7.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
531             debug="${build.debug}"             debug="${build.debug}"
532             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
533             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
534             source="1.6"             source="6"
535             classpath=""             classpath=""
536             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
537             includeAntRuntime="false"             includeAntRuntime="false"
# Line 553  Line 546 
546    
547      </javac>      </javac>
548    
549      <mkdir dir="${build.jdk7.lib.dir}"/>      <mkdir dir="${build.4jdk7.lib.dir}"/>
550    
551      <jar destfile="${jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}" index="true">
552        <fileset dir="${build.jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
553      </jar>      </jar>
554    
555      <mkdir dir="${build.jdk7.tck.classes.dir}"/>      <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
556    
557      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
558             destdir="${build.jdk7.tck.classes.dir}"             destdir="${build.4jdk7.tck.classes.dir}"
559             debug="${build.debug}"             debug="${build.debug}"
560             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
561             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
562             source="1.6"             source="6"
563             classpath="${junit.jar}"             classpath="${junit.jar}"
564             bootclasspath="${jdk7product.jar}:${bootclasspath6}"             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
565             includeAntRuntime="false"             includeAntRuntime="false"
566             includeJavaRuntime="false"             includeJavaRuntime="false"
567             executable="${javac7}"             executable="${javac7}"
# Line 584  Line 577 
577    </target>    </target>
578    
579    
580    <target name="run-jdk7-tck-tests"    <target name="4jdk7-test-tck"
581            depends="jdk7compile"            depends="4jdk7compile"
582            description="Runs tck tests for jsr166-jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
583      <run-tck-tests      <run-tck-tests
584        jvm="${java7}"        jvm="${java7}"
585        tck.classes="${build.jdk7.tck.classes.dir}"        tck.classes="${build.4jdk7.tck.classes.dir}"
586        product.jar="${jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
587    </target>    </target>
588    
589    
590    <target name="run-jdk7-tck-tests-via-junit-task"    <target name="4jdk7-test-tck-junit"
591            depends="jdk7compile">            depends="4jdk7compile"
592              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
593    
594      <junit printsummary="true"      <junit printsummary="true"
595             showoutput="true"             showoutput="true"
# Line 605  Line 599 
599             jvm="${java7}"             jvm="${java7}"
600             fork="true">             fork="true">
601    
602        <jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>        <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
603        <jvmarg value="-server"/>        <jvmarg value="-server"/>
604    
605        <classpath>        <classpath>
606          <pathelement location="${junit.jar}"/>          <pathelement location="${junit.jar}"/>
607          <pathelement location="${build.jdk7.tck.classes.dir}"/>          <pathelement location="${build.4jdk7.tck.classes.dir}"/>
608        </classpath>        </classpath>
609    
610        <formatter type="brief"/>        <formatter type="brief"/>
# Line 622  Line 616 
616    </target>    </target>
617    
618    
619    <target name="jdk7docs"    <target name="4jdk7docs"
620            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
621    
622      <delete dir="${build.jdk7.docs.dir}"/>      <delete dir="${dist.4jdk7.docs.dir}"/>
623      <mkdir dir="${build.jdk7.docs.dir}"/>      <mkdir dir="${dist.4jdk7.docs.dir}"/>
624    
625      <javadoc destdir="${build.jdk7.docs.dir}"      <javadoc destdir="${dist.4jdk7.docs.dir}"
626               packagenames="none"               packagenames="none"
627               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
628               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
629               sourcepath="${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
              bootclasspath="${bootclasspath6}"  
630               classpath=""               classpath=""
631               source="1.6"               executable="${javadoc7}">
632               executable="${javadoc7}"        <arg value="-XDignore.symbol.file=true"/>
633               additionalparam="-XDignore.symbol.file=true" >        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
634          <include name="**/*.java"/>          <include name="**/*.java"/>
635        </fileset>        </fileset>
636      </javadoc>      </javadoc>
# Line 646  Line 638 
638    </target>    </target>
639    
640    
641    <target name="jdk7dist"    <target name="4jdk7dist"
642            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
643            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
644    
645    
646    
647    <target name="jdk7clean"    <target name="4jdk7clean"
648            description="Removes all build products">            description="Removes all build products">
649    
650      <delete dir="${build.jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
651    
652    </target>    </target>
653    
654    
655    
656    <target name="jdk7dist-clean"    <target name="4jdk7dist-clean"
657            description="Removes all build and distribution products">            description="Removes all build and distribution products">
658    
659    </target>    </target>
660    
661    <target name="jdk7dist-docs"    <target name="4jdk7dist-jar"
662            description="Builds javadocs without custom tags to dist folder">            depends="4jdk7clean, 4jdk7compile">
   
     <delete dir="${dist.jdk7.docs.dir}"/>  
     <mkdir dir="${dist.jdk7.docs.dir}"/>  
   
     <javadoc destdir="${dist.jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${jdk7src.dir}/intro.html"  
              sourcepath="${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}"  
              bootclasspath="${bootclasspath6}"  
              source="1.6">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   <target name="jdk7dist-jar"  
           depends="jdk7clean, jdk7compile">  
663    
664      <copy file="${jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
665    
666    </target>    </target>
667    
# Line 700  Line 669 
669    
670    
671    <target name="jsr166xcompile"    <target name="jsr166xcompile"
672            depends="init, configure-compiler"            depends="configure-compiler"
673            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
674    
675      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.dir}"/>
676    
677      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
678            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.dir}"
679              debug="${build.debug}"             debug="${build.debug}"
680         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
681        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
682             source="${build.sourcelevel}"             classpath=""
683               fork="true">             source="5"
684               bootclasspath="${bootclasspath6}"
685               includeAntRuntime="false"
686               includeJavaRuntime="false"
687               executable="${javac7}"
688               fork="true">
689    
690        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
691        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
692        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
693          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
694    
695      </javac>      </javac>
696    
# Line 729  Line 704 
704    
705      <mkdir dir="${build.jsr166xlib.dir}"/>      <mkdir dir="${build.jsr166xlib.dir}"/>
706    
707      <jar destfile="${jsr166xproduct.jar}">      <jar destfile="${jsr166x.jar}">
708        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.dir}"/>
709      </jar>      </jar>
710    
# Line 738  Line 713 
713    
714    
715    <target name="jsr166xdocs"    <target name="jsr166xdocs"
716            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
717    
718      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
719      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
720    
721      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
722               packagenames="jsr166x"               packagenames="jsr166x.*"
723               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
724               source="${build.sourcelevel}"               source="5"
725               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
726                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
727                 executable="${javadoc7}"
728               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
729    
730    </target>    </target>
731    
732    
733    <target name="jsr166xdist"    <target name="jsr166xdist"
734            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
735            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
736    
737    
# Line 775  Line 752 
752    </target>    </target>
753    
754    
   
   <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="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
755    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
756            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
757    
758      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
759    
760    </target>    </target>
761    
# Line 802  Line 763 
763    
764    
765    <target name="jsr166ycompile"    <target name="jsr166ycompile"
766            depends="init, configure-compiler"            depends="configure-compiler"
767            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
768    
769      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.dir}"/>
770    
771      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
772            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.dir}"
773              debug="${build.debug}"             debug="${build.debug}"
774         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
775        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
776             source="${build.sourcelevel}"             source="6"
777               fork="true">             classpath=""
778               bootclasspath="${bootclasspath6}"
779               includeAntRuntime="false"
780               includeJavaRuntime="false"
781               executable="${javac7}"
782               fork="true">
783    
784        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
785        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
786        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
787        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
788      </javac>      </javac>
   
789    </target>    </target>
790    
791    
   
792    <target name="jsr166yjar"    <target name="jsr166yjar"
793            depends="jsr166ycompile"            depends="jsr166ycompile"
794            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
795    
796      <mkdir dir="${build.jsr166ylib.dir}"/>      <mkdir dir="${build.jsr166ylib.dir}"/>
797    
798      <jar destfile="${jsr166yproduct.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
799        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.dir}"/>
800      </jar>      </jar>
801    
# Line 843  Line 804 
804    
805    
806    <target name="jsr166ydocs"    <target name="jsr166ydocs"
807            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
808    
809      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
810      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
811    
812      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
813               packagenames="jsr166y"               packagenames="jsr166y.*"
814               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
815               source="${build.sourcelevel}"               source="6"
816               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
817                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
818                 executable="${javadoc7}"
819               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
820    
821    </target>    </target>
822    
823    
824    <target name="jsr166ydist"    <target name="jsr166ydist"
825            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
826            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
827    
828    
# Line 879  Line 842 
842    
843    </target>    </target>
844    
   <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="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
845    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
846            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
847    
848      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
849    
850    </target>    </target>
851    
# Line 906  Line 854 
854    
855    
856    <target name="extra166ycompile"    <target name="extra166ycompile"
857            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
858            description="Compiles extra166y sources">            description="Compiles extra166y sources">
859    
860      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.dir}"/>
861    
862      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
863            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.dir}"
864              debug="${build.debug}"             debug="${build.debug}"
865              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
866         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
867        deprecation="${build.deprecation}"             classpath=""
868             source="${build.sourcelevel}"             source="6"
869               fork="true">             bootclasspath="${jsr166y.jar}:${bootclasspath6}"
870               includeAntRuntime="false"
871               includeJavaRuntime="false"
872               executable="${javac7}"
873               fork="true">
874    
875        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
876        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
877        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
878        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
879    
880      </javac>      </javac>
881    
# Line 939  Line 889 
889    
890      <mkdir dir="${build.extra166ylib.dir}"/>      <mkdir dir="${build.extra166ylib.dir}"/>
891    
892      <jar destfile="${extra166yproduct.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
893        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
894      </jar>      </jar>
895    
# Line 948  Line 898 
898    
899    
900    <target name="extra166ydocs"    <target name="extra166ydocs"
901            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
902    
903      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
904      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
905    
906      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
907               packagenames="extra166y"               packagenames="extra166y.*"
908               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
909               source="${build.sourcelevel}"               source="6"
910               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
911                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
912                 executable="${javadoc7}"
913               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
914    
915    </target>    </target>
916    
917    
918    <target name="extra166ydist"    <target name="extra166ydist"
919            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
920            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
921    
922    
# Line 984  Line 936 
936    
937    </target>    </target>
938    
   <target name="extra166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.extra166yjavadocs.dir}"/>  
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.extra166yjavadocs.dir}"  
              packagenames="extra166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
939    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
940            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
941    
942      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
943    
944    </target>    </target>
945    
# Line 1019  Line 956 
956             debug="${build.debug}"             debug="${build.debug}"
957             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
958             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
959             source="1.7"             source="7"
960             classpath=""             classpath=""
961             includeAntRuntime="false"             includeAntRuntime="false"
962             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1043  Line 980 
980    
981      <mkdir dir="${build.jsr166elib.dir}"/>      <mkdir dir="${build.jsr166elib.dir}"/>
982    
983      <jar destfile="${jsr166eproduct.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
984        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
985      </jar>      </jar>
986    
# Line 1052  Line 989 
989    
990    
991    <target name="jsr166edocs"    <target name="jsr166edocs"
992            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
993    
994      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
995      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
996    
997      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
998               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
999               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
1000               source="1.7"               source="7"
1001               sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1002               executable="${javadoc7}"               executable="${javadoc7}"
1003               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
1004      </javadoc>      </javadoc>
1005    
1006    </target>    </target>
1007    
1008    
1009    <target name="jsr166edist"    <target name="jsr166edist"
1010            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1011            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1012    
1013    
# Line 1087  Line 1021 
1021    </target>    </target>
1022    
1023    
   
1024    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1025            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1026    
1027    </target>    </target>
1028    
   <target name="jsr166edist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166ejavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapidocs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
1029    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1030            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1031    
1032      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1033    
1034    </target>    </target>
1035    

Legend:
Removed from v.1.97  
changed lines
  Added in v.1.108

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