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

Diff of /jsr166/build.xml

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

revision 1.98 by jsr166, Wed Jan 16 07:39:51 2013 UTC revision 1.109 by jsr166, Sun Jan 20 01:06:24 2013 UTC
# Line 16  Line 16 
16    $HOME/jdk/jdk6    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8    $HOME/jdk/jdk8
19    where each of the above is a JDK or a symlink to same.    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 40  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"/>
49    
50    <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
53    <property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>  
54    
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <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"/>  
   
56    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>  
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
   
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>  
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
   
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
   <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
   <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>  
59    
60    <!-- JDK binary locations -->    <!-- JDK binary locations -->
61    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 72  Line 63 
63    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
64      <attribute name="v"/>      <attribute name="v"/>
65      <sequential>      <sequential>
66      <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
67      <property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
68      <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
69      <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
70      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>      <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}"      <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"/>       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>      </sequential>
# Line 113  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="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
109    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
110    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 121  Line 113 
113    <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"/>
114    
115    <!-- Distribution locations -->    <!-- Distribution locations -->
116    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
117    <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
118    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
119    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
120    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
121    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
122    
123    <!-- Jar locations -->    <!-- Jar locations -->
124    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
125    <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
126    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
127    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
128    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
129    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
130    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
131    
132    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
133    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 148  Line 140 
140    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
141    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2012-11 -->
142    <!-- <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/"/> -->
143    
144      <!-- Default jdk api doc location (latest stable release seems best) -->
145    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
146    
147    <!-- Test classpath -->    <!-- Test classpath -->
# Line 161  Line 155 
155      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
156    </path>    </path>
157    
158      <!-- Support @jls tag, used in jdk8+ javadoc -->
159      <!-- TODO: How do we get &trade to work? -->
160      <!-- TODO: Why isn't @jls a "standard" tag? -->
161      <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
162      <property name="javadoc.jls.cite" value="The Java Language Specification"/>
163      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
164    
165    <!-- Main targets -->    <!-- Main targets -->
166    
167    <target name="dists"    <target name="dists"
168            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
169            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
170    
171    <target name="compile"    <target name="compile"
172            depends="init, configure-compiler"            depends="configure-compiler"
173            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
174    
175      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
176    
177      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
178            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
179              debug="${build.debug}"             debug="${build.debug}"
180         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
181        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
182             source="${build.sourcelevel}"             classpath=""
183               fork="true">             includeAntRuntime="false"
184               includeJavaRuntime="false"
185               executable="${javac8}"
186               fork="true">
187    
188        <include name="**/*.java"/>        <include name="**/*.java"/>
189          <compilerarg line="${build.args}"/>
190        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
191          <compilerarg value="-Xlint:all"/>
192    
193  <!--  <!--
194        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 201  Line 206 
206            depends="compile"            depends="compile"
207            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
208    
     <mkdir dir="${build.lib.dir}"/>  
   
209      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
210        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
211      </jar>      </jar>
# Line 212  Line 215 
215    
216    
217    <target name="test"    <target name="test"
218            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
219            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)" />
220    
221    
222    
223    <target name="docs"    <target name="docs"
224            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
225    
226      <delete dir="${build.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
227      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
228    
229      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
230      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
231    
232      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${dist.javadocs.dir}"
233               packagenames="none"               packagenames="none"
234               link="${jdkapidocs.url}"               link="${jdkapi8docs.url}"
235               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
236               sourcepath="${src.dir}:${jdksrc.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
237               additionalparam="-XDignore.symbol.file=true" >               classpath=""
238                 executable="${javadoc8}">
239          <arg value="-XDignore.symbol.file=true"/>
240          <arg value="-tag"/>
241          <arg value="${javadoc.jls.option}"/>
242        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
243          <include name="**/*.java"/>          <include name="**/*.java"/>
244        </fileset>        </fileset>
# Line 242  Line 249 
249    
250    
251    <target name="dist"    <target name="dist"
252            depends="init, dist-clean, dist-jar, dist-docs"            depends="dist-clean, dist-jar, docs"
253            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
254    
255    
# Line 270  Line 277 
277            description="Removes all build products">            description="Removes all build products">
278    
279      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
280    
281    </target>    </target>
282    
# Line 286  Line 291 
291    
292    
293    
   <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>  
   
   
   
294    <!-- Internal targets -->    <!-- Internal targets -->
295    
296    
   <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>  
   
   
297    <target name="dist-jar"    <target name="dist-jar"
298            depends="clean, jar">            depends="clean, jar">
299    
# Line 507  Line 478 
478    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
479    
480    
481    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
482            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
483    
484      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 533  Line 504 
504    </target>    </target>
505    
506    
507    <!-- jdk7 -->    <!-- jsr166 4jdk7 -->
508    
509    
510    <target name="jdk7compile"    <target name="4jdk7compile"
511            depends="configure-compiler"            depends="configure-compiler"
512            description="Compiles src/jdk7 sources">            description="Compiles src/jdk7 sources, targeting jdk7">
513    
514      <mkdir dir="${build.jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
515    
516      <javac srcdir="${jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
517             destdir="${build.jdk7.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
518             debug="${build.debug}"             debug="${build.debug}"
519             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
520             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
521             source="1.6"             source="6"
522             classpath=""             classpath=""
523             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
524             includeAntRuntime="false"             includeAntRuntime="false"
# Line 562  Line 533 
533    
534      </javac>      </javac>
535    
536      <mkdir dir="${build.jdk7.lib.dir}"/>      <jar destfile="${4jdk7product.jar}" index="true">
537          <fileset dir="${build.4jdk7.classes.dir}"/>
     <jar destfile="${jdk7product.jar}" index="true">  
       <fileset dir="${build.jdk7.classes.dir}"/>  
538      </jar>      </jar>
539    
540      <mkdir dir="${build.jdk7.tck.classes.dir}"/>      <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
541    
542      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
543             destdir="${build.jdk7.tck.classes.dir}"             destdir="${build.4jdk7.tck.classes.dir}"
544             debug="${build.debug}"             debug="${build.debug}"
545             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
546             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
547             source="1.6"             source="6"
548             classpath="${junit.jar}"             classpath="${junit.jar}"
549             bootclasspath="${jdk7product.jar}:${bootclasspath6}"             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
550             includeAntRuntime="false"             includeAntRuntime="false"
551             includeJavaRuntime="false"             includeJavaRuntime="false"
552             executable="${javac7}"             executable="${javac7}"
# Line 593  Line 562 
562    </target>    </target>
563    
564    
565    <target name="run-jdk7-tck-tests"    <target name="4jdk7-test-tck"
566            depends="jdk7compile"            depends="4jdk7compile"
567            description="Runs tck tests for jsr166-jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
568      <run-tck-tests      <run-tck-tests
569        jvm="${java7}"        jvm="${java7}"
570        tck.classes="${build.jdk7.tck.classes.dir}"        tck.classes="${build.4jdk7.tck.classes.dir}"
571        product.jar="${jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
572    </target>    </target>
573    
574    
575    <target name="run-jdk7-tck-tests-via-junit-task"    <target name="4jdk7-test-tck-junit"
576            depends="jdk7compile">            depends="4jdk7compile"
577              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
578    
579      <junit printsummary="true"      <junit printsummary="true"
580             showoutput="true"             showoutput="true"
# Line 614  Line 584 
584             jvm="${java7}"             jvm="${java7}"
585             fork="true">             fork="true">
586    
587        <jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>        <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
588        <jvmarg value="-server"/>        <jvmarg value="-server"/>
589    
590        <classpath>        <classpath>
591          <pathelement location="${junit.jar}"/>          <pathelement location="${junit.jar}"/>
592          <pathelement location="${build.jdk7.tck.classes.dir}"/>          <pathelement location="${build.4jdk7.tck.classes.dir}"/>
593        </classpath>        </classpath>
594    
595        <formatter type="brief"/>        <formatter type="brief"/>
# Line 631  Line 601 
601    </target>    </target>
602    
603    
604    <target name="jdk7docs"    <target name="4jdk7docs"
605            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
606    
607      <delete dir="${build.jdk7.docs.dir}"/>      <delete dir="${dist.4jdk7.docs.dir}"/>
608      <mkdir dir="${build.jdk7.docs.dir}"/>      <mkdir dir="${dist.4jdk7.docs.dir}"/>
609    
610      <javadoc destdir="${build.jdk7.docs.dir}"      <javadoc destdir="${dist.4jdk7.docs.dir}"
611               packagenames="none"               packagenames="none"
612               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
613               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
614               sourcepath="${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
              bootclasspath="${bootclasspath6}"  
615               classpath=""               classpath=""
616               source="1.6"               executable="${javadoc7}">
617               executable="${javadoc7}"        <arg value="-XDignore.symbol.file=true"/>
618               additionalparam="-XDignore.symbol.file=true" >        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
619          <include name="**/*.java"/>          <include name="**/*.java"/>
620        </fileset>        </fileset>
621      </javadoc>      </javadoc>
# Line 655  Line 623 
623    </target>    </target>
624    
625    
626    <target name="jdk7dist"    <target name="4jdk7dist"
627            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
628            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
629    
630    
631    
632    <target name="jdk7clean"    <target name="4jdk7clean"
633            description="Removes all build products">            description="Removes all 4jdk7 build products">
634    
635      <delete dir="${build.jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
636    
637    </target>    </target>
638    
639    
640    
641    <target name="jdk7dist-clean"    <target name="4jdk7dist-clean"
642            description="Removes all build and distribution products">            description="Removes all build and distribution products">
643    
644    </target>    </target>
645    
646    <target name="jdk7dist-docs"    <target name="4jdk7dist-jar"
647            description="Builds javadocs without custom tags to dist folder">            depends="4jdk7clean, 4jdk7compile">
648    
649      <delete dir="${dist.jdk7.docs.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.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>  
650    
651    </target>    </target>
652    
   <target name="jdk7dist-jar"  
           depends="jdk7clean, jdk7compile">  
   
     <copy file="${jdk7product.jar}" todir="${dist.dir}"/>  
   
   </target>  
653    
654    <!-- jsr166x -->    <!-- jsr166x -->
655    
   
656    <target name="jsr166xcompile"    <target name="jsr166xcompile"
657            depends="init, configure-compiler"            depends="configure-compiler"
658            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
659    
660      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.dir}"/>
661    
662      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
663            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.dir}"
664              debug="${build.debug}"             debug="${build.debug}"
665         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
666        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
667             source="${build.sourcelevel}"             classpath=""
668               fork="true">             source="5"
669               bootclasspath="${bootclasspath6}"
670               includeAntRuntime="false"
671               includeJavaRuntime="false"
672               executable="${javac7}"
673               fork="true">
674    
675        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
676        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
677        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
678          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
679    
680      </javac>      </javac>
681    
# Line 736  Line 687 
687            depends="jsr166xcompile"            depends="jsr166xcompile"
688            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
689    
690      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
   
     <jar destfile="${jsr166xproduct.jar}">  
691        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.dir}"/>
692      </jar>      </jar>
693    
# Line 747  Line 696 
696    
697    
698    <target name="jsr166xdocs"    <target name="jsr166xdocs"
699            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
700    
701      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
702      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
703    
704      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
705               packagenames="jsr166x"               packagenames="jsr166x.*"
706               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
707               source="${build.sourcelevel}"               source="5"
708               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
709                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
710                 executable="${javadoc7}"
711               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
712    
713    </target>    </target>
714    
715    
716    <target name="jsr166xdist"    <target name="jsr166xdist"
717            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
718            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
719    
720    
721    
722    <target name="jsr166xclean"    <target name="jsr166xclean"
723            description="Removes all build products">            description="Removes all jsr166x build products">
724    
725      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
726    
727    </target>    </target>
728    
# Line 784  Line 734 
734    </target>    </target>
735    
736    
   
   <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>  
   
737    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
738            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
739    
740      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
741    
742    </target>    </target>
743    
# Line 811  Line 745 
745    
746    
747    <target name="jsr166ycompile"    <target name="jsr166ycompile"
748            depends="init, configure-compiler"            depends="configure-compiler"
749            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
750    
751      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.dir}"/>
752    
753      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
754            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.dir}"
755              debug="${build.debug}"             debug="${build.debug}"
756         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
757        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
758             source="${build.sourcelevel}"             source="6"
759               fork="true">             classpath=""
760               bootclasspath="${bootclasspath6}"
761               includeAntRuntime="false"
762               includeJavaRuntime="false"
763               executable="${javac7}"
764               fork="true">
765    
766        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
767        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
768        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
769        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
770      </javac>      </javac>
   
771    </target>    </target>
772    
773    
   
774    <target name="jsr166yjar"    <target name="jsr166yjar"
775            depends="jsr166ycompile"            depends="jsr166ycompile"
776            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
777    
778      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
   
     <jar destfile="${jsr166yproduct.jar}" index="true">  
779        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.dir}"/>
780      </jar>      </jar>
781    
# Line 852  Line 784 
784    
785    
786    <target name="jsr166ydocs"    <target name="jsr166ydocs"
787            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
788    
789      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
790      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
791    
792      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
793               packagenames="jsr166y"               packagenames="jsr166y.*"
794               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
795               source="${build.sourcelevel}"               source="6"
796               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
797                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
798                 executable="${javadoc7}"
799               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
800    
801    </target>    </target>
802    
803    
804    <target name="jsr166ydist"    <target name="jsr166ydist"
805            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
806            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
807    
808    
809    
810    <target name="jsr166yclean"    <target name="jsr166yclean"
811            description="Removes all build products">            description="Removes all jsr166y build products">
812    
813      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
814    
815    </target>    </target>
816    
# Line 888  Line 821 
821    
822    </target>    </target>
823    
   <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>  
   
824    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
825            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
826    
827      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
828    
829    </target>    </target>
830    
# Line 915  Line 833 
833    
834    
835    <target name="extra166ycompile"    <target name="extra166ycompile"
836            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
837            description="Compiles extra166y sources">            description="Compiles extra166y sources">
838    
839      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.dir}"/>
840    
841      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
842            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.dir}"
843              debug="${build.debug}"             debug="${build.debug}"
844              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
845         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
846        deprecation="${build.deprecation}"             classpath=""
847             source="${build.sourcelevel}"             source="6"
848               fork="true">             bootclasspath="${jsr166y.jar}:${bootclasspath6}"
849               includeAntRuntime="false"
850               includeJavaRuntime="false"
851               executable="${javac7}"
852               fork="true">
853    
854        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
855        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
856        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
857        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
858    
859      </javac>      </javac>
860    
# Line 946  Line 866 
866            depends="extra166ycompile"            depends="extra166ycompile"
867            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
868    
869      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
   
     <jar destfile="${extra166yproduct.jar}" index="true">  
870        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
871      </jar>      </jar>
872    
# Line 957  Line 875 
875    
876    
877    <target name="extra166ydocs"    <target name="extra166ydocs"
878            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
879    
880      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
881      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
882    
883      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
884               packagenames="extra166y"               packagenames="extra166y.*"
885               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
886               source="${build.sourcelevel}"               source="6"
887               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
888                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
889                 executable="${javadoc7}"
890               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
891    
892    </target>    </target>
893    
894    
895    <target name="extra166ydist"    <target name="extra166ydist"
896            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
897            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
898    
899    
900    
901    <target name="extra166yclean"    <target name="extra166yclean"
902            description="Removes all build products">            description="Removes all extra166y build products">
903    
904      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
905    
906    </target>    </target>
907    
# Line 993  Line 912 
912    
913    </target>    </target>
914    
   <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>  
   
915    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
916            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
917    
918      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
919    
920    </target>    </target>
921    
# Line 1028  Line 932 
932             debug="${build.debug}"             debug="${build.debug}"
933             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
934             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
935             source="1.7"             source="7"
936             classpath=""             classpath=""
937             includeAntRuntime="false"             includeAntRuntime="false"
938             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1050  Line 954 
954            depends="jsr166ecompile"            depends="jsr166ecompile"
955            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
956    
957      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
   
     <jar destfile="${jsr166eproduct.jar}" index="true">  
958        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
959      </jar>      </jar>
960    
# Line 1061  Line 963 
963    
964    
965    <target name="jsr166edocs"    <target name="jsr166edocs"
966            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
967    
968      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
969      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
970    
971      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
972               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
973               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
974               source="1.7"               source="7"
975               sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
976               executable="${javadoc7}"               executable="${javadoc7}"
977               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
978      </javadoc>      </javadoc>
979    
980    </target>    </target>
981    
982    
983    <target name="jsr166edist"    <target name="jsr166edist"
984            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
985            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
986    
987    
988    
989    <target name="jsr166eclean"    <target name="jsr166eclean"
990            description="Removes all build products">            description="Removes all jsr166e build products">
991    
992      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
993    
994    </target>    </target>
995    
996    
   
997    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
998            description="Removes all build and distribution products">            description="Removes all build and distribution products">
999    
1000    </target>    </target>
1001    
   <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>  
   
1002    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1003            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1004    
1005      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1006    
1007    </target>    </target>
1008    

Legend:
Removed from v.1.98  
changed lines
  Added in v.1.109

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