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

Diff of /jsr166/build.xml

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

revision 1.113 by jsr166, Sun Jan 20 03:51:38 2013 UTC revision 1.119 by jsr166, Mon Jan 21 02:31:40 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 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/"/>
# Line 143  Line 134 
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="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               bootclasspath="@{product.jar}:${bootclasspath6}"
165               includeAntRuntime="false"
166               includeJavaRuntime="false"
167               executable="${javac@{target}}"
168               fork="true">
169    
170          <include name="JSR166TestCase.java"/>
171          <compilerarg value="-XDignore.symbol.file=true"/>
172          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
173          <compilerarg line="${build.args}"/>
174    
175        </javac>
176    
177        <java classname="JSR166TestCase"
178              failonerror="true"
179              jvm="${java@{target}}"
180              fork="true">
181            <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
182            <jvmarg line="@{jvmflags}"/>
183            <classpath>
184              <pathelement location="${junit.jar}"/>
185              <pathelement location="@{workdir}/tck-classes"/>
186            </classpath>
187        </java>
188    
189        </sequential>
190      </macrodef>
191    
192    <!-- ALoops classpath -->    <!-- ALoops classpath -->
193    <path id="loops.classpath">    <path id="loops.classpath">
194      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 185  Line 225 
225             fork="true">             fork="true">
226    
227        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
228        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
229        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
230        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
231    
232      </javac>      </javac>
   
233    </target>    </target>
234    
235    
   
236    <target name="jar"    <target name="jar"
237            depends="compile"            depends="compile"
238            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 208  Line 240 
240      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
241        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
242      </jar>      </jar>
   
243    </target>    </target>
244    
245    
   
246    <target name="test"    <target name="test"
247            depends="configure-tests, report-tests"            depends="configure-tests, report-tests"
248            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)" />
249    
250    
   
251    <target name="docs"    <target name="docs"
252            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
253    
# Line 235  Line 264 
264               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
265               classpath=""               classpath=""
266               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
267        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
268          <include name="**/*.java"/>          <include name="**/*.java"/>
269        </fileset>        </fileset>
270          <arg value="-XDignore.symbol.file=true"/>
271          <arg value="-tag"/>
272          <arg value="${javadoc.jls.option}"/>
273      </javadoc>      </javadoc>
   
274    </target>    </target>
275    
276    
   
277    <target name="dist"    <target name="dist"
278            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, docs"
279            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
# Line 267  Line 294 
294        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
295        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
296      </jar>      </jar>
   
297    </target>    </target>
298    
299    
   
300    <target name="clean"    <target name="clean"
301            description="Removes all build products">            description="Removes all build products">
302    
# Line 280  Line 305 
305    </target>    </target>
306    
307    
   
308    <target name="dist-clean"    <target name="dist-clean"
309            description="Removes all build and distribution products">            description="Removes all build and distribution products">
310    
# Line 289  Line 313 
313    </target>    </target>
314    
315    
   
316    <!-- Internal targets -->    <!-- Internal targets -->
317    
318    
# Line 313  Line 336 
336             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
337             source="6"             source="6"
338             classpath="${junit.jar}"             classpath="${junit.jar}"
339             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
340             includeAntRuntime="false"             includeAntRuntime="false"
341             includeJavaRuntime="false"             includeJavaRuntime="false"
342             executable="${javac8}"             executable="${javac8}"
343             fork="true">             fork="true">
344    
345        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
346        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
347        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
348          <compilerarg line="${build.args}"/>
349    
350      </javac>      </javac>
351    
# Line 333  Line 356 
356             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
357             source="6"             source="6"
358             classpath=""             classpath=""
359             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
360             includeAntRuntime="false"             includeAntRuntime="false"
361             includeJavaRuntime="false"             includeJavaRuntime="false"
362             executable="${javac8}"             executable="${javac8}"
363             fork="true">             fork="true">
364    
365        <include name="jsr166/test/**/*.java"/>        <include name="jsr166/test/**/*.java"/>
   
       <compilerarg line="${build.args}"/>  
366        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
367        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
368          <compilerarg line="${build.args}"/>
369    
370      </javac>      </javac>
371    
# Line 356  Line 378 
378             source="${build.sourcelevel}"             source="${build.sourcelevel}"
379               fork="true">               fork="true">
380    
381        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
382        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
383          <compilerarg line="${build.args}"/>
384    
385      </javac>      </javac>
386  -->  -->
# Line 511  Line 533 
533    
534    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
535    
   
536    <target name="4jdk7compile"    <target name="4jdk7compile"
537            depends="configure-compiler"            depends="configure-compiler"
538            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 532  Line 553 
553             fork="true">             fork="true">
554    
555        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
556        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
557        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
558          <compilerarg line="${build.args}"/>
559    
560      </javac>      </javac>
561      </target>
562    
     <jar destfile="${4jdk7product.jar}" index="true">  
       <fileset dir="${build.4jdk7.classes.dir}"/>  
     </jar>  
   
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
563    
564      <javac srcdir="${tck.src.dir}"    <target name="4jdk7-jar"
565             destdir="${build.4jdk7.tck.classes.dir}"            depends="4jdk7compile"
566             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"/>  
567    
568      </javac>      <jar destfile="${4jdk7product.jar}">
569          <fileset dir="${build.4jdk7.classes.dir}"/>
570        </jar>
571    
572    </target>    </target>
573    
574    
575    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
576            depends="4jdk7compile"            depends="4jdk7-jar"
577            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
578    
579      <run-tck-tests      <run-tck-tests
580        jvm="${java7}"        target="7"
581        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
582        product.jar="${4jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
583    </target>    </target>
584    
# Line 605  Line 611 
611      </junit>      </junit>
612    </target>    </target>
613    
614      <target name="4jdk7-test-jtreg"
615              depends="4jdk7compile"
616              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
617        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
618        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
619        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
620        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
621        <jtreg dir="${jtreg.src.dir}"
622               jdk="${jdk7.home}"
623               workDir="${build.4jdk7.dir}/JTwork"
624               reportDir="${build.4jdk7.dir}/JTreport">
625    
626          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
627          <arg value="-agentvm"/>
628          <arg value="-v:nopass,fail"/>
629          <arg value="-vmoptions:-esa -ea"/>
630          <arg value="-automatic"/>
631          <arg value="-k:!ignore"/>
632        </jtreg>
633      </target>
634    
635    
636      <target name="4jdk7-test"
637              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
638              description="Runs tck and jtreg tests for jsr166-4jdk7">
639      </target>
640    
641    
642    <target name="4jdk7docs"    <target name="4jdk7docs"
643            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
# Line 619  Line 652 
652               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
653               classpath=""               classpath=""
654               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
655        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
656          <include name="**/*.java"/>          <include name="**/*.java"/>
657        </fileset>        </fileset>
658          <arg value="-XDignore.symbol.file=true"/>
659      </javadoc>      </javadoc>
   
660    </target>    </target>
661    
662    
# Line 633  Line 665 
665            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
666    
667    
   
668    <target name="4jdk7clean"    <target name="4jdk7clean"
669            description="Removes all 4jdk7 build products">            description="Removes all 4jdk7 build products">
670    
# Line 642  Line 673 
673    </target>    </target>
674    
675    
   
676    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
677            description="Removes all build and distribution products">            description="Removes all build and distribution products">
678    
679    </target>    </target>
680    
681    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
682            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7-jar">
683    
684      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
685    
# Line 662  Line 692 
692            depends="configure-compiler"            depends="configure-compiler"
693            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
694    
695      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
696    
697      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
698             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
699             debug="${build.debug}"             debug="${build.debug}"
700             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
701             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
702             classpath=""             classpath=""
            source="5"  
703             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
704               source="5"
705             includeAntRuntime="false"             includeAntRuntime="false"
706             includeJavaRuntime="false"             includeJavaRuntime="false"
707             executable="${javac7}"             executable="${javac7}"
708             fork="true">             fork="true">
709    
710        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
711        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
712        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
713          <compilerarg line="${build.args}"/>
714    
715      </javac>      </javac>
   
716    </target>    </target>
717    
718    
719      <target name="jsr166x-jar"
   <target name="jsr166xjar"  
720            depends="jsr166xcompile"            depends="jsr166xcompile"
721            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
722    
723      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
724        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
725      </jar>      </jar>
726    
727    </target>    </target>
728    
729    
   
730    <target name="jsr166xdocs"    <target name="jsr166xdocs"
731            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
732    
# Line 709  Line 736 
736      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
737               packagenames="jsr166x.*"               packagenames="jsr166x.*"
738               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="5"  
              bootclasspath="${bootclasspath6}"  
739               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
740               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
741               additionalparam="-XDignore.symbol.file=true" />               source="5"
742                 executable="${javadoc7}">
743          <arg value="-XDignore.symbol.file=true"/>
744    
745        </javadoc>
746    </target>    </target>
747    
748    
# Line 723  Line 751 
751            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
752    
753    
   
754    <target name="jsr166xclean"    <target name="jsr166xclean"
755            description="Removes all jsr166x build products">            description="Removes all jsr166x build products">
756    
# Line 732  Line 759 
759    </target>    </target>
760    
761    
   
762    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
763            description="Removes all build and distribution products">            description="Removes all build and distribution products">
764    
# Line 740  Line 766 
766    
767    
768    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
769            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166x-jar">
770    
771      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
772    
# Line 753  Line 779 
779            depends="configure-compiler"            depends="configure-compiler"
780            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
781    
782      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
783    
784      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
785             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
786             debug="${build.debug}"             debug="${build.debug}"
787             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
788             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 769  Line 795 
795             fork="true">             fork="true">
796    
797        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
798        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
799        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
800          <compilerarg line="${build.args}"/>
801    
802      </javac>      </javac>
803    </target>    </target>
804    
805    
806    <target name="jsr166yjar"    <target name="jsr166y-jar"
807            depends="jsr166ycompile"            depends="jsr166ycompile"
808            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
809    
810      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
811        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
812      </jar>      </jar>
813    
814    </target>    </target>
815    
816    
   
817    <target name="jsr166ydocs"    <target name="jsr166ydocs"
818            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
819    
# Line 797  Line 823 
823      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
824               packagenames="jsr166y.*"               packagenames="jsr166y.*"
825               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="6"  
              bootclasspath="${bootclasspath6}"  
826               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
827               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
828               additionalparam="-XDignore.symbol.file=true" />               source="6"
829                 executable="${javadoc7}">
830          <arg value="-XDignore.symbol.file=true"/>
831    
832        </javadoc>
833    </target>    </target>
834    
835    
# Line 811  Line 838 
838            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
839    
840    
   
841    <target name="jsr166yclean"    <target name="jsr166yclean"
842            description="Removes all jsr166y build products">            description="Removes all jsr166y build products">
843    
# Line 820  Line 846 
846    </target>    </target>
847    
848    
   
849    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
850            description="Removes all build and distribution products">            description="Removes all build and distribution products">
851    
852    </target>    </target>
853    
854    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
855            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166y-jar">
856    
857      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
858    
# Line 838  Line 863 
863    
864    
865    <target name="extra166ycompile"    <target name="extra166ycompile"
866            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166y-jar"
867            description="Compiles extra166y sources">            description="Compiles extra166y sources">
868    
869      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
870    
871      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
872             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
873             debug="${build.debug}"             debug="${build.debug}"
874             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
875             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
876               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
877             classpath=""             classpath=""
878             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
879             includeAntRuntime="false"             includeAntRuntime="false"
880             includeJavaRuntime="false"             includeJavaRuntime="false"
881             executable="${javac7}"             executable="${javac7}"
882             fork="true">             fork="true">
883    
884        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
885        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
886        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
887          <compilerarg line="${build.args}"/>
888    
889      </javac>      </javac>
   
890    </target>    </target>
891    
892    
893      <target name="extra166y-jar"
   <target name="extra166yjar"  
894            depends="extra166ycompile"            depends="extra166ycompile"
895            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
896    
897      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
898        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
899      </jar>      </jar>
900    
901    </target>    </target>
902    
903    
   
904    <target name="extra166ydocs"    <target name="extra166ydocs"
905            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
906    
# Line 888  Line 910 
910      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
911               packagenames="extra166y.*"               packagenames="extra166y.*"
912               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="6"  
              bootclasspath="${bootclasspath6}"  
913               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
914               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
915               additionalparam="-XDignore.symbol.file=true" />               source="6"
916                 executable="${javadoc7}">
917          <arg value="-XDignore.symbol.file=true"/>
918    
919        </javadoc>
920    </target>    </target>
921    
922    
# Line 902  Line 925 
925            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
926    
927    
   
928    <target name="extra166yclean"    <target name="extra166yclean"
929            description="Removes all extra166y build products">            description="Removes all extra166y build products">
930    
# Line 911  Line 933 
933    </target>    </target>
934    
935    
   
936    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
937            description="Removes all build and distribution products">            description="Removes all build and distribution products">
938    
939    </target>    </target>
940    
941    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
942            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166y-jar">
943    
944      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
945    
# Line 930  Line 951 
951            depends="configure-compiler"            depends="configure-compiler"
952            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
953    
954      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
955    
956      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
957             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
958             debug="${build.debug}"             debug="${build.debug}"
959             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
960             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 945  Line 966 
966             fork="true">             fork="true">
967    
968        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
969        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
970        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
971          <compilerarg line="${build.args}"/>
972    
973      </javac>      </javac>
   
974    </target>    </target>
975    
976    
977      <target name="jsr166e-jar"
   <target name="jsr166ejar"  
978            depends="jsr166ecompile"            depends="jsr166ecompile"
979            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
980    
981      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
982        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
983      </jar>      </jar>
984    
985    </target>    </target>
986    
987    
   
988    <target name="jsr166edocs"    <target name="jsr166edocs"
989            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
990    
# Line 976  Line 994 
994      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
995               packagenames="jsr166e.*"               packagenames="jsr166e.*"
996               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="7"  
997               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
998               executable="${javadoc7}"               source="7"
999               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
1000      </javadoc>        <arg value="-XDignore.symbol.file=true"/>
1001    
1002        </javadoc>
1003    </target>    </target>
1004    
1005    
# Line 990  Line 1008 
1008            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1009    
1010    
   
1011    <target name="jsr166eclean"    <target name="jsr166eclean"
1012            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
1013    
# Line 1005  Line 1022 
1022    </target>    </target>
1023    
1024    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1025            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166e-jar">
1026    
1027      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1028    

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

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