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

Diff of /jsr166/build.xml

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

revision 1.31, Wed May 28 21:15:50 2003 UTC revision 1.56, Mon Sep 1 04:21:55 2003 UTC
# Line 7  Line 7 
7    Usage: ant [target]    Usage: ant [target]
8    
9    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
10    See user.properties.sample for examples.    See user.properties.sample for an explanation of some useful settings.
11  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
12    </description>    </description>
13    
# Line 26  Line 26 
26    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
27    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
28    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
   <property name="build.novariance.arg" value=""/>  
29    
30    <!-- Build locations -->    <!-- Build locations -->
31    <property name="build.dir"            location="build"/>    <property name="build.dir"            location="build"/>
# Line 36  Line 35 
35    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.lib.dir"        location="${build.dir}/lib"/>
36    <property name="build.ant.dir"        location="${build.dir}/ant"/>    <property name="build.ant.dir"        location="${build.dir}/ant"/>
37    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38      <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
39    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
40    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.reports.dir"    location="${build.dir}/reports"/>
41    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
42    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
43      <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
44    
45    <!-- Source locations -->    <!-- Source locations -->
46    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 55  Line 56 
56    
57    <!-- Jar locations -->    <!-- Jar locations -->
58    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
   <property name="javac.jar"            location="${lib.dir}/javac.jar"/>  
   <property name="collect.jar"          location="${lib.dir}/collect.jar"/>  
59    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
60    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
61      <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
62    
63    
64      <!-- Files excluded from dist-docs and emulation jar -->
65    <!--    <patternset id="unsafe.exclusion">
    ! Bootclasspath munging for source compilation.  
    -->  
   
   <path id="javac.bootclasspath.prefix">  
     <!-- <pathelement location="${src.dir}"/> -->  
     <pathelement location="${javac.jar}"/>  
   </path>  
   
   <path id="javac.bootclasspath">  
     <!-- <pathelement location="${src.dir}"/> -->  
     <pathelement location="${collect.jar}"/>  
     <pathelement location="${rt.jar}"/>  
   </path>  
   
   <!-- Flatten bootclasspath prefix into a platform-appropriate string -->  
   <property name="javac.bootclasspath.prefix"  
            refid="javac.bootclasspath.prefix"/>  
   
   <!-- Turn the flattened bootclasspath prefix into a javac argument -->  
   <property name="build.bootclasspath.arg"  
            value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>  
   
   
   <!--  
    ! Bootclasspath munging for testing, so JUnit can test our local  
    ! modifications to java.*.  
    -->  
   
   <path id="test.classpath">  
     <pathelement location="${product.jar}"/>  
     <pathelement location="${build.testcases.dir}"/>  
     <pathelement location="${junit.jar}"/>  
   </path>  
   
   <!-- Flatten test classpath into a platform-appropriate string -->  
   <property name="test.classpath" refid="test.classpath"/>  
   
   <!-- Turn the flattened test classpath into a javac argument -->  
   <property name="test.bootclasspath.arg"  
            value='-Xbootclasspath/p:${test.classpath}'/>  
   
   
   
   <!-- Files excluded from emulation and dist-docs -->  
   <patternset id="emulation.excludes">  
66      <exclude name="java/util/Random.*"/>      <exclude name="java/util/Random.*"/>
67      <exclude name="sun/misc/Unsafe.*"/>      <exclude name="sun/misc/Unsafe.*"/>
68    </patternset>    </patternset>
69    
70      <!-- Files excludes from emulation jar -->
71      <patternset id="atomic.exclusion">
72        <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
73        <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
74        <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
75        <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
76        <exclude name="java/util/concurrent/locks/LockSupport*"/>
77        <exclude name="java/util/concurrent/locks/ReentrantLock*"/>
78      </patternset>
79    
80    
81    
82    <!-- Main targets -->    <!-- Main targets -->
83    
84    <target name="compile"    <target name="compile"
85            depends="init"            depends="init, configure-compiler, prepare-src"
86            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
87    
88        <property name="prepare.src.dir" value="${src.dir}"/>
89    
90      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
91    
92      <javac srcdir="${src.dir}"  <!--
93        <echo>javac ${gjc.args}</echo>
94        <echo>bootclasspath=${compile.bootclasspath}</echo>
95    -->
96    
97        <javac srcdir="${prepare.src.dir}"
98            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
99              debug="${build.debug}"              debug="${build.debug}"
100         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 130  Line 102 
102             source="${build.sourcelevel}"             source="${build.sourcelevel}"
103               fork="true">               fork="true">
104    
105        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
106        <compilerarg line="${build.javac.args}"/>  <!--
107          <bootclasspath refid="compile.bootclasspath"/>
108    -->
109    
110      </javac>      </javac>
111    
# Line 139  Line 113 
113    
114    
115    <target name="jar"    <target name="jar"
116            depends="check-emulation, init-jar, native-jar, emulation-jar"            depends="configure-emulation, init-jar, native-jar, emulation-jar"
117            description="Builds library jar from compiled sources"/>            description="Builds library jar from compiled sources"/>
118    
119    
120    <target name="test"    <target name="test"
121            depends="init, check-junit, report-tests"            depends="init, configure-tests, report-tests"
122            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)" />
123    
124    
# Line 164  Line 138 
138    
139    
140    <target name="doccheck"    <target name="doccheck"
141            depends="filter-src"            depends="filter-doccheck"
142            description="Reports on javadoc style errors (not working yet)">            description="Reports on javadoc style errors">
143    
144      <delete dir="${build.doccheck.dir}"/>      <delete dir="${build.doccheck.dir}"/>
145      <mkdir dir="${build.doccheck.dir}"/>      <mkdir dir="${build.doccheck.dir}"/>
# Line 173  Line 147 
147      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
148           docletpath="${lib.dir}/doccheck.jar"           docletpath="${lib.dir}/doccheck.jar"
149              destdir="${build.doccheck.dir}">              destdir="${build.doccheck.dir}">
150        <packageset dir="${build.filter.src.dir}"/>        <packageset dir="${build.filter.doccheck.dir}"/>
151      </javadoc>      </javadoc>
152    
153        <echo>DocCheck output is in ${build.doccheck.dir}</echo>
154    
155    </target>    </target>
156    
157    
# Line 203  Line 179 
179    </target>    </target>
180    
181    
182      <target name="sinjdocs"
183              depends="configure-tests"
184              description="Builds javadocs with custom tags to build folder">
185    
186        <delete dir="${build.sinjdocs.dir}"/>
187        <mkdir dir="${build.sinjdocs.dir}"/>
188    
189        <java classname="net.cscott.sinjdoc.Main" fork="true">
190    
191          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
192    
193          <classpath>
194            <pathelement location="${sinjdoc.jar}"/>
195            <pathelement location="${lib.dir}/jutil.jar"/>
196            <pathelement location="${lib.dir}/cup.jar"/>
197            <path refid="test.classpath"/>
198          </classpath>
199    
200    
201          <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
202          <arg value="-sourcepath"/> <arg value="${src.dir}"/>
203          <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
204          <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
205          <!-- <arg value="-verbose"/> -->
206          <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
207          <arg value="java.lang"/>
208          <arg value="java.util"/>
209          <arg value="java.util.concurrent"/>
210          <arg value="java.util.concurrent.atomic"/>
211          <arg value="java.util.concurrent.locks"/>
212    
213          <!--
214          <arg value="-help"/>
215          -->
216    
217        </java>
218    
219      </target>
220    
221    
222    <target name="strip"    <target name="strip"
223            depends="init"            depends="init, configure-compiler"
224            description="Strip generics from java source (not working yet)">            description="Strip generics from java source (not working yet)">
225    
226      <mkdir dir="${build.stripped.dir}"/>      <mkdir dir="${build.stripped.dir}"/>
# Line 222  Line 238 
238             source="${build.sourcelevel}"             source="${build.sourcelevel}"
239               fork="true">               fork="true">
240    
241        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args} -s"/>
242        <compilerarg line="${build.javac.args} -s"/>  <!--
243          <bootclasspath refid="compile.bootclasspath"/>
244    -->
245    
246      </javac>      </javac>
247    
# Line 234  Line 252 
252            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
253            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
254    
255      <target name="release"
256              depends="dist"
257              description="Puts entire CVS tree, plus distribution productions, in a jar">
258    
259    <!--
260        #keep build dir? - dl
261        <delete dir="${build.dir}"/>
262    -->
263        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
264    
265        <jar basedir="${basedir}" destfile="${release.jar}">
266          <exclude name="${release.jar}"/>
267          <exclude name="user.properties"/>
268          <exclude name="etc/notes/**"/>
269          <exclude name="lib/gjc/2.1/**"/>
270          <exclude name="**/SyntaxTest.java"/>
271        </jar>
272    
273      </target>
274    
275    <target name="clean"    <target name="clean"
276            description="Removes all build products">            description="Removes all build products">
# Line 275  Line 312 
312    
313    <!-- Internal targets -->    <!-- Internal targets -->
314    
   <target name="set-warnings-if" if="build.warnings">  
   
     <property name="build.warnings.arg" value="-warnunchecked"/>  
   
   </target>  
   
   
   <target name="set-warnings-unless" unless="build.warnings">  
   
     <property name="build.warnings.arg" value=""/>  
   
   </target>  
315    
316      <target name="init">
   <target name="init"  
           depends="set-warnings-if, set-warnings-unless">  
317    
318      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
319      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
320      <echo>Building JSR-166 version ${version}</echo>      <echo>Building JSR-166 version ${version}</echo>
321        <echo>java.home is ${java.home}</echo>
     <!-- Common options in javac invocations -->  
     <property name="build.javac.args"  
              value="${build.bootclasspath.arg} ${build.warnings.arg} ${build.novariance.arg}"/>  
322    
323    </target>    </target>
324    
# Line 322  Line 342 
342    
343    
344    <target name="compile-emulation"    <target name="compile-emulation"
345            depends="init"            depends="init, configure-compiler"
346            if="build.emulation.true">            if="build.emulation.true">
347    
348      <mkdir dir="${build.emulation.dir}"/>      <mkdir dir="${build.emulation.dir}"/>
# Line 335  Line 355 
355             source="${build.sourcelevel}"             source="${build.sourcelevel}"
356               fork="true">               fork="true">
357    
358        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
359        <compilerarg line="${build.javac.args}"/>  <!--
360          <bootclasspath refid="compile.bootclasspath"/>
361    -->
362    
363      </javac>      </javac>
364    
# Line 350  Line 372 
372    
373      <jar destfile="${product.jar}" duplicate="add">      <jar destfile="${product.jar}" duplicate="add">
374        <fileset dir="${build.classes.dir}">        <fileset dir="${build.classes.dir}">
375          <patternset refid="emulation.excludes"/>          <patternset refid="atomic.exclusion"/>
376            <patternset refid="unsafe.exclusion"/>
377        </fileset>        </fileset>
378        <fileset dir="${build.emulation.dir}"/>        <fileset dir="${build.emulation.dir}"/>
379      </jar>      </jar>
# Line 393  Line 416 
416      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
417        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
418          <exclude name="**/*.html"/>          <exclude name="**/*.html"/>
419          <patternset refid="emulation.excludes"/>          <patternset refid="unsafe.exclusion"/>
420        </fileset>        </fileset>
421        <filterchain>        <filterchain>
422          <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
423            <!--            <!--
424             # These arguments are to get rid of angle-bracketed type           # This filter gets rid of angle-bracketed type parameters
425             # parameters so that javadoc can run on the result. The           # so that javadoc can run on the result. The following
426             # following heuristic that seems to work:           # heuristic seems to work:
427             #             #
428             # For all lines not starting with space(s)-asterisk-space(s),             # For all lines not starting with space(s)-asterisk-space(s),
429             #   replace <something> with a space, where there may be more             #   replace <something> with a space, where there may be more
# Line 409  Line 431 
431             #   must not contain parens or pipes. (This may need some             #   must not contain parens or pipes. (This may need some
432             #   tweaking.)             #   tweaking.)
433             -->             -->
434    
435            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
436                          classpath="${build.ant.dir}">
437            <param name="notmatching" value="^\s+\*\s.*$"/>            <param name="notmatching" value="^\s+\*\s.*$"/>
438            <param name="pattern" value="&lt;[^|>()]+?>+"/>            <param name="pattern" value="&lt;[^|>()]+?>+"/>
439            <param name="replacement" value=" "/>            <param name="replacement" value=" "/>
440          </filterreader>          </filterreader>
441          <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
442                        classpath="${build.ant.dir}">  
443            <!--            <!--
444             # These arguments are to uncomment lines beginning with           # This filter uncomments lines beginning with "//@" so that
445             # "//@" so that javadoc can see imports that are needed           # javadoc can see imports that are needed to resolve links
446             # to resolve links but that shouldn't be in the compiled           # but that shouldn't be in the compiled code.
            # code.  
447             -->             -->
448    
449            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
450                          classpath="${build.ant.dir}">
451            <param name="matching" value="^//@.*$"/>            <param name="matching" value="^//@.*$"/>
452            <param name="pattern" value="^//@"/>            <param name="pattern" value="^//@"/>
453            <param name="replacement" value=""/>            <param name="replacement" value=""/>
# Line 431  Line 458 
458    </target>    </target>
459    
460    
461    
462    
463      <target name="filter-doccheck"
464              depends="filter-src">
465    
466        <mkdir dir="${build.filter.doccheck.dir}"/>
467    
468        <copy todir="${build.filter.doccheck.dir}">
469          <fileset dir="${build.filter.src.dir}">
470            <include name="**/*.html"/>
471          </fileset>
472        </copy>
473    
474        <property name="generic.declarations"
475                 value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
476        />
477    
478        <copy todir="${build.filter.doccheck.dir}">
479          <fileset dir="${build.filter.src.dir}">
480            <exclude name="**/*.html"/>
481          </fileset>
482          <filterchain>
483            <!--
484             # These two filters try to make the source look like
485             # something that doccheck can process. The first removes
486             # -source 1.4 assertions and the second adds in a bunch
487             # of single letter public nested marker interfaces so that
488             # the generic type parameters are recognized.
489             -->
490    
491            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
492                          classpath="${build.ant.dir}">
493              <param name="matching"    value="^\s*assert[\s ].*$"/>
494              <param name="pattern"     value="assert"/>
495              <param name="replacement" value="//assert"/>
496            </filterreader>
497    
498            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
499                          classpath="${build.ant.dir}">
500              <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
501              <param name="pattern"     value="$"/>
502              <param name="replacement" value=" ${generic.declarations}"/>
503            </filterreader>
504    
505          </filterchain>
506        </copy>
507    
508      </target>
509    
510    
511    <target name="compile-tests"    <target name="compile-tests"
512            depends="jar">            depends="jar">
513    
514      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
515    
516    <!--
517        <echo>javac ${gjc.args}</echo>
518        <echo>bootclasspath=${test.compile.bootclasspath}</echo>
519        <echo>classpath="${test.classpath}"</echo>
520    -->
521    
522      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
523            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
524              debug="${build.debug}"              debug="${build.debug}"
# Line 444  Line 527 
527             source="${build.sourcelevel}"             source="${build.sourcelevel}"
528               fork="true">               fork="true">
529    
530          <compilerarg    line="${gjc.args}"/>
531    <!--
532          <bootclasspath refid="test.compile.bootclasspath"/>
533    -->
534        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
535        <bootclasspath refid="javac.bootclasspath"/>  
536        <compilerarg line="${build.javac.args}"/>        <include name="java/**"/>
537          <include name="jsr166/**"/>
538    
539      </javac>      </javac>
540    
# Line 468  Line 556 
556                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
557                     fork="true">                     fork="true">
558    
559        <jvmarg value="${test.bootclasspath.arg}"/>        <jvmarg value="-Xbootclasspath:${test.run.bootclasspath}"/>
560    
561        <formatter type="xml"/>        <formatter type="xml"/>
562    
563        <batchtest todir="${build.reports.dir}">        <batchtest todir="${build.reports.dir}">
564          <fileset dir="${test.src.dir}">          <fileset dir="${test.src.dir}">
565            <include name="**/${testcase}Test.java"/>            <include name="java/**/${testcase}Test.java"/>
566              <include name="jsr166/**/${testcase}Test.java"/>
567          </fileset>          </fileset>
568        </batchtest>        </batchtest>
569    
# Line 486  Line 575 
575    <target name="report-tests"    <target name="report-tests"
576            depends="run-tests">            depends="run-tests">
577    
578      <!-- Sets junit.report.format to frames if Xalan is present,      <!-- Sets junit.report.format to frames if redirection is present,
579           otherwise sets it to noframes. -->           otherwise sets it to noframes. -->
580      <available property="junit.report.format"      <available property="junit.report.format"
581                    value="frames"                    value="frames"
# Line 509  Line 598 
598    </target>    </target>
599    
600    
601    <target name="check-junit">    <target name="configure-compiler">
602    
603        <property name="gjc.version"
604                 value="2.2"/>
605    
606        <condition property="novariance.arg" value="-novariance">
607          <and>
608            <equals arg1="${gjc.version}" arg2="2.0"/>
609            <or>
610              <not><isset property="gjc.novariance"/></not>
611              <istrue value="${gjc.novariance}"/>
612            </or>
613          </and>
614        </condition>
615    
616        <property name="novariance.arg"
617                 value=""/>
618    
619        <property name="gjc.dir"
620                 value="${lib.dir}/gjc"/>
621    
622        <property name="javac.jar"
623              location="${gjc.dir}/${gjc.version}/javac.jar"/>
624    
625        <property name="collect.jar"
626              location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
627    
628    <!--
629        <property name="unchecked.option" value="-warnunchecked"/>
630    -->
631    
632        <property name="unchecked.option" value="-Xlint:unchecked"/>
633    
634        <condition property="warnunchecked.arg" value="${unchecked.option}">
635          <istrue value="${gjc.warnunchecked}"/>
636        </condition>
637    
638        <property name="warnunchecked.arg" value=""/>
639    
640        <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
641          <istrue value="${build.nothreads}"/>
642        </condition>
643    
644    
645        <!--
646         ! Bootclasspath munging for source compilation.
647         -->
648    
649        <path id="pre.bootclasspath">
650    <!--
651          <pathelement location="${javac.jar}"/>
652    -->
653        </path>
654    
655        <path id="compile.bootclasspath">
656          <pathelement location="${build.classes.dir}"/>
657    <!--
658          <pathelement location="${collect.jar}"/>
659    -->
660          <pathelement location="${rt.jar}"/>
661        </path>
662    
663        <!-- Flatten paths into platform-appropriate strings -->
664        <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
665        <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
666    
667    
668        <!-- Common options in javac invocations -->
669    <!--
670        <property name="gjc.args"
671                 value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
672        />
673    -->
674        <property name="gjc.args" value="${warnunchecked.arg} ${novariance.arg}"/>
675    
676      </target>
677    
678    
679      <target name="prepare-src"
680              depends="configure-compiler"
681              if="prepare.src.dir">
682    
683        <mkdir dir="${prepare.src.dir}"/>
684        <copy todir="${prepare.src.dir}">
685          <fileset dir="${src.dir}">
686            <exclude name="java/lang/**"/>
687          </fileset>
688        </copy>
689    
690      </target>
691    
692    
693      <target name="configure-emulation">
694    
695        <condition property="build.emulation.true">
696          <istrue value="${build.emulation}"/>
697        </condition>
698    
699      </target>
700    
701    
702      <target name="configure-tests"
703           depends="configure-compiler">
704    
705      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
706      <available property="junit.available"      <available property="junit.available"
# Line 518  Line 709 
709      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
710            unless="junit.available"/>            unless="junit.available"/>
711    
712    </target>      <!-- Xalan -->
713        <available property="xalan.available"
714                   classname="org.apache.xalan.Version"/>
715    
716        <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
717              unless="xalan.available"/>
718    
719    
720        <!--
721         ! Bootclasspath munging for testing, so JUnit can test our local
722         ! modifications to java.*.
723         -->
724    
725        <path id="test.classpath">
726          <pathelement location="${product.jar}"/>
727          <pathelement location="${rt.jar}"/>
728          <pathelement location="${build.testcases.dir}"/>
729          <pathelement location="${junit.jar}"/>
730        </path>
731    
732        <path id="test.compile.bootclasspath">
733          <pathelement location="${javac.jar}"/>
734          <pathelement location="${collect.jar}"/>
735          <pathelement location="${rt.jar}"/>
736        </path>
737    
738        <path id="test.run.bootclasspath">
739    <!--
740          <pathelement location="${javac.jar}"/>
741    -->
742          <path refid="test.classpath"/>
743        </path>
744    
745        <!-- Flatten test classpaths into platform-appropriate strings -->
746        <property name="test.classpath"             refid="test.classpath"/>
747        <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
748        <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
749    
   <target name="check-emulation">  
     <condition property="build.emulation.true">  
       <or>  
         <isset property="build.emulation"/>  
         <os family="windows"/>  
       </or>  
     </condition>  
750    </target>    </target>
751    
752    
753    
754    <!-- Anthill targets -->    <!-- Anthill targets -->
755    
756    <target name="anthill-build"    <target name="anthill-build">
757    
758        <!-- Override this in user.properties -->
759        <property name="tiger.home" location="e:/j2sdk1.5.0"/>
760    
761        <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
762          <arg value="-Xmx256000000"/>
763          <!-- classpath of new JVM -->
764          <arg value="-classpath"/> <arg path="${java.class.path}"/>
765          <!-- location of Ant home directory -->
766          <arg value="-Dant.home=${ant.home}"/>
767          <!-- the Ant main class -->
768          <arg value="org.apache.tools.ant.Main"/>
769          <!-- The build file -->
770          <arg value="-buildfile"/>  <arg value="build.xml"/>
771          <!-- the target to build on the new Ant instance -->
772          <arg value="-DJAVA_HOME=${tiger.home}"/>
773          <arg value="do-anthill-build"/>
774        </exec>
775      </target>
776    
777      <target name="do-anthill-build"
778            depends="jar, test, docs, dist-docs"/>            depends="jar, test, docs, dist-docs"/>
779    
780    <target name="anthill-publish">    <target name="anthill-publish">
# Line 557  Line 797 
797    </target>    </target>
798    
799    
800      <target name="ng" depends="test">
801        <java classname="SuperfluousAbstract" fork="true">
802    
803          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
804    
805        </java>
806      </target>
807    
808    
809  </project>  </project>

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.56

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8