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

Diff of /jsr166/build.xml

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

revision 1.117 by jsr166, Sun Jan 20 07:43:30 2013 UTC revision 1.118 by jsr166, Mon Jan 21 01:05:01 2013 UTC
# Line 62  Line 62 
62    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>    <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>    <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64    
65    <!-- JDK binary locations -->    <!-- 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 72  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 83  Line 90 
90    <defjdklocations v="7"/>    <defjdklocations v="7"/>
91    <defjdklocations v="8"/>    <defjdklocations v="8"/>
92    
   <macrodef name="run-tck-tests">  
     <attribute name="target"/>  
     <attribute name="workdir"/>  
     <attribute name="product.jar" default="${product.jar}"/>  
     <attribute name="jvmflags" default=""/>  
     <sequential>  
   
     <mkdir dir="@{workdir}/tck-classes"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="@{workdir}/tck-classes"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac@{target}}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
     </javac>  
   
     <java classname="JSR166TestCase"  
           failonerror="true"  
           jvm="${java@{target}}"  
           fork="true">  
         <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>  
         <jvmarg line="@{jvmflags}"/>  
         <classpath>  
           <pathelement location="${junit.jar}"/>  
           <pathelement location="@{workdir}/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 158  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/"/>
# Line 184  Line 145 
145      <pathelement location="${junit.jar}"/>      <pathelement location="${junit.jar}"/>
146    </path>    </path>
147    
148      <macrodef name="run-tck-tests">
149        <attribute name="target"/>
150        <attribute name="workdir"/>
151        <attribute name="product.jar" default="${product.jar}"/>
152        <attribute name="jvmflags" default=""/>
153        <sequential>
154    
155        <mkdir dir="@{workdir}/tck-classes"/>
156    
157        <javac srcdir="${tck.src.dir}"
158               destdir="@{workdir}/tck-classes"
159               debug="${build.debug}"
160               debuglevel="${build.debuglevel}"
161               deprecation="${build.deprecation}"
162               source="6"
163               classpath="${junit.jar}"
164               includeAntRuntime="false"
165               includeJavaRuntime="false"
166               executable="${javac@{target}}"
167               fork="true">
168    
169          <include name="**/*.java"/>
170          <bootclasspath path="@{product.jar}"/>
171          <bootclasspath path="${bootclasspath6}"/>
172          <compilerarg value="-XDignore.symbol.file=true"/>
173          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
174          <compilerarg line="${build.args}"/>
175    
176        </javac>
177    
178        <java classname="JSR166TestCase"
179              failonerror="true"
180              jvm="${java@{target}}"
181              fork="true">
182            <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
183            <jvmarg line="@{jvmflags}"/>
184            <classpath>
185              <pathelement location="${junit.jar}"/>
186              <pathelement location="@{workdir}/tck-classes"/>
187            </classpath>
188        </java>
189    
190        </sequential>
191      </macrodef>
192    
193    <!-- ALoops classpath -->    <!-- ALoops classpath -->
194    <path id="loops.classpath">    <path id="loops.classpath">
195      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 220  Line 226 
226             fork="true">             fork="true">
227    
228        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
229        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
230        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
231        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
232    
233      </javac>      </javac>
   
234    </target>    </target>
235    
236    
   
237    <target name="jar"    <target name="jar"
238            depends="compile"            depends="compile"
239            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 243  Line 241 
241      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
242        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
243      </jar>      </jar>
   
244    </target>    </target>
245    
246    
   
247    <target name="test"    <target name="test"
248            depends="configure-tests, report-tests"            depends="configure-tests, report-tests"
249            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)" />
250    
251    
   
252    <target name="docs"    <target name="docs"
253            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
254    
# Line 267  Line 262 
262               packagenames="none"               packagenames="none"
263               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
264               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
              sourcepath="${src.dir}:${jdk8src.dir}"  
265               classpath=""               classpath=""
266               executable="${javadoc8}">               executable="${javadoc8}">
267          <sourcepath path="${src.dir}"/>
268          <sourcepath path="${jdk8src.dir}"/>
269        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
270        <arg value="-tag"/>        <arg value="-tag"/>
271        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
# Line 277  Line 273 
273          <include name="**/*.java"/>          <include name="**/*.java"/>
274        </fileset>        </fileset>
275      </javadoc>      </javadoc>
   
276    </target>    </target>
277    
278    
   
279    <target name="dist"    <target name="dist"
280            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, docs"
281            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
# Line 302  Line 296 
296        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
297        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
298      </jar>      </jar>
   
299    </target>    </target>
300    
301    
   
302    <target name="clean"    <target name="clean"
303            description="Removes all build products">            description="Removes all build products">
304    
# Line 315  Line 307 
307    </target>    </target>
308    
309    
   
310    <target name="dist-clean"    <target name="dist-clean"
311            description="Removes all build and distribution products">            description="Removes all build and distribution products">
312    
# Line 324  Line 315 
315    </target>    </target>
316    
317    
   
318    <!-- Internal targets -->    <!-- Internal targets -->
319    
320    
# Line 348  Line 338 
338             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
339             source="6"             source="6"
340             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="${product.jar}:${bootclasspath6}"  
341             includeAntRuntime="false"             includeAntRuntime="false"
342             includeJavaRuntime="false"             includeJavaRuntime="false"
343             executable="${javac8}"             executable="${javac8}"
344             fork="true">             fork="true">
345    
346        <include name="**/*.java"/>        <include name="**/*.java"/>
347        <compilerarg line="${build.args}"/>        <bootclasspath path="@{product.jar}"/>
348          <bootclasspath path="${bootclasspath6}"/>
349        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
350        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
351          <compilerarg line="${build.args}"/>
352    
353      </javac>      </javac>
354    
# Line 368  Line 359 
359             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
360             source="6"             source="6"
361             classpath=""             classpath=""
            bootclasspath="${product.jar}:${bootclasspath6}"  
362             includeAntRuntime="false"             includeAntRuntime="false"
363             includeJavaRuntime="false"             includeJavaRuntime="false"
364             executable="${javac8}"             executable="${javac8}"
365             fork="true">             fork="true">
366    
367        <include name="jsr166/test/**/*.java"/>        <include name="jsr166/test/**/*.java"/>
368          <bootclasspath path="${product.jar}"/>
369        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
370        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
371        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
372          <compilerarg line="${build.args}"/>
373    
374      </javac>      </javac>
375    
# Line 391  Line 382 
382             source="${build.sourcelevel}"             source="${build.sourcelevel}"
383               fork="true">               fork="true">
384    
385        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
386        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
387          <compilerarg line="${build.args}"/>
388    
389      </javac>      </javac>
390  -->  -->
# Line 546  Line 537 
537    
538    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
539    
   
540    <target name="4jdk7compile"    <target name="4jdk7compile"
541            depends="configure-compiler"            depends="configure-compiler"
542            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 560  Line 550 
550             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
551             source="6"             source="6"
552             classpath=""             classpath=""
            bootclasspath="${bootclasspath6}"  
553             includeAntRuntime="false"             includeAntRuntime="false"
554             includeJavaRuntime="false"             includeJavaRuntime="false"
555             executable="${javac7}"             executable="${javac7}"
556             fork="true">             fork="true">
557    
558        <include name="**/*.java"/>        <include name="**/*.java"/>
559        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
560        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
561        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
562          <compilerarg line="${build.args}"/>
563    
564      </javac>      </javac>
   
565    </target>    </target>
566    
567    
568    <target name="4jdk7-jar"    <target name="4jdk7-jar"
569            depends="4jdk7compile"            depends="4jdk7compile"
570            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 663  Line 653 
653               packagenames="none"               packagenames="none"
654               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
655               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"  
656               classpath=""               classpath=""
657               executable="${javadoc7}">               executable="${javadoc7}">
658          <sourcepath path="${4jdk7src.dir}"/>
659          <sourcepath path="${jdk7src.dir}"/>
660        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
661        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
662          <include name="**/*.java"/>          <include name="**/*.java"/>
663        </fileset>        </fileset>
664      </javadoc>      </javadoc>
   
665    </target>    </target>
666    
667    
# Line 680  Line 670 
670            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
671    
672    
   
673    <target name="4jdk7clean"    <target name="4jdk7clean"
674            description="Removes all 4jdk7 build products">            description="Removes all 4jdk7 build products">
675    
# Line 689  Line 678 
678    </target>    </target>
679    
680    
   
681    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
682            description="Removes all build and distribution products">            description="Removes all build and distribution products">
683    
684    </target>    </target>
685    
686    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
687            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7-jar">
688    
689      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
690    
# Line 718  Line 706 
706             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
707             classpath=""             classpath=""
708             source="5"             source="5"
            bootclasspath="${bootclasspath6}"  
709             includeAntRuntime="false"             includeAntRuntime="false"
710             includeJavaRuntime="false"             includeJavaRuntime="false"
711             executable="${javac7}"             executable="${javac7}"
712             fork="true">             fork="true">
713    
714        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
715        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
716        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
717        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
718          <compilerarg line="${build.args}"/>
719    
720      </javac>      </javac>
   
721    </target>    </target>
722    
723    
724      <target name="jsr166x-jar"
   <target name="jsr166xjar"  
725            depends="jsr166xcompile"            depends="jsr166xcompile"
726            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
727    
# Line 746  Line 732 
732    </target>    </target>
733    
734    
   
735    <target name="jsr166xdocs"    <target name="jsr166xdocs"
736            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
737    
# Line 757  Line 742 
742               packagenames="jsr166x.*"               packagenames="jsr166x.*"
743               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
744               source="5"               source="5"
745               bootclasspath="${bootclasspath6}"               executable="${javadoc7}">
746               sourcepath="${topsrc.dir}:${jdk6src.dir}"        <sourcepath path="${topsrc.dir}"/>
747               executable="${javadoc7}"        <sourcepath path="${jdk6src.dir}"/>
748               additionalparam="-XDignore.symbol.file=true"/>        <bootclasspath path="${bootclasspath6}"/>
749          <arg value="-XDignore.symbol.file=true"/>
750    
751        </javadoc>
752    </target>    </target>
753    
754    
# Line 770  Line 757 
757            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
758    
759    
   
760    <target name="jsr166xclean"    <target name="jsr166xclean"
761            description="Removes all jsr166x build products">            description="Removes all jsr166x build products">
762    
# Line 779  Line 765 
765    </target>    </target>
766    
767    
   
768    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
769            description="Removes all build and distribution products">            description="Removes all build and distribution products">
770    
# Line 787  Line 772 
772    
773    
774    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
775            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166x-jar">
776    
777      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
778    
# Line 809  Line 794 
794             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
795             source="6"             source="6"
796             classpath=""             classpath=""
            bootclasspath="${bootclasspath6}"  
797             includeAntRuntime="false"             includeAntRuntime="false"
798             includeJavaRuntime="false"             includeJavaRuntime="false"
799             executable="${javac7}"             executable="${javac7}"
800             fork="true">             fork="true">
801    
802        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
803        <compilerarg line="${build.args}"/>        <bootclasspath path="${bootclasspath6}"/>
804        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
805        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
806          <compilerarg line="${build.args}"/>
807    
808      </javac>      </javac>
809    </target>    </target>
810    
811    
812    <target name="jsr166yjar"    <target name="jsr166y-jar"
813            depends="jsr166ycompile"            depends="jsr166ycompile"
814            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
815    
# Line 834  Line 820 
820    </target>    </target>
821    
822    
   
823    <target name="jsr166ydocs"    <target name="jsr166ydocs"
824            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
825    
# Line 845  Line 830 
830               packagenames="jsr166y.*"               packagenames="jsr166y.*"
831               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
832               source="6"               source="6"
833               bootclasspath="${bootclasspath6}"               executable="${javadoc7}">
834               sourcepath="${topsrc.dir}:${jdk6src.dir}"        <sourcepath path="${topsrc.dir}"/>
835               executable="${javadoc7}"        <sourcepath path="${jdk6src.dir}"/>
836               additionalparam="-XDignore.symbol.file=true"/>        <bootclasspath path="${bootclasspath6}"/>
837          <arg value="-XDignore.symbol.file=true"/>
838    
839        </javadoc>
840    </target>    </target>
841    
842    
# Line 858  Line 845 
845            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
846    
847    
   
848    <target name="jsr166yclean"    <target name="jsr166yclean"
849            description="Removes all jsr166y build products">            description="Removes all jsr166y build products">
850    
# Line 867  Line 853 
853    </target>    </target>
854    
855    
   
856    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
857            description="Removes all build and distribution products">            description="Removes all build and distribution products">
858    
859    </target>    </target>
860    
861    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
862            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166y-jar">
863    
864      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
865    
# Line 885  Line 870 
870    
871    
872    <target name="extra166ycompile"    <target name="extra166ycompile"
873            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166y-jar"
874            description="Compiles extra166y sources">            description="Compiles extra166y sources">
875    
876      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 897  Line 882 
882             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
883             classpath=""             classpath=""
884             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
885             includeAntRuntime="false"             includeAntRuntime="false"
886             includeJavaRuntime="false"             includeJavaRuntime="false"
887             executable="${javac7}"             executable="${javac7}"
888             fork="true">             fork="true">
889    
890        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
891        <compilerarg line="${build.args}"/>        <bootclasspath path="${jsr166y.jar}"/>
892          <bootclasspath path="${bootclasspath6}"/>
893        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
894        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
895          <compilerarg line="${build.args}"/>
896    
897      </javac>      </javac>
   
898    </target>    </target>
899    
900    
901      <target name="extra166y-jar"
   <target name="extra166yjar"  
902            depends="extra166ycompile"            depends="extra166ycompile"
903            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
904    
# Line 925  Line 909 
909    </target>    </target>
910    
911    
   
912    <target name="extra166ydocs"    <target name="extra166ydocs"
913            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
914    
# Line 936  Line 919 
919               packagenames="extra166y.*"               packagenames="extra166y.*"
920               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
921               source="6"               source="6"
922               bootclasspath="${bootclasspath6}"               executable="${javadoc7}">
923               sourcepath="${topsrc.dir}:${jdk6src.dir}"        <sourcepath path="${topsrc.dir}"/>
924               executable="${javadoc7}"        <sourcepath path="${jdk6src.dir}"/>
925               additionalparam="-XDignore.symbol.file=true"/>        <bootclasspath path="${bootclasspath6}"/>
926          <arg value="-XDignore.symbol.file=true"/>
927    
928        </javadoc>
929    </target>    </target>
930    
931    
# Line 949  Line 934 
934            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
935    
936    
   
937    <target name="extra166yclean"    <target name="extra166yclean"
938            description="Removes all extra166y build products">            description="Removes all extra166y build products">
939    
# Line 958  Line 942 
942    </target>    </target>
943    
944    
   
945    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
946            description="Removes all build and distribution products">            description="Removes all build and distribution products">
947    
948    </target>    </target>
949    
950    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
951            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166y-jar">
952    
953      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
954    
# Line 992  Line 975 
975             fork="true">             fork="true">
976    
977        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
978        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
979        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
980          <compilerarg line="${build.args}"/>
981    
982      </javac>      </javac>
   
983    </target>    </target>
984    
985    
986      <target name="jsr166e-jar"
   <target name="jsr166ejar"  
987            depends="jsr166ecompile"            depends="jsr166ecompile"
988            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
989    
# Line 1013  Line 994 
994    </target>    </target>
995    
996    
   
997    <target name="jsr166edocs"    <target name="jsr166edocs"
998            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
999    
# Line 1024  Line 1004 
1004               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1005               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1006               source="7"               source="7"
1007               sourcepath="${topsrc.dir}:${jdk7src.dir}"               executable="${javadoc7}">
1008               executable="${javadoc7}"        <sourcepath path="${topsrc.dir}"/>
1009               additionalparam="-XDignore.symbol.file=true" >        <sourcepath path="${jdk7src.dir}"/>
1010      </javadoc>        <arg value="-XDignore.symbol.file=true"/>
1011    
1012        </javadoc>
1013    </target>    </target>
1014    
1015    
# Line 1037  Line 1018 
1018            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1019    
1020    
   
1021    <target name="jsr166eclean"    <target name="jsr166eclean"
1022            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
1023    
# Line 1052  Line 1032 
1032    </target>    </target>
1033    
1034    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1035            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166e-jar">
1036    
1037      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1038    
Legend:
Removed from v.1.117  
changed lines
  Added in v.1.118
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27