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

Diff of /jsr166/build.xml

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

revision 1.29 by tim, Wed May 28 14:09:03 2003 UTC revision 1.51 by tim, Thu Aug 7 03:49:48 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 39  Line 39 
39    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.reports.dir"    location="${build.dir}/reports"/>
40    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
42      <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
43    
44    <!-- Source locations -->    <!-- Source locations -->
45    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 54  Line 55 
55    
56    <!-- Jar locations -->    <!-- Jar locations -->
57    <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"/>  
58    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
59    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
60      <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
61    
62    
63      <!-- Files excluded from dist-docs and emulation jar -->
64    <!--    <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="javac.args" 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.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>  
   
   
   
   <!-- Files excluded from emulation and dist-docs -->  
   <patternset id="emulation.excludes">  
65      <exclude name="java/util/Random.*"/>      <exclude name="java/util/Random.*"/>
66      <exclude name="sun/misc/Unsafe.*"/>      <exclude name="sun/misc/Unsafe.*"/>
67    </patternset>    </patternset>
68    
69      <!-- Files excludes from emulation jar -->
70      <patternset id="atomic.exclusion">
71        <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
72        <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
73        <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
74        <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
75        <exclude name="java/util/concurrent/locks/LockSupport*"/>
76        <exclude name="java/util/concurrent/locks/ReentrantLock*"/>
77      </patternset>
78    
79    
80    
81    <!-- Main targets -->    <!-- Main targets -->
82    
83    <target name="compile"    <target name="compile"
84            depends="init"            depends="init, configure-compiler, prepare-src"
85            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
86    
87        <property name="prepare.src.dir" value="${src.dir}"/>
88    
89      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
90    
91      <javac srcdir="${src.dir}"  <!--
92        <echo>javac ${gjc.args}</echo>
93        <echo>bootclasspath=${compile.bootclasspath}</echo>
94    -->
95    
96        <javac srcdir="${prepare.src.dir}"
97            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
98              debug="${build.debug}"              debug="${build.debug}"
99         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 127  Line 101 
101             source="${build.sourcelevel}"             source="${build.sourcelevel}"
102               fork="true">               fork="true">
103    
104        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
105        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="compile.bootclasspath"/>
106    
107      </javac>      </javac>
108    
# Line 136  Line 110 
110    
111    
112    <target name="jar"    <target name="jar"
113            depends="native-jar, emulation-jar"            depends="configure-emulation, init-jar, native-jar, emulation-jar"
114            description="Builds library jar from compiled sources"/>            description="Builds library jar from compiled sources"/>
115    
116    
117    <target name="test"    <target name="test"
118            depends="init, check-junit, report-tests"            depends="init, configure-tests, report-tests"
119            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)" />
120    
121    
# Line 161  Line 135 
135    
136    
137    <target name="doccheck"    <target name="doccheck"
138            depends="filter-src"            depends="filter-doccheck"
139            description="Reports on javadoc style errors (not working yet)">            description="Reports on javadoc style errors">
140    
141      <delete dir="${build.doccheck.dir}"/>      <delete dir="${build.doccheck.dir}"/>
142      <mkdir dir="${build.doccheck.dir}"/>      <mkdir dir="${build.doccheck.dir}"/>
# Line 170  Line 144 
144      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
145           docletpath="${lib.dir}/doccheck.jar"           docletpath="${lib.dir}/doccheck.jar"
146              destdir="${build.doccheck.dir}">              destdir="${build.doccheck.dir}">
147        <packageset dir="${build.filter.src.dir}"/>        <packageset dir="${build.filter.doccheck.dir}"/>
148      </javadoc>      </javadoc>
149    
150        <echo>DocCheck output is in ${build.doccheck.dir}</echo>
151    
152    </target>    </target>
153    
154    
# Line 200  Line 176 
176    </target>    </target>
177    
178    
179    <!--    <target name="sinjdocs"
180     # javac -s doesn't reliably generate compilable code. It generates            depends="configure-tests"
181     # bridge methods (marked as "synthetic") that can have identical            description="Builds javadocs with custom tags to build folder">
182     # signatures to existing methods except for the return value.  
183     -->      <delete dir="${build.javadocs.dir}"/>
184        <mkdir dir="${build.javadocs.dir}"/>
185    
186        <java classname="net.cscott.sinjdoc.Main" fork="true">
187    
188          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
189    
190          <classpath>
191            <pathelement location="${sinjdoc.jar}"/>
192            <pathelement location="${lib.dir}/jutil.jar"/>
193            <pathelement location="${lib.dir}/cup.jar"/>
194            <path refid="test.classpath"/>
195          </classpath>
196    
197    
198          <arg value="-d"/>          <arg value="${build.javadocs.dir}"/>
199          <arg value="-sourcepath"/> <arg value="${src.dir}"/>
200          <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
201          <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
202          <!-- <arg value="-verbose"/> -->
203          <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
204          <arg value="java.lang"/>
205          <arg value="java.util"/>
206          <arg value="java.util.concurrent"/>
207          <arg value="java.util.concurrent.atomic"/>
208          <arg value="java.util.concurrent.locks"/>
209    
210          <!--
211          <arg value="-help"/>
212          -->
213    
214        </java>
215    
216      </target>
217    
218    
219    <target name="strip"    <target name="strip"
220            depends="init">            depends="init, configure-compiler"
221              description="Strip generics from java source (not working yet)">
222    
223      <mkdir dir="${build.stripped.dir}"/>      <mkdir dir="${build.stripped.dir}"/>
224    
225        <!--
226         # javac -s doesn't reliably generate compilable code. It generates
227         # bridge methods (marked as "synthetic") that can have identical
228         # signatures to existing methods except for the return value.
229         -->
230      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
231            destdir="${build.stripped.dir}"            destdir="${build.stripped.dir}"
232              debug="${build.debug}"              debug="${build.debug}"
# Line 218  Line 235 
235             source="${build.sourcelevel}"             source="${build.sourcelevel}"
236               fork="true">               fork="true">
237    
238        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args} -s"/>
239        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>        <bootclasspath refid="compile.bootclasspath"/>
240    
241      </javac>      </javac>
242    
# Line 230  Line 247 
247            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
248            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
249    
250      <target name="release"
251              depends="dist"
252              description="Puts entire CVS tree, plus distribution productions, in a jar">
253    
254    <!--
255        #keep build dir? - dl
256        <delete dir="${build.dir}"/>
257    -->
258        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
259    
260        <jar basedir="${basedir}" destfile="${release.jar}">
261          <exclude name="${release.jar}"/>
262          <exclude name="user.properties"/>
263          <exclude name="etc/notes/**"/>
264          <exclude name="lib/gjc/2.1/**"/>
265          <exclude name="**/SyntaxTest.java"/>
266        </jar>
267    
268      </target>
269    
270    <target name="clean"    <target name="clean"
271            description="Removes all build products">            description="Removes all build products">
# Line 271  Line 307 
307    
308    <!-- Internal targets -->    <!-- Internal targets -->
309    
   <target name="set-warnings-if" if="build.warnings">  
310    
311      <property name="build.warnings.option" value="-warnunchecked"/>    <target name="init">
   
   </target>  
   
   
   <target name="set-warnings-unless" unless="build.warnings">  
   
     <property name="build.warnings.option" value=""/>  
   
   </target>  
   
   
   <target name="init"  
           depends="set-warnings-if, set-warnings-unless">  
312    
313      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
314      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
# Line 303  Line 325 
325    
326    
327    <target name="native-jar"    <target name="native-jar"
328            depends="compile, init-jar"            depends="compile"
329            unless="build.emulation">            unless="build.emulation.true">
330    
331      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
332        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
# Line 313  Line 335 
335    </target>    </target>
336    
337    
   <target name="base-jar"  
           depends="compile, init-jar">  
   
   </target>  
   
   
338    <target name="compile-emulation"    <target name="compile-emulation"
339            depends="init"            depends="init, configure-compiler"
340            if="build.emulation">            if="build.emulation.true">
341    
342      <mkdir dir="${build.emulation.dir}"/>      <mkdir dir="${build.emulation.dir}"/>
343    
# Line 333  Line 349 
349             source="${build.sourcelevel}"             source="${build.sourcelevel}"
350               fork="true">               fork="true">
351    
352        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
353        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="compile.bootclasspath"/>
354    
355      </javac>      </javac>
356    
# Line 342  Line 358 
358    
359    
360    <target name="emulation-jar"    <target name="emulation-jar"
361            depends="init-jar, compile-emulation"            depends="compile-emulation"
362            if="build.emulation">            if="build.emulation.true">
363    
364    
365      <jar destfile="${product.jar}" duplicate="add">      <jar destfile="${product.jar}" duplicate="add">
366        <fileset dir="${build.classes.dir}">        <fileset dir="${build.classes.dir}">
367          <patternset refid="emulation.excludes"/>          <patternset refid="atomic.exclusion"/>
368            <patternset refid="unsafe.exclusion"/>
369        </fileset>        </fileset>
370        <fileset dir="${build.emulation.dir}"/>        <fileset dir="${build.emulation.dir}"/>
371      </jar>      </jar>
# Line 384  Line 401 
401    
402      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
403        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
404          <patternset refid="emulation.excludes"/>          <include name="**/*.html"/>
405          </fileset>
406        </copy>
407    
408        <copy todir="${build.filter.src.dir}">
409          <fileset dir="${src.dir}">
410            <exclude name="**/*.html"/>
411            <patternset refid="unsafe.exclusion"/>
412        </fileset>        </fileset>
413        <filterchain>        <filterchain>
414    
415            <!--
416             # This filter gets rid of angle-bracketed type parameters
417             # so that javadoc can run on the result. The following
418             # heuristic seems to work:
419             #
420             # For all lines not starting with space(s)-asterisk-space(s),
421             #   replace <something> with a space, where there may be more
422             #   than one right angle bracket at the end, and "something"
423             #   must not contain parens or pipes. (This may need some
424             #   tweaking.)
425             -->
426    
427          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
428                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
           <!--  
            # These arguments are to get rid of angle-bracketed type  
            # parameters so that javadoc can run on the result. The  
            # following heuristic that seems to work:  
            #  
            # For all lines not starting with space(s)-asterisk-space(s),  
            #   replace <something> with a space, where there may be more  
            #   than one right angle bracket at the end, and "something"  
            #   must not contain parens or pipes. (This may need some  
            #   tweaking.)  
            -->  
429            <param name="notmatching" value="^\s+\*\s.*$"/>            <param name="notmatching" value="^\s+\*\s.*$"/>
430            <param name="pattern" value="&lt;[^|>()]+?>+"/>            <param name="pattern"     value="&lt;[^|>()]+?>+"/>
431            <param name="replacement" value=" "/>            <param name="replacement" value=" "/>
432          </filterreader>          </filterreader>
433    
434    
435            <!--
436             # This filter uncomments lines beginning with "//@" so that
437             # javadoc can see imports that are needed to resolve links
438             # but that shouldn't be in the compiled code.
439             -->
440    
441          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
442                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
443            <!--            <param name="matching"    value="^//@.*$"/>
444             # These arguments are to uncomment lines beginning with            <param name="pattern"     value="^//@"/>
            # "//@" so that javadoc can see imports that are needed  
            # to resolve links but that shouldn't be in the compiled  
            # code.  
            -->  
           <param name="matching" value="^//@.*$"/>  
           <param name="pattern" value="^//@"/>  
445            <param name="replacement" value=""/>            <param name="replacement" value=""/>
446          </filterreader>          </filterreader>
447        </filterchain>        </filterchain>
# Line 422  Line 450 
450    </target>    </target>
451    
452    
453    
454    
455      <target name="filter-doccheck"
456              depends="filter-src">
457    
458        <mkdir dir="${build.filter.doccheck.dir}"/>
459    
460        <copy todir="${build.filter.doccheck.dir}">
461          <fileset dir="${build.filter.src.dir}">
462            <include name="**/*.html"/>
463          </fileset>
464        </copy>
465    
466        <property name="generic.declarations"
467                 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 {}"
468        />
469    
470        <copy todir="${build.filter.doccheck.dir}">
471          <fileset dir="${build.filter.src.dir}">
472            <exclude name="**/*.html"/>
473          </fileset>
474          <filterchain>
475            <!--
476             # These two filters try to make the source look like
477             # something that doccheck can process. The first removes
478             # -source 1.4 assertions and the second adds in a bunch
479             # of single letter public nested marker interfaces so that
480             # the generic type parameters are recognized.
481             -->
482    
483            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
484                          classpath="${build.ant.dir}">
485              <param name="matching"    value="^\s*assert[\s ].*$"/>
486              <param name="pattern"     value="assert"/>
487              <param name="replacement" value="//assert"/>
488            </filterreader>
489    
490            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
491                          classpath="${build.ant.dir}">
492              <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
493              <param name="pattern"     value="$"/>
494              <param name="replacement" value=" ${generic.declarations}"/>
495            </filterreader>
496    
497          </filterchain>
498        </copy>
499    
500      </target>
501    
502    
503    <target name="compile-tests"    <target name="compile-tests"
504            depends="jar">            depends="jar">
505    
506      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
507    
508    <!--
509        <echo>javac ${gjc.args}</echo>
510        <echo>bootclasspath=${test.compile.bootclasspath}</echo>
511        <echo>classpath="${test.classpath}"</echo>
512    -->
513    
514      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
515            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
516              debug="${build.debug}"              debug="${build.debug}"
# Line 435  Line 519 
519             source="${build.sourcelevel}"             source="${build.sourcelevel}"
520               fork="true">               fork="true">
521    
522        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
523        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="test.compile.bootclasspath"/>
524        <classpath refid="test.classpath"/>        <classpath     refid="test.classpath"/>
525    
526      </javac>      </javac>
527    
# Line 459  Line 543 
543                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
544                     fork="true">                     fork="true">
545    
546        <jvmarg value="${test.javac.args}"/>        <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
547    
548        <formatter type="xml"/>        <formatter type="xml"/>
549    
# Line 500  Line 584 
584    </target>    </target>
585    
586    
587    <target name="check-junit">    <target name="configure-compiler">
588    
589        <property name="gjc.version"
590                 value="2.2"/>
591    
592        <condition property="novariance.arg" value="-novariance">
593          <and>
594            <equals arg1="${gjc.version}" arg2="2.0"/>
595            <or>
596              <not><isset property="gjc.novariance"/></not>
597              <istrue value="${gjc.novariance}"/>
598            </or>
599          </and>
600        </condition>
601    
602        <property name="novariance.arg"
603                 value=""/>
604    
605        <property name="gjc.dir"
606                 value="${lib.dir}/gjc"/>
607    
608        <property name="javac.jar"
609              location="${gjc.dir}/${gjc.version}/javac.jar"/>
610    
611        <property name="collect.jar"
612              location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
613    
614    
615        <condition property="warnunchecked.arg" value="-warnunchecked">
616          <istrue value="${gjc.warnunchecked}"/>
617        </condition>
618    
619        <property name="warnunchecked.arg" value=""/>
620    
621        <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
622          <istrue value="${build.nothreads}"/>
623        </condition>
624    
625    
626        <!--
627         ! Bootclasspath munging for source compilation.
628         -->
629    
630        <path id="pre.bootclasspath">
631          <pathelement location="${javac.jar}"/>
632        </path>
633    
634        <path id="compile.bootclasspath">
635          <pathelement location="${build.classes.dir}"/>
636          <pathelement location="${collect.jar}"/>
637          <pathelement location="${rt.jar}"/>
638        </path>
639    
640        <!-- Flatten paths into platform-appropriate strings -->
641        <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
642        <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
643    
644    
645        <!-- Common options in javac invocations -->
646        <property name="gjc.args"
647                 value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
648        />
649    
650      </target>
651    
652    
653      <target name="prepare-src"
654              depends="configure-compiler"
655              if="prepare.src.dir">
656    
657        <mkdir dir="${prepare.src.dir}"/>
658        <copy todir="${prepare.src.dir}">
659          <fileset dir="${src.dir}">
660            <exclude name="java/lang/**"/>
661          </fileset>
662        </copy>
663    
664      </target>
665    
666    
667      <target name="configure-emulation">
668    
669        <condition property="build.emulation.true">
670          <or>
671            <and>
672              <os family="windows"/>
673              <not>
674                <isset property="build.emulation"/>
675              </not>
676            </and>
677            <istrue value="${build.emulation}"/>
678          </or>
679        </condition>
680    
681      </target>
682    
683    
684      <target name="configure-tests"
685           depends="configure-compiler">
686    
687      <!-- 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 -->
688      <available property="junit.available"      <available property="junit.available"
# Line 509  Line 691 
691      <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"
692            unless="junit.available"/>            unless="junit.available"/>
693    
694    
695        <!--
696         ! Bootclasspath munging for testing, so JUnit can test our local
697         ! modifications to java.*.
698         -->
699    
700        <path id="test.classpath">
701          <pathelement location="${product.jar}"/>
702          <pathelement location="${build.testcases.dir}"/>
703          <pathelement location="${junit.jar}"/>
704        </path>
705    
706        <path id="test.compile.bootclasspath">
707          <pathelement location="${javac.jar}"/>
708          <pathelement location="${collect.jar}"/>
709          <pathelement location="${rt.jar}"/>
710        </path>
711    
712        <path id="test.run.bootclasspath">
713          <pathelement location="${javac.jar}"/>
714          <path refid="test.classpath"/>
715        </path>
716    
717        <!-- Flatten test classpaths into platform-appropriate strings -->
718        <property name="test.classpath"             refid="test.classpath"/>
719        <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
720        <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
721    
722    </target>    </target>
723    
724    
# Line 538  Line 748 
748    </target>    </target>
749    
750    
751      <target name="ng" depends="test">
752        <java classname="SuperfluousAbstract" fork="true">
753    
754          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
755    
756        </java>
757      </target>
758    
759    
760  </project>  </project>

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.51

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