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

Diff of /jsr166/build.xml

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

revision 1.114 by jsr166, Sun Jan 20 04:44:26 2013 UTC revision 1.121 by jsr166, Mon Jan 21 22:03:09 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="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 133  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 148  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="*.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}"/>
195    </path>    </path>
196    
197    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
198    <!-- 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"/>  
199    <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;:"/>
200    
201    <!-- Main targets -->    <!-- Main targets -->
# Line 190  Line 222 
222             fork="true">             fork="true">
223    
224        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
225        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
226        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
   
 <!--  
       <exclude name="java/lang/**"/>  
227        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="-Xlint -Xmaxwarns 1000"/>  
 -->  
228    
229      </javac>      </javac>
   
230    </target>    </target>
231    
232    
   
233    <target name="jar"    <target name="jar"
234            depends="compile"            depends="compile"
235            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 213  Line 237 
237      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
238        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
239      </jar>      </jar>
   
240    </target>    </target>
241    
242    
   
243    <target name="test"    <target name="test"
244            depends="configure-tests, report-tests"            depends="configure-tests, report-tests"
245            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)" />
246    
247    
   
248    <target name="docs"    <target name="docs"
249            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
250    
# Line 240  Line 261 
261               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
262               classpath=""               classpath=""
263               executable="${javadoc8}">               executable="${javadoc8}">
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/>  
       <arg value="${javadoc.jls.option}"/>  
264        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
265          <include name="**/*.java"/>          <include name="**/*.java"/>
266        </fileset>        </fileset>
267          <arg value="-XDignore.symbol.file=true"/>
268          <arg value="-tag"/>
269          <arg value="${javadoc.jls.option}"/>
270      </javadoc>      </javadoc>
   
271    </target>    </target>
272    
273    
   
274    <target name="dist"    <target name="dist"
275            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, docs"
276            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
# Line 272  Line 291 
291        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
292        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
293      </jar>      </jar>
   
294    </target>    </target>
295    
296    
   
297    <target name="clean"    <target name="clean"
298            description="Removes all build products">            description="Removes all build products">
299    
# Line 285  Line 302 
302    </target>    </target>
303    
304    
   
305    <target name="dist-clean"    <target name="dist-clean"
306            description="Removes all build and distribution products">            description="Removes all build and distribution products">
307    
# Line 294  Line 310 
310    </target>    </target>
311    
312    
   
313    <!-- Internal targets -->    <!-- Internal targets -->
314    
315    
# Line 318  Line 333 
333             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
334             source="6"             source="6"
335             classpath="${junit.jar}"             classpath="${junit.jar}"
336             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
337             includeAntRuntime="false"             includeAntRuntime="false"
338             includeJavaRuntime="false"             includeJavaRuntime="false"
339             executable="${javac8}"             executable="${javac8}"
340             fork="true">             fork="true">
341    
342        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
343        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
344        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
345          <compilerarg line="${build.args}"/>
346    
347      </javac>      </javac>
348    
# Line 338  Line 353 
353             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
354             source="6"             source="6"
355             classpath=""             classpath=""
356             bootclasspath="${product.jar}:${bootclasspath6}"             bootclasspath="@{product.jar}:${bootclasspath6}"
357             includeAntRuntime="false"             includeAntRuntime="false"
358             includeJavaRuntime="false"             includeJavaRuntime="false"
359             executable="${javac8}"             executable="${javac8}"
360             fork="true">             fork="true">
361    
362        <include name="jsr166/test/**/*.java"/>        <include name="jsr166/test/**/*.java"/>
   
       <compilerarg line="${build.args}"/>  
363        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
364        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
365          <compilerarg line="${build.args}"/>
366    
367      </javac>      </javac>
368    
# Line 361  Line 375 
375             source="${build.sourcelevel}"             source="${build.sourcelevel}"
376               fork="true">               fork="true">
377    
378        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>  
379        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
380          <compilerarg line="${build.args}"/>
381    
382      </javac>      </javac>
383  -->  -->
# Line 516  Line 530 
530    
531    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
532    
   
533    <target name="4jdk7compile"    <target name="4jdk7compile"
534            depends="configure-compiler"            depends="configure-compiler"
535            description="Compiles src/jdk7 sources, targeting jdk7">            description="Compiles src/jdk7 sources, targeting jdk7">
# Line 537  Line 550 
550             fork="true">             fork="true">
551    
552        <include name="**/*.java"/>        <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>  
553        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
554        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
555          <compilerarg line="${build.args}"/>
556    
557      </javac>      </javac>
558      </target>
559    
     <jar destfile="${4jdk7product.jar}" index="true">  
       <fileset dir="${build.4jdk7.classes.dir}"/>  
     </jar>  
   
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.4jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
560    
561        <include name="**/*.java"/>    <target name="4jdk7-jar"
562        <compilerarg line="${build.args}"/>            depends="4jdk7compile"
563        <compilerarg value="-XDignore.symbol.file=true"/>            description="Builds library jar from compiled sources">
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
564    
565      </javac>      <jar destfile="${4jdk7product.jar}">
566          <fileset dir="${build.4jdk7.classes.dir}"/>
567        </jar>
568    
569    </target>    </target>
570    
571    
572    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
573            depends="4jdk7compile"            depends="4jdk7-jar"
574            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
575    
576      <run-tck-tests      <run-tck-tests
577        jvm="${java7}"        target="7"
578        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
579        product.jar="${4jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
580    </target>    </target>
581    
# Line 610  Line 608 
608      </junit>      </junit>
609    </target>    </target>
610    
611      <target name="4jdk7-test-jtreg"
612              depends="4jdk7compile"
613              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
614        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
615        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
616        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
617        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
618        <jtreg dir="${jtreg.src.dir}"
619               jdk="${jdk7.home}"
620               workDir="${build.4jdk7.dir}/JTwork"
621               reportDir="${build.4jdk7.dir}/JTreport">
622    
623          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
624          <arg value="-agentvm"/>
625          <arg value="-v:nopass,fail"/>
626          <arg value="-vmoptions:-esa -ea"/>
627          <arg value="-automatic"/>
628          <arg value="-k:!ignore"/>
629        </jtreg>
630      </target>
631    
632    
633      <target name="4jdk7-test"
634              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
635              description="Runs tck and jtreg tests for jsr166-4jdk7">
636      </target>
637    
638    
639    <target name="4jdk7docs"    <target name="4jdk7docs"
640            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
# Line 624  Line 649 
649               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
650               classpath=""               classpath=""
651               executable="${javadoc7}">               executable="${javadoc7}">
       <arg value="-XDignore.symbol.file=true"/>  
652        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
653          <include name="**/*.java"/>          <include name="**/*.java"/>
654        </fileset>        </fileset>
655          <arg value="-XDignore.symbol.file=true"/>
656      </javadoc>      </javadoc>
   
657    </target>    </target>
658    
659    
# Line 638  Line 662 
662            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
663    
664    
   
665    <target name="4jdk7clean"    <target name="4jdk7clean"
666            description="Removes all 4jdk7 build products">            description="Removes all 4jdk7 build products">
667    
# Line 647  Line 670 
670    </target>    </target>
671    
672    
   
673    <target name="4jdk7dist-clean"    <target name="4jdk7dist-clean"
674            description="Removes all build and distribution products">            description="Removes all build and distribution products">
675    
676    </target>    </target>
677    
678    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
679            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7-jar">
680    
681      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
682    
# Line 675  Line 697 
697             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
698             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
699             classpath=""             classpath=""
            source="5"  
700             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
701               source="5"
702             includeAntRuntime="false"             includeAntRuntime="false"
703             includeJavaRuntime="false"             includeJavaRuntime="false"
704             executable="${javac7}"             executable="${javac7}"
705             fork="true">             fork="true">
706    
707        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>  
708        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
709        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
710          <compilerarg line="${build.args}"/>
711    
712      </javac>      </javac>
   
713    </target>    </target>
714    
715    
716      <target name="jsr166x-jar"
   <target name="jsr166xjar"  
717            depends="jsr166xcompile"            depends="jsr166xcompile"
718            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
719    
# Line 704  Line 724 
724    </target>    </target>
725    
726    
   
727    <target name="jsr166xdocs"    <target name="jsr166xdocs"
728            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
729    
# Line 714  Line 733 
733      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
734               packagenames="jsr166x.*"               packagenames="jsr166x.*"
735               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="5"  
              bootclasspath="${bootclasspath6}"  
736               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
737               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
738               additionalparam="-XDignore.symbol.file=true" />               source="5"
739                 executable="${javadoc7}">
740          <arg value="-XDignore.symbol.file=true"/>
741    
742        </javadoc>
743    </target>    </target>
744    
745    
# Line 728  Line 748 
748            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
749    
750    
   
751    <target name="jsr166xclean"    <target name="jsr166xclean"
752            description="Removes all jsr166x build products">            description="Removes all jsr166x build products">
753    
# Line 737  Line 756 
756    </target>    </target>
757    
758    
   
759    <target name="jsr166xdist-clean"    <target name="jsr166xdist-clean"
760            description="Removes all build and distribution products">            description="Removes all build and distribution products">
761    
# Line 745  Line 763 
763    
764    
765    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
766            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166x-jar">
767    
768      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
769    
# Line 774  Line 792 
792             fork="true">             fork="true">
793    
794        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
795        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
796        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
797          <compilerarg line="${build.args}"/>
798    
799      </javac>      </javac>
800    </target>    </target>
801    
802    
803    <target name="jsr166yjar"    <target name="jsr166y-jar"
804            depends="jsr166ycompile"            depends="jsr166ycompile"
805            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
806    
# Line 792  Line 811 
811    </target>    </target>
812    
813    
   
814    <target name="jsr166ydocs"    <target name="jsr166ydocs"
815            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
816    
# Line 802  Line 820 
820      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
821               packagenames="jsr166y.*"               packagenames="jsr166y.*"
822               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="6"  
              bootclasspath="${bootclasspath6}"  
823               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
824               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
825               additionalparam="-XDignore.symbol.file=true" />               source="6"
826                 executable="${javadoc7}">
827          <arg value="-XDignore.symbol.file=true"/>
828    
829        </javadoc>
830    </target>    </target>
831    
832    
# Line 816  Line 835 
835            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
836    
837    
   
838    <target name="jsr166yclean"    <target name="jsr166yclean"
839            description="Removes all jsr166y build products">            description="Removes all jsr166y build products">
840    
# Line 825  Line 843 
843    </target>    </target>
844    
845    
   
846    <target name="jsr166ydist-clean"    <target name="jsr166ydist-clean"
847            description="Removes all build and distribution products">            description="Removes all build and distribution products">
848    
849    </target>    </target>
850    
851    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
852            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166y-jar">
853    
854      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
855    
# Line 843  Line 860 
860    
861    
862    <target name="extra166ycompile"    <target name="extra166ycompile"
863            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166y-jar"
864            description="Compiles extra166y sources">            description="Compiles extra166y sources">
865    
866      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 853  Line 870 
870             debug="${build.debug}"             debug="${build.debug}"
871             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
872             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
873               bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
874             classpath=""             classpath=""
875             source="6"             source="6"
            bootclasspath="${jsr166y.jar}:${bootclasspath6}"  
876             includeAntRuntime="false"             includeAntRuntime="false"
877             includeJavaRuntime="false"             includeJavaRuntime="false"
878             executable="${javac7}"             executable="${javac7}"
879             fork="true">             fork="true">
880    
881        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>  
882        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
883        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
884          <compilerarg line="${build.args}"/>
885    
886      </javac>      </javac>
   
887    </target>    </target>
888    
889    
890      <target name="extra166y-jar"
   <target name="extra166yjar"  
891            depends="extra166ycompile"            depends="extra166ycompile"
892            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
893    
# Line 883  Line 898 
898    </target>    </target>
899    
900    
   
901    <target name="extra166ydocs"    <target name="extra166ydocs"
902            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
903    
# Line 893  Line 907 
907      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
908               packagenames="extra166y.*"               packagenames="extra166y.*"
909               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="6"  
              bootclasspath="${bootclasspath6}"  
910               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
911               executable="${javadoc7}"               bootclasspath="${bootclasspath6}"
912               additionalparam="-XDignore.symbol.file=true" />               source="6"
913                 executable="${javadoc7}">
914          <arg value="-XDignore.symbol.file=true"/>
915    
916        </javadoc>
917    </target>    </target>
918    
919    
# Line 907  Line 922 
922            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
923    
924    
   
925    <target name="extra166yclean"    <target name="extra166yclean"
926            description="Removes all extra166y build products">            description="Removes all extra166y build products">
927    
# Line 916  Line 930 
930    </target>    </target>
931    
932    
   
933    <target name="extra166ydist-clean"    <target name="extra166ydist-clean"
934            description="Removes all build and distribution products">            description="Removes all build and distribution products">
935    
936    </target>    </target>
937    
938    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
939            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166y-jar">
940    
941      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
942    
# Line 950  Line 963 
963             fork="true">             fork="true">
964    
965        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>  
966        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
967        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
968          <compilerarg line="${build.args}"/>
969    
970      </javac>      </javac>
   
971    </target>    </target>
972    
973    
974      <target name="jsr166e-jar"
   <target name="jsr166ejar"  
975            depends="jsr166ecompile"            depends="jsr166ecompile"
976            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
977    
# Line 971  Line 982 
982    </target>    </target>
983    
984    
   
985    <target name="jsr166edocs"    <target name="jsr166edocs"
986            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
987    
# Line 981  Line 991 
991      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
992               packagenames="jsr166e.*"               packagenames="jsr166e.*"
993               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
              source="7"  
994               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
995               executable="${javadoc7}"               source="7"
996               additionalparam="-XDignore.symbol.file=true" >               executable="${javadoc7}">
997      </javadoc>        <arg value="-XDignore.symbol.file=true"/>
998    
999        </javadoc>
1000    </target>    </target>
1001    
1002    
# Line 995  Line 1005 
1005            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1006    
1007    
   
1008    <target name="jsr166eclean"    <target name="jsr166eclean"
1009            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
1010    
# Line 1010  Line 1019 
1019    </target>    </target>
1020    
1021    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1022            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166e-jar">
1023    
1024      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1025    

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.121

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