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

Diff of /jsr166/build.xml

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

revision 1.111 by jsr166, Sun Jan 20 03:34:23 2013 UTC revision 1.128 by jsr166, Wed Jan 23 07:05:10 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 49  Line 49 
49    
50    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54    
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
# 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    
89    <defjdklocations v="6"/>    <macrodef name="mirror-dir">
90    <defjdklocations v="7"/>      <attribute name="src"/>
91    <defjdklocations v="8"/>      <attribute name="dst"/>
   
   <macrodef name="run-tck-tests">  
     <attribute name="jvm"/>  
     <attribute name="tck.classes"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
92      <sequential>      <sequential>
93      <java classname="JSR166TestCase"      <delete dir="@{dst}"/>
94            jvm="@{jvm}" fork="true">      <mkdir dir="@{dst}"/>
95          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>      <copy todir="@{dst}" preservelastmodified="true">
96          <jvmarg line="@{jvmflags}"/>        <fileset dir="@{src}"/>
97          <classpath>      </copy>
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{tck.classes}"/>  
         </classpath>  
     </java>  
98      </sequential>      </sequential>
99    </macrodef>    </macrodef>
100    
101      <defjdklocations v="6"/>
102      <defjdklocations v="7"/>
103      <defjdklocations v="8"/>
104    
105    <!-- Source locations -->    <!-- Source locations -->
106    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
107    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 111  Line 117 
117    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
118    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
119    
120    <!-- Distribution locations -->    <!-- Javadoc locations -->
121    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
122    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
123    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
124    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
125    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
126    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
127    
128      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
129      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
130      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
131      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
132      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
133      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
134    
135    <!-- Jar locations -->    <!-- Jar locations -->
136    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 128  Line 141 
141    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
142    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
143    
   <!-- Bootclasspath argument -->  
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>  
   
144    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
145    <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/"/>
146    <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/"/>
147    <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/"/>
148    
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 2013-01 -->
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) -->    <!-- 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      <!-- Define the "jtreg" task -->
157      <!-- See the docs in "jtreg -onlineHelp" -->
158      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
159               classpath="${lib.dir}/jtreg.jar" />
160    
161    <!-- Test classpath -->    <!-- Test classpath -->
162    <path id="test.classpath">    <path id="test.classpath">
163      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
164      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
165    </path>    </path>
166    
167      <macrodef name="run-tck-tests">
168        <attribute name="tck.src.dir" default="${tck.src.dir}"/>
169        <attribute name="source" default="6"/>
170        <attribute name="target"/>
171        <attribute name="workdir"/>
172        <attribute name="classes"/>
173        <attribute name="jvmflags" default=""/>
174        <sequential>
175    
176        <mkdir dir="@{workdir}/tck-classes"/>
177    
178        <javac srcdir="@{tck.src.dir}"
179               destdir="@{workdir}/tck-classes"
180               debug="${build.debug}"
181               debuglevel="${build.debuglevel}"
182               deprecation="${build.deprecation}"
183               source="@{source}"
184               classpath="${junit.jar}"
185               bootclasspath="@{classes}:${bootclasspath@{source}}"
186               includeAntRuntime="false"
187               includeJavaRuntime="false"
188               executable="${javac@{target}}"
189               fork="true">
190    
191          <include name="*.java"/>
192          <compilerarg value="-XDignore.symbol.file=true"/>
193          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
194          <compilerarg line="${build.args}"/>
195    
196        </javac>
197    
198        <java classname="JSR166TestCase"
199              failonerror="true"
200              jvm="${java@{target}}"
201              fork="true">
202            <jvmarg value="-Xbootclasspath/p:@{classes}"/>
203            <jvmarg line="@{jvmflags}"/>
204            <classpath>
205              <pathelement location="${junit.jar}"/>
206              <pathelement location="@{workdir}/tck-classes"/>
207            </classpath>
208        </java>
209    
210        </sequential>
211      </macrodef>
212    
213    <!-- ALoops classpath -->    <!-- ALoops classpath -->
214    <path id="loops.classpath">    <path id="loops.classpath">
215      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
216    </path>    </path>
217    
218    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
219    <!-- 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"/>  
220    <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;:"/>
221    
222    <!-- Main targets -->    <!-- Main targets -->
# Line 185  Line 243 
243             fork="true">             fork="true">
244    
245        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
246        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
247        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
248        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
249    
250      </javac>      </javac>
   
251    </target>    </target>
252    
253    
   
254    <target name="jar"    <target name="jar"
255            depends="compile"            depends="compile"
256            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 208  Line 258 
258      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
259        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
260      </jar>      </jar>
   
261    </target>    </target>
262    
263    
   
264    <target name="test"    <target name="test"
265            depends="configure-tests, report-tests"            depends="configure-tests, report-tests"
266            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)" />
267    
268    
   
269    <target name="docs"    <target name="docs"
270            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
271    
272      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
273      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
274    
275      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
276      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
277    
278      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
279               packagenames="none"               packagenames="none"
280               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
281               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
282               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
283               classpath=""               classpath=""
284               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
285        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
286          <include name="**/*.java"/>          <include name="**/*.java"/>
287        </fileset>        </fileset>
288          <arg value="-XDignore.symbol.file=true"/>
289          <arg value="-tag"/>
290          <arg value="${javadoc.jls.option}"/>
291      </javadoc>      </javadoc>
   
292    </target>    </target>
293    
294    
   
295    <target name="dist"    <target name="dist"
296            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
297            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
298    
299    
# Line 267  Line 312 
312        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
313        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
314      </jar>      </jar>
   
315    </target>    </target>
316    
317    
   
318    <target name="clean"    <target name="clean"
319            description="Removes all build products">            description="Removes all build products">
320    
# Line 280  Line 323 
323    </target>    </target>
324    
325    
   
326    <target name="dist-clean"    <target name="dist-clean"
327            description="Removes all build and distribution products">            description="Removes all build and distribution products">
328    
# Line 289  Line 331 
331    </target>    </target>
332    
333    
   
334    <!-- Internal targets -->    <!-- Internal targets -->
335    
336    
337    <target name="dist-jar"    <target name="dist-jar"
338            depends="clean, jar">            depends="clean, jar">
   
339      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
340      </target>
341    
342      <target name="dist-docs"
343              depends="clean, docs">
344        <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
345    </target>    </target>
346    
347    
# Line 313  Line 357 
357             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
358             source="6"             source="6"
359             classpath="${junit.jar}"             classpath="${junit.jar}"
360             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
361             includeAntRuntime="false"             includeAntRuntime="false"
362             includeJavaRuntime="false"             includeJavaRuntime="false"
363             executable="${javac8}"             executable="${javac8}"
364             fork="true">             fork="true">
365    
366        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
367        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
368        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
369          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
370    
371      </javac>      </javac>
372    
# Line 334  Line 376 
376             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
377             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
378             source="6"             source="6"
379             classpath="${junit.jar}"             classpath=""
380             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
381             includeAntRuntime="false"             includeAntRuntime="false"
382             includeJavaRuntime="false"             includeJavaRuntime="false"
383             executable="${javac8}"             executable="${javac8}"
384             fork="true">             fork="true">
385    
386        <include name="jsr166/test/**/*.java"/>        <include name="jsr166/test/**/*.java"/>
   
       <compilerarg line="${build.args}"/>  
387        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
388        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
389          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
390    
391      </javac>      </javac>
392    
# Line 360  Line 399 
399             source="${build.sourcelevel}"             source="${build.sourcelevel}"
400               fork="true">               fork="true">
401    
402        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
403        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
404          <compilerarg line="${build.args}"/>
       <classpath refid="test.classpath"/>  
405    
406      </javac>      </javac>
407  -->  -->
# Line 517  Line 554 
554    
555    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
556    
   
557    <target name="4jdk7compile"    <target name="4jdk7compile"
558            depends="configure-compiler"            depends="configure-compiler"
559            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 538  Line 574 
574             fork="true">             fork="true">
575    
576        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
577        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
578        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
579          <compilerarg line="${build.args}"/>
580    
581      </javac>      </javac>
582      </target>
583    
     <jar destfile="${4jdk7product.jar}" index="true">  
       <fileset dir="${build.4jdk7.classes.dir}"/>  
     </jar>  
   
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
584    
585      <javac srcdir="${tck.src.dir}"    <target name="4jdk7jar"
586             destdir="${build.4jdk7.tck.classes.dir}"            depends="4jdk7compile"
587             debug="${build.debug}"            description="Builds library jar from compiled sources">
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
588    
589      </javac>      <jar destfile="${4jdk7product.jar}">
590          <fileset dir="${build.4jdk7.classes.dir}"/>
591        </jar>
592    
593    </target>    </target>
594    
595    
596    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
597            depends="4jdk7compile"            depends="4jdk7jar"
598            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
599    
600      <run-tck-tests      <run-tck-tests
601        jvm="${java7}"        target="7"
602        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
603        product.jar="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}"/>
604    </target>    </target>
605    
606    
# Line 611  Line 632 
632      </junit>      </junit>
633    </target>    </target>
634    
635      <target name="4jdk7-test-jtreg"
636              depends="4jdk7compile"
637              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
638        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
639        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
640        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
641        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
642        <jtreg dir="${jtreg.src.dir}"
643               jdk="${jdk7.home}"
644               workDir="${build.4jdk7.dir}/JTwork"
645               reportDir="${build.4jdk7.dir}/JTreport">
646    
647          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
648          <arg value="-agentvm"/>
649          <arg value="-v:nopass,fail"/>
650          <arg value="-vmoptions:-esa -ea"/>
651          <arg value="-automatic"/>
652          <arg value="-k:!ignore"/>
653        </jtreg>
654      </target>
655    
656    
657      <target name="4jdk7-test"
658              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
659              description="Runs tck and jtreg tests for jsr166-4jdk7">
660      </target>
661    
662    
663    <target name="4jdk7docs"    <target name="4jdk7docs"
664            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
665    
666      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
667      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
668    
669      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
670               packagenames="none"               packagenames="none"
671               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
672               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
673               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
674               classpath=""               classpath=""
675               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
676        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
677          <include name="**/*.java"/>          <include name="**/*.java"/>
678        </fileset>        </fileset>
679          <arg value="-XDignore.symbol.file=true"/>
680      </javadoc>      </javadoc>
   
681    </target>    </target>
682    
683    
684    <target name="4jdk7dist"    <target name="4jdk7dist"
685            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
686            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
687    
688    
   
689    <target name="4jdk7clean"    <target name="4jdk7clean"
690            description="Removes all 4jdk7 build products">            description="Removes all 4jdk7 build products">
691    
# Line 648  Line 694 
694    </target>    </target>
695    
696    
   
697    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
698            description="Removes all build and distribution products">            description="Removes all build and distribution products">
699    
700    </target>    </target>
701    
702    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
703            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7jar">
   
704      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
705      </target>
706    
707    
708      <target name="4jdk7dist-docs"
709              depends="4jdk7clean, 4jdk7docs">
710        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
711    </target>    </target>
712    
713    
# Line 668  Line 717 
717            depends="configure-compiler"            depends="configure-compiler"
718            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
719    
720      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
721    
722      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
723             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
724             debug="${build.debug}"             debug="${build.debug}"
725             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
726             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
727             classpath=""             classpath=""
            source="5"  
728             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
729               source="5"
730             includeAntRuntime="false"             includeAntRuntime="false"
731             includeJavaRuntime="false"             includeJavaRuntime="false"
732             executable="${javac7}"             executable="${javac7}"
733             fork="true">             fork="true">
734    
735        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
736        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
737        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
738          <compilerarg line="${build.args}"/>
739    
740      </javac>      </javac>
   
741    </target>    </target>
742    
743    
   
744    <target name="jsr166xjar"    <target name="jsr166xjar"
745            depends="jsr166xcompile"            depends="jsr166xcompile"
746            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
747    
748      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
749        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
750      </jar>      </jar>
751    
752    </target>    </target>
753    
754    
   
755    <target name="jsr166xdocs"    <target name="jsr166xdocs"
756            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
757    
758      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
759      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
760    
761      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
762               packagenames="jsr166x.*"               packagenames="jsr166x.*"
763               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="5"  
              bootclasspath="${bootclasspath6}"  
764               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
765               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
766               additionalparam="-XDignore.symbol.file=true" />               source="5"
767                 executable="${javadoc7}">
768          <arg value="-XDignore.symbol.file=true"/>
769    
770        </javadoc>
771    </target>    </target>
772    
773    
774    <target name="jsr166xdist"    <target name="jsr166xdist"
775            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
776            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
777    
778    
   
779    <target name="jsr166xclean"    <target name="jsr166xclean"
780            description="Removes all jsr166x build products">            description="Removes all jsr166x build products">
781    
# Line 738  Line 784 
784    </target>    </target>
785    
786    
   
787    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
788            description="Removes all build and distribution products">            description="Removes all build and distribution products">
789    
# Line 747  Line 792 
792    
793    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
794            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
   
795      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
796      </target>
797    
798      <target name="jsr166xdist-docs"
799              depends="jsr166xclean, jsr166xdocs">
800        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
801    </target>    </target>
802    
803    <!-- jsr166y -->    <!-- jsr166y -->
# Line 759  Line 807 
807            depends="configure-compiler"            depends="configure-compiler"
808            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
809    
810      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
811    
812      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
813             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
814             debug="${build.debug}"             debug="${build.debug}"
815             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
816             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 775  Line 823 
823             fork="true">             fork="true">
824    
825        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
826        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
827        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
828          <compilerarg line="${build.args}"/>
829    
830      </javac>      </javac>
831    </target>    </target>
832    
# Line 787  Line 836 
836            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
837    
838      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
839        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
840      </jar>      </jar>
841    
842    </target>    </target>
843    
844    
   
845    <target name="jsr166ydocs"    <target name="jsr166ydocs"
846            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
847    
848      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
849      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
850    
851      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
852               packagenames="jsr166y.*"               packagenames="jsr166y.*"
853               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="6"  
              bootclasspath="${bootclasspath6}"  
854               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
855               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
856               additionalparam="-XDignore.symbol.file=true" />               source="6"
857                 executable="${javadoc7}">
858          <arg value="-XDignore.symbol.file=true"/>
859    
860        </javadoc>
861    </target>    </target>
862    
863    
864    <target name="jsr166ydist"    <target name="jsr166ydist"
865            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
866            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
867    
868    
   
869    <target name="jsr166yclean"    <target name="jsr166yclean"
870            description="Removes all jsr166y build products">            description="Removes all jsr166y build products">
871    
# Line 826  Line 874 
874    </target>    </target>
875    
876    
   
877    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
878            description="Removes all build and distribution products">            description="Removes all build and distribution products">
879    
# Line 834  Line 881 
881    
882    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
883            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
   
884      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
885      </target>
886    
887      <target name="jsr166ydist-docs"
888              depends="jsr166yclean, jsr166ydocs">
889        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
890    </target>    </target>
891    
892    
# Line 847  Line 897 
897            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
898            description="Compiles extra166y sources">            description="Compiles extra166y sources">
899    
900      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
901    
902      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
903             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
904             debug="${build.debug}"             debug="${build.debug}"
905             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
906             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
907               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
908             classpath=""             classpath=""
909             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
910             includeAntRuntime="false"             includeAntRuntime="false"
911             includeJavaRuntime="false"             includeJavaRuntime="false"
912             executable="${javac7}"             executable="${javac7}"
913             fork="true">             fork="true">
914    
915        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
916        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
917        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
918          <compilerarg line="${build.args}"/>
919    
920      </javac>      </javac>
   
921    </target>    </target>
922    
923    
   
924    <target name="extra166yjar"    <target name="extra166yjar"
925            depends="extra166ycompile"            depends="extra166ycompile"
926            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
927    
928      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
929        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
930      </jar>      </jar>
931    
932    </target>    </target>
933    
934    
   
935    <target name="extra166ydocs"    <target name="extra166ydocs"
936            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
937    
938      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
939      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
940    
941      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
942               packagenames="extra166y.*"               packagenames="extra166y.*"
943               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="6"  
              bootclasspath="${bootclasspath6}"  
944               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
945               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
946               additionalparam="-XDignore.symbol.file=true" />               source="6"
947                 executable="${javadoc7}">
948          <arg value="-XDignore.symbol.file=true"/>
949    
950        </javadoc>
951    </target>    </target>
952    
953    
954    <target name="extra166ydist"    <target name="extra166ydist"
955            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
956            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
957    
958    
   
959    <target name="extra166yclean"    <target name="extra166yclean"
960            description="Removes all extra166y build products">            description="Removes all extra166y build products">
961    
# Line 917  Line 964 
964    </target>    </target>
965    
966    
   
967    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
968            description="Removes all build and distribution products">            description="Removes all build and distribution products">
969    
# Line 925  Line 971 
971    
972    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
973            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
   
974      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
975      </target>
976    
977      <target name="extra166ydist-docs"
978              depends="extra166yclean, extra166ydocs">
979        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
980    </target>    </target>
981    
982    <!-- jsr166e -->    <!-- jsr166e -->
# Line 936  Line 985 
985            depends="configure-compiler"            depends="configure-compiler"
986            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
987    
988      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
989    
990      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
991             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
992             debug="${build.debug}"             debug="${build.debug}"
993             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
994             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 951  Line 1000 
1000             fork="true">             fork="true">
1001    
1002        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
1003        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1004        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1005          <compilerarg line="${build.args}"/>
1006    
1007      </javac>      </javac>
   
1008    </target>    </target>
1009    
1010    
   
1011    <target name="jsr166ejar"    <target name="jsr166ejar"
1012            depends="jsr166ecompile"            depends="jsr166ecompile"
1013            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1014    
1015      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1016        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1017      </jar>      </jar>
1018    
1019    </target>    </target>
1020    
1021    
   
1022    <target name="jsr166edocs"    <target name="jsr166edocs"
1023            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1024    
1025      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1026      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1027    
1028      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1029               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1030               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="7"  
1031               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1032               executable="${javadoc7}"               source="7"
1033               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
1034          <arg value="-XDignore.symbol.file=true"/>
1035    
1036      </javadoc>      </javadoc>
1037      </target>
1038    
1039    
1040      <target name="jsr166e-test-tck"
1041              depends="jsr166ejar"
1042              description="Runs tck tests for jsr166e">
1043    
1044        <run-tck-tests
1045          tck.src.dir="${test.src.dir}/tck-jsr166e"
1046          source="7"
1047          target="8"
1048          workdir="${build.jsr166e.dir}"
1049          classes="${jsr166e.jar}"/>
1050    </target>    </target>
1051    
1052    
1053    <target name="jsr166edist"    <target name="jsr166edist"
1054            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1055            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1056    
1057    
   
1058    <target name="jsr166eclean"    <target name="jsr166eclean"
1059            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1060      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1061    </target>    </target>
1062    
1063    
# Line 1012  Line 1068 
1068    
1069    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1070            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
   
1071      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1072      </target>
1073    
1074      <target name="jsr166edist-docs"
1075              depends="jsr166eclean, jsr166edocs">
1076        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1077    </target>    </target>
1078    
1079  </project>  </project>
Legend:
Removed from v.1.111  
changed lines
  Added in v.1.128
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27