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

Diff of /jsr166/build.xml

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

revision 1.113, Sun Jan 20 03:51:38 2013 UTC revision 1.124, Tue Jan 22 21:22:57 2013 UTC
# Line 35  Line 35 
35    
36    
37    <!-- Compilation options -->    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 57  Line 57 
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <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    
60    <!-- JDK binary locations -->    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61      <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62      <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63      <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64    
65      <!-- JDK locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
67    
68    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
# Line 67  Line 72 
72      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
73      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
74      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
     <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>  
75      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76      <property name="bootclasspath@{v}"      <local name="boot.jar.dir"/>
77       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
78        <path id="bootclasspath@{v}">
79          <pathelement path="${boot.jar.dir}/resources.jar"/>
80          <pathelement path="${boot.jar.dir}/rt.jar"/>
81          <pathelement path="${boot.jar.dir}/jsse.jar"/>
82          <pathelement path="${boot.jar.dir}/jce.jar"/>
83          <pathelement path="${boot.jar.dir}/charsets.jar"/>
84        </path>
85        <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
86      </sequential>      </sequential>
87    </macrodef>    </macrodef>
88    
# Line 78  Line 90 
90    <defjdklocations v="7"/>    <defjdklocations v="7"/>
91    <defjdklocations v="8"/>    <defjdklocations v="8"/>
92    
   <macrodef name="run-tck-tests">  
     <attribute name="jvm"/>  
     <attribute name="tck.classes"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
     <sequential>  
     <java classname="JSR166TestCase"  
           jvm="@{jvm}" fork="true">  
         <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>  
         <jvmarg line="@{jvmflags}"/>  
         <classpath>  
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{tck.classes}"/>  
         </classpath>  
     </java>  
     </sequential>  
   </macrodef>  
   
93    <!-- Source locations -->    <!-- Source locations -->
94    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
95    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 112  Line 106 
106    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
107    
108    <!-- Distribution locations -->    <!-- Distribution locations -->
109    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>
110    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
111    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
112    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
113    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
114    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
115    
116    <!-- Jar locations -->    <!-- Jar locations -->
117    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128  Line 122 
122    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
123    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
124    
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
   
125    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
126    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
127    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
128    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
129    
130    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
131    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2013-01 -->
132    <!-- <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/"/> -->
133    
134    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
135    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
136    
137      <!-- Define the "jtreg" task -->
138      <!-- See the docs in "jtreg -onlineHelp" -->
139      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
140               classpath="${lib.dir}/jtreg.jar" />
141    
142    <!-- Test classpath -->    <!-- Test classpath -->
143    <path id="test.classpath">    <path id="test.classpath">
144      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
145      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
146    </path>    </path>
147    
148      <macrodef name="run-tck-tests">
149        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
150        <attribute name="source" default="6"/>
151        <attribute name="target"/>
152        <attribute name="workdir"/>
153        <attribute name="classes"/>
154        <attribute name="jvmflags" default=""/>
155        <sequential>
156    
157        <mkdir dir="@{workdir}/tck-classes"/>
158    
159        <javac srcdir="@{tck.src.dir}"
160               destdir="@{workdir}/tck-classes"
161               debug="${build.debug}"
162               debuglevel="${build.debuglevel}"
163               deprecation="${build.deprecation}"
164               source="@{source}"
165               classpath="${junit.jar}"
166               bootclasspath="@{classes}:${bootclasspath@{source}}"
167               includeAntRuntime="false"
168               includeJavaRuntime="false"
169               executable="${javac@{target}}"
170               fork="true">
171    
172          <include name="*.java"/>
173          <compilerarg value="-XDignore.symbol.file=true"/>
174          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
175          <compilerarg line="${build.args}"/>
176    
177        </javac>
178    
179        <java classname="JSR166TestCase"
180              failonerror="true"
181              jvm="${java@{target}}"
182              fork="true">
183            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
184            <jvmarg line="@{jvmflags}"/>
185            <classpath>
186              <pathelement location="${junit.jar}"/>
187              <pathelement location="@{workdir}/tck-classes"/>
188            </classpath>
189        </java>
190    
191        </sequential>
192      </macrodef>
193    
194    <!-- ALoops classpath -->    <!-- ALoops classpath -->
195    <path id="loops.classpath">    <path id="loops.classpath">
196      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
197    </path>    </path>
198    
199    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
200    <!-- TODO: How do we get &trade to work? -->    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <!-- TODO: Why isn't @jls a "standard" tag? -->  
   <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->  
   <property name="javadoc.jls.cite" value="The Java Language Specification"/>  
201    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
202    
203    <!-- Main targets -->    <!-- Main targets -->
# Line 185  Line 224 
224             fork="true">             fork="true">
225    
226        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
227        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
228        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
229        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
230    
231      </javac>      </javac>
   
232    </target>    </target>
233    
234    
   
235    <target name="jar"    <target name="jar"
236            depends="compile"            depends="compile"
237            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 208  Line 239 
239      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
240        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
241      </jar>      </jar>
   
242    </target>    </target>
243    
244    
   
245    <target name="test"    <target name="test"
246            depends="configure-tests, report-tests"            depends="configure-tests, report-tests"
247            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)" />
248    
249    
   
250    <target name="docs"    <target name="docs"
251            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
252    
# Line 235  Line 263 
263               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
264               classpath=""               classpath=""
265               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
266        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
267          <include name="**/*.java"/>          <include name="**/*.java"/>
268        </fileset>        </fileset>
269          <arg value="-XDignore.symbol.file=true"/>
270          <arg value="-tag"/>
271          <arg value="${javadoc.jls.option}"/>
272      </javadoc>      </javadoc>
   
273    </target>    </target>
274    
275    
   
276    <target name="dist"    <target name="dist"
277            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, docs"
278            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
# Line 267  Line 293 
293        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
294        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
295      </jar>      </jar>
   
296    </target>    </target>
297    
298    
   
299    <target name="clean"    <target name="clean"
300            description="Removes all build products">            description="Removes all build products">
301    
# Line 280  Line 304 
304    </target>    </target>
305    
306    
   
307    <target name="dist-clean"    <target name="dist-clean"
308            description="Removes all build and distribution products">            description="Removes all build and distribution products">
309    
# Line 289  Line 312 
312    </target>    </target>
313    
314    
   
315    <!-- Internal targets -->    <!-- Internal targets -->
316    
317    
# Line 313  Line 335 
335             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
336             source="6"             source="6"
337             classpath="${junit.jar}"             classpath="${junit.jar}"
338             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
339             includeAntRuntime="false"             includeAntRuntime="false"
340             includeJavaRuntime="false"             includeJavaRuntime="false"
341             executable="${javac8}"             executable="${javac8}"
342             fork="true">             fork="true">
343    
344        <include name="**/*.java"/>        <include name="**/*.java"/>
       <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"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347          <compilerarg line="${build.args}"/>
348    
349      </javac>      </javac>
350    
# Line 333  Line 355 
355             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
356             source="6"             source="6"
357             classpath=""             classpath=""
358             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
359             includeAntRuntime="false"             includeAntRuntime="false"
360             includeJavaRuntime="false"             includeJavaRuntime="false"
361             executable="${javac8}"             executable="${javac8}"
362             fork="true">             fork="true">
363    
364        <include name="jsr166/test/**/*.java"/>        <include name="jsr166/test/**/*.java"/>
   
       <compilerarg line="${build.args}"/>  
365        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
366        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
367          <compilerarg line="${build.args}"/>
368    
369      </javac>      </javac>
370    
# Line 356  Line 377 
377             source="${build.sourcelevel}"             source="${build.sourcelevel}"
378               fork="true">               fork="true">
379    
380        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
381        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
382          <compilerarg line="${build.args}"/>
383    
384      </javac>      </javac>
385  -->  -->
# Line 511  Line 532 
532    
533    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
534    
   
535    <target name="4jdk7compile"    <target name="4jdk7compile"
536            depends="configure-compiler"            depends="configure-compiler"
537            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 532  Line 552 
552             fork="true">             fork="true">
553    
554        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
555        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
556        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
557          <compilerarg line="${build.args}"/>
558    
559      </javac>      </javac>
560      </target>
561    
     <jar destfile="${4jdk7product.jar}" index="true">  
       <fileset dir="${build.4jdk7.classes.dir}"/>  
     </jar>  
   
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.4jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
562    
563        <include name="**/*.java"/>    <target name="4jdk7-jar"
564        <compilerarg line="${build.args}"/>            depends="4jdk7compile"
565        <compilerarg value="-XDignore.symbol.file=true"/>            description="Builds library jar from compiled sources">
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
566    
567      </javac>      <jar destfile="${4jdk7product.jar}">
568          <fileset dir="${build.4jdk7.classes.dir}"/>
569        </jar>
570    
571    </target>    </target>
572    
573    
574    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
575            depends="4jdk7compile"            depends="4jdk7-jar"
576            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
577    
578      <run-tck-tests      <run-tck-tests
579        jvm="${java7}"        target="7"
580        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
581        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}"/>
582    </target>    </target>
583    
584    
# Line 605  Line 610 
610      </junit>      </junit>
611    </target>    </target>
612    
613      <target name="4jdk7-test-jtreg"
614              depends="4jdk7compile"
615              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
616        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
617        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
618        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
619        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
620        <jtreg dir="${jtreg.src.dir}"
621               jdk="${jdk7.home}"
622               workDir="${build.4jdk7.dir}/JTwork"
623               reportDir="${build.4jdk7.dir}/JTreport">
624    
625          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
626          <arg value="-agentvm"/>
627          <arg value="-v:nopass,fail"/>
628          <arg value="-vmoptions:-esa -ea"/>
629          <arg value="-automatic"/>
630          <arg value="-k:!ignore"/>
631        </jtreg>
632      </target>
633    
634    
635      <target name="4jdk7-test"
636              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
637              description="Runs tck and jtreg tests for jsr166-4jdk7">
638      </target>
639    
640    
641    <target name="4jdk7docs"    <target name="4jdk7docs"
642            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
# Line 619  Line 651 
651               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
652               classpath=""               classpath=""
653               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
654        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
655          <include name="**/*.java"/>          <include name="**/*.java"/>
656        </fileset>        </fileset>
657          <arg value="-XDignore.symbol.file=true"/>
658      </javadoc>      </javadoc>
   
659    </target>    </target>
660    
661    
# Line 633  Line 664 
664            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
665    
666    
   
667    <target name="4jdk7clean"    <target name="4jdk7clean"
668            description="Removes all 4jdk7 build products">            description="Removes all 4jdk7 build products">
669    
# Line 642  Line 672 
672    </target>    </target>
673    
674    
   
675    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
676            description="Removes all build and distribution products">            description="Removes all build and distribution products">
677    
678    </target>    </target>
679    
680    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
681            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7-jar">
682    
683      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
684    
# Line 662  Line 691 
691            depends="configure-compiler"            depends="configure-compiler"
692            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
693    
694      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
695    
696      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
697             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
698             debug="${build.debug}"             debug="${build.debug}"
699             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
700             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
701             classpath=""             classpath=""
            source="5"  
702             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
703               source="5"
704             includeAntRuntime="false"             includeAntRuntime="false"
705             includeJavaRuntime="false"             includeJavaRuntime="false"
706             executable="${javac7}"             executable="${javac7}"
707             fork="true">             fork="true">
708    
709        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
710        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
711        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
712          <compilerarg line="${build.args}"/>
713    
714      </javac>      </javac>
   
715    </target>    </target>
716    
717    
718      <target name="jsr166x-jar"
   <target name="jsr166xjar"  
719            depends="jsr166xcompile"            depends="jsr166xcompile"
720            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
721    
722      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
723        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
724      </jar>      </jar>
725    
726    </target>    </target>
727    
728    
   
729    <target name="jsr166xdocs"    <target name="jsr166xdocs"
730            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
731    
# Line 709  Line 735 
735      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
736               packagenames="jsr166x.*"               packagenames="jsr166x.*"
737               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="5"  
              bootclasspath="${bootclasspath6}"  
738               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
739               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
740               additionalparam="-XDignore.symbol.file=true" />               source="5"
741                 executable="${javadoc7}">
742          <arg value="-XDignore.symbol.file=true"/>
743    
744        </javadoc>
745    </target>    </target>
746    
747    
# Line 723  Line 750 
750            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
751    
752    
   
753    <target name="jsr166xclean"    <target name="jsr166xclean"
754            description="Removes all jsr166x build products">            description="Removes all jsr166x build products">
755    
# Line 732  Line 758 
758    </target>    </target>
759    
760    
   
761    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
762            description="Removes all build and distribution products">            description="Removes all build and distribution products">
763    
# Line 740  Line 765 
765    
766    
767    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
768            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166x-jar">
769    
770      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
771    
# Line 753  Line 778 
778            depends="configure-compiler"            depends="configure-compiler"
779            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
780    
781      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
782    
783      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
784             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
785             debug="${build.debug}"             debug="${build.debug}"
786             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
787             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 769  Line 794 
794             fork="true">             fork="true">
795    
796        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
797        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
798        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
799          <compilerarg line="${build.args}"/>
800    
801      </javac>      </javac>
802    </target>    </target>
803    
804    
805    <target name="jsr166yjar"    <target name="jsr166y-jar"
806            depends="jsr166ycompile"            depends="jsr166ycompile"
807            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
808    
809      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
810        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
811      </jar>      </jar>
812    
813    </target>    </target>
814    
815    
   
816    <target name="jsr166ydocs"    <target name="jsr166ydocs"
817            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
818    
# Line 797  Line 822 
822      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
823               packagenames="jsr166y.*"               packagenames="jsr166y.*"
824               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="6"  
              bootclasspath="${bootclasspath6}"  
825               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
826               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
827               additionalparam="-XDignore.symbol.file=true" />               source="6"
828                 executable="${javadoc7}">
829          <arg value="-XDignore.symbol.file=true"/>
830    
831        </javadoc>
832    </target>    </target>
833    
834    
# Line 811  Line 837 
837            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
838    
839    
   
840    <target name="jsr166yclean"    <target name="jsr166yclean"
841            description="Removes all jsr166y build products">            description="Removes all jsr166y build products">
842    
# Line 820  Line 845 
845    </target>    </target>
846    
847    
   
848    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
849            description="Removes all build and distribution products">            description="Removes all build and distribution products">
850    
851    </target>    </target>
852    
853    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
854            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166y-jar">
855    
856      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
857    
# Line 838  Line 862 
862    
863    
864    <target name="extra166ycompile"    <target name="extra166ycompile"
865            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166y-jar"
866            description="Compiles extra166y sources">            description="Compiles extra166y sources">
867    
868      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
869    
870      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
871             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
872             debug="${build.debug}"             debug="${build.debug}"
873             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
874             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
875               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
876             classpath=""             classpath=""
877             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
878             includeAntRuntime="false"             includeAntRuntime="false"
879             includeJavaRuntime="false"             includeJavaRuntime="false"
880             executable="${javac7}"             executable="${javac7}"
881             fork="true">             fork="true">
882    
883        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
884        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
885        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
886          <compilerarg line="${build.args}"/>
887    
888      </javac>      </javac>
   
889    </target>    </target>
890    
891    
892      <target name="extra166y-jar"
   <target name="extra166yjar"  
893            depends="extra166ycompile"            depends="extra166ycompile"
894            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
895    
896      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
897        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
898      </jar>      </jar>
899    
900    </target>    </target>
901    
902    
   
903    <target name="extra166ydocs"    <target name="extra166ydocs"
904            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
905    
# Line 888  Line 909 
909      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
910               packagenames="extra166y.*"               packagenames="extra166y.*"
911               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="6"  
              bootclasspath="${bootclasspath6}"  
912               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
913               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
914               additionalparam="-XDignore.symbol.file=true" />               source="6"
915                 executable="${javadoc7}">
916          <arg value="-XDignore.symbol.file=true"/>
917    
918        </javadoc>
919    </target>    </target>
920    
921    
# Line 902  Line 924 
924            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
925    
926    
   
927    <target name="extra166yclean"    <target name="extra166yclean"
928            description="Removes all extra166y build products">            description="Removes all extra166y build products">
929    
# Line 911  Line 932 
932    </target>    </target>
933    
934    
   
935    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
936            description="Removes all build and distribution products">            description="Removes all build and distribution products">
937    
938    </target>    </target>
939    
940    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
941            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166y-jar">
942    
943      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
944    
# Line 930  Line 950 
950            depends="configure-compiler"            depends="configure-compiler"
951            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
952    
953      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
954    
955      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
956             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
957             debug="${build.debug}"             debug="${build.debug}"
958             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
959             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 945  Line 965 
965             fork="true">             fork="true">
966    
967        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
968        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
969        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
970          <compilerarg line="${build.args}"/>
971    
972      </javac>      </javac>
   
973    </target>    </target>
974    
975    
976      <target name="jsr166e-jar"
   <target name="jsr166ejar"  
977            depends="jsr166ecompile"            depends="jsr166ecompile"
978            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
979    
980      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
981        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
982      </jar>      </jar>
983    
984    </target>    </target>
985    
986    
   
987    <target name="jsr166edocs"    <target name="jsr166edocs"
988            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
989    
# Line 976  Line 993 
993      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
994               packagenames="jsr166e.*"               packagenames="jsr166e.*"
995               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="7"  
996               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
997               executable="${javadoc7}"               source="7"
998               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
999          <arg value="-XDignore.symbol.file=true"/>
1000    
1001      </javadoc>      </javadoc>
1002      </target>
1003    
1004    
1005      <target name="jsr166e-test-tck"
1006              depends="jsr166e-jar"
1007              description="Runs tck tests for jsr166e">
1008    
1009        <run-tck-tests
1010          tck.src.dir="${test.src.dir}/tck-jsr166e"
1011          source="7"
1012          target="8"
1013          workdir="${build.jsr166e.dir}"
1014          classes="${jsr166e.jar}"/>
1015    </target>    </target>
1016    
1017    
# Line 990  Line 1020 
1020            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1021    
1022    
   
1023    <target name="jsr166eclean"    <target name="jsr166eclean"
1024            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
1025    
# Line 1005  Line 1034 
1034    </target>    </target>
1035    
1036    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1037            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166e-jar">
1038    
1039      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1040    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8