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

Diff of /jsr166/build.xml

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

revision 1.32 by tim, Thu May 29 04:35:42 2003 UTC revision 1.58 by tim, Mon Sep 15 15:13:35 2003 UTC
# Line 30  Line 30 
30    <!-- Build locations -->    <!-- Build locations -->
31    <property name="build.dir"            location="build"/>    <property name="build.dir"            location="build"/>
32    <property name="build.classes.dir"    location="${build.dir}/classes"/>    <property name="build.classes.dir"    location="${build.dir}/classes"/>
   <property name="build.emulation.dir"  location="${build.dir}/emulation"/>  
33    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
34    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.lib.dir"        location="${build.dir}/lib"/>
35    <property name="build.ant.dir"        location="${build.dir}/ant"/>    <property name="build.ant.dir"        location="${build.dir}/ant"/>
36    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37      <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
38    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
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.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43      <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
44    
45    <!-- Source locations -->    <!-- Source locations -->
46    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
   <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>  
47    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
48    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
49    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
# Line 56  Line 57 
57    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.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 -->
64    <!-- Files excluded from emulation and dist-docs -->    <patternset id="docs.exclusion">
   <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>
# Line 70  Line 71 
71    <!-- Main targets -->    <!-- Main targets -->
72    
73    <target name="compile"    <target name="compile"
74            depends="init, configure-compiler"            depends="init, configure-compiler, prepare-src"
75            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
76    
77        <property name="prepare.src.dir" value="${src.dir}"/>
78    
79      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
80    
81      <javac srcdir="${src.dir}"      <javac srcdir="${prepare.src.dir}"
82            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
83              debug="${build.debug}"              debug="${build.debug}"
84         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 83  Line 86 
86             source="${build.sourcelevel}"             source="${build.sourcelevel}"
87               fork="true">               fork="true">
88    
89        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg line="${build.args}"/>
       <compilerarg line="${build.javac.args}"/>  
90    
91      </javac>      </javac>
92    
# Line 92  Line 94 
94    
95    
96    <target name="jar"    <target name="jar"
97            depends="configure-emulation, init-jar, native-jar, emulation-jar"            depends="init-jar, native-jar"
98            description="Builds library jar from compiled sources"/>            description="Builds library jar from compiled sources"/>
99    
100    
# Line 106  Line 108 
108            description="Reports on style errors in Java source (verbose, mostly chaff)">            description="Reports on style errors in Java source (verbose, mostly chaff)">
109    
110      <taskdef resource="checkstyletask.properties"      <taskdef resource="checkstyletask.properties"
111              classpath="${lib.dir}/checkstyle-all-2.4.jar"/>              classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
112    
113      <checkstyle>      <mkdir dir="${build.checkstyle.dir}"/>
114        <formatter type="plain"/>  <!-- also available: type="xml" -->      
115        <checkstyle config="etc/checkstyle/sun_checks.xml"
116           failOnViolation="false">
117          <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
118        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119      </checkstyle>      </checkstyle>
120        
121        <style in="${build.checkstyle.dir}/checkstyle-report.xml"
122              out="${build.checkstyle.dir}/checkstyle-report.html"
123            style="${stylesheet.dir}/checkstyle-frames.xsl"/>
124    
125    </target>    </target>
126    
127    
128    <target name="doccheck"    <target name="doccheck"
129            depends="filter-src"            depends="filter-doccheck"
130            description="Reports on javadoc style errors (not working yet)">            description="Reports on javadoc style errors">
131    
132      <delete dir="${build.doccheck.dir}"/>      <delete dir="${build.doccheck.dir}"/>
133      <mkdir dir="${build.doccheck.dir}"/>      <mkdir dir="${build.doccheck.dir}"/>
# Line 126  Line 135 
135      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
136           docletpath="${lib.dir}/doccheck.jar"           docletpath="${lib.dir}/doccheck.jar"
137              destdir="${build.doccheck.dir}">              destdir="${build.doccheck.dir}">
138        <packageset dir="${build.filter.src.dir}"/>        <packageset dir="${build.dc-filter.dir}"/>
139      </javadoc>      </javadoc>
140    
141        <echo>DocCheck output is in ${build.doccheck.dir}</echo>
142    
143    </target>    </target>
144    
145    
# Line 146  Line 157 
157    
158        <tag name="revised" description="Last revised:"/>        <tag name="revised" description="Last revised:"/>
159        <tag name="spec"    description="Specified by:"/>        <tag name="spec"    description="Specified by:"/>
       <tag name="editor"  description="Last edited by:"/>  
       <tag name="fixme"   description="FIX ME:"/>  
160    
161        <packageset dir="${build.filter.src.dir}"/>        <packageset dir="${build.filter.src.dir}"/>
162    
# Line 156  Line 165 
165    </target>    </target>
166    
167    
168    <target name="strip"    <target name="sinjdocs"
169            depends="init, configure-compiler"            depends="configure-tests"
170            description="Strip generics from java source (not working yet)">            description="Builds javadocs with custom tags to build folder">
171    
172      <mkdir dir="${build.stripped.dir}"/>      <delete dir="${build.sinjdocs.dir}"/>
173        <mkdir dir="${build.sinjdocs.dir}"/>
174    
175      <!--      <java classname="net.cscott.sinjdoc.Main" fork="true">
      # javac -s doesn't reliably generate compilable code. It generates  
      # bridge methods (marked as "synthetic") that can have identical  
      # signatures to existing methods except for the return value.  
      -->  
     <javac srcdir="${src.dir}"  
           destdir="${build.stripped.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
176    
177        <bootclasspath refid="javac.bootclasspath"/>        <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
       <compilerarg line="${build.javac.args} -s"/>  
178    
179      </javac>        <classpath>
180            <pathelement location="${sinjdoc.jar}"/>
181            <pathelement location="${lib.dir}/jutil.jar"/>
182            <pathelement location="${lib.dir}/cup.jar"/>
183            <path refid="test.classpath"/>
184          </classpath>
185    
186          <!-- <arg value="-help"/> -->
187          <!-- <arg value="-verbose"/> -->
188          <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
189          
190          <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
191          <arg value="-sourcepath"/> <arg value="${src.dir}"/>
192          <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
193          <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
194          
195          <arg value="java.lang"/>
196          <arg value="java.util"/>
197          <arg value="java.util.concurrent"/>
198          <arg value="java.util.concurrent.atomic"/>
199          <arg value="java.util.concurrent.locks"/>
200    
201    
202        </java>
203    
204    </target>    </target>
205    
# Line 188  Line 209 
209            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
210    
211    
212      <target name="release"
213              depends="dist"
214              description="Puts entire CVS tree, plus distribution productions, in a jar">
215    
216        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
217    
218        <jar basedir="${basedir}" destfile="${release.jar}">
219          <!-- <exclude name="build/**"/> -->
220          <exclude name="${release.jar}"/>
221          <exclude name="user.properties"/>
222          <exclude name="etc/notes/**"/>
223          <exclude name="src/emulation/**"/>
224          <exclude name="**/SyntaxTest.java"/>
225          <exclude name="**/SuperfluousAbstract.java"/>
226        </jar>
227    
228      </target>
229    
230    <target name="clean"    <target name="clean"
231            description="Removes all build products">            description="Removes all build products">
232    
# Line 234  Line 273 
273      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
274      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
275      <echo>Building JSR-166 version ${version}</echo>      <echo>Building JSR-166 version ${version}</echo>
276        <echo>java.home is ${java.home}</echo>
277    
278    </target>    </target>
279    
# Line 246  Line 286 
286    
287    
288    <target name="native-jar"    <target name="native-jar"
289            depends="compile"            depends="compile">
           unless="build.emulation.true">  
290    
291      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
292        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
# Line 256  Line 295 
295    </target>    </target>
296    
297    
   <target name="compile-emulation"  
           depends="init, configure-compiler"  
           if="build.emulation.true">  
   
     <mkdir dir="${build.emulation.dir}"/>  
   
     <javac srcdir="${emulation.src.dir}"  
           destdir="${build.emulation.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <bootclasspath refid="javac.bootclasspath"/>  
       <compilerarg line="${build.javac.args}"/>  
   
     </javac>  
   
   </target>  
   
   
   <target name="emulation-jar"  
           depends="compile-emulation"  
           if="build.emulation.true">  
   
   
     <jar destfile="${product.jar}" duplicate="add">  
       <fileset dir="${build.classes.dir}">  
         <patternset refid="emulation.excludes"/>  
       </fileset>  
       <fileset dir="${build.emulation.dir}"/>  
     </jar>  
   
   </target>  
   
   
298    <target name="dist-jar"    <target name="dist-jar"
299            depends="clean, jar">            depends="clean, jar">
300    
# Line 328  Line 330 
330      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
331        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
332          <exclude name="**/*.html"/>          <exclude name="**/*.html"/>
333          <patternset refid="emulation.excludes"/>          <patternset refid="docs.exclusion"/>
334        </fileset>        </fileset>
335        <filterchain>        <filterchain>
336    
337            <!--
338             # This filter gets rid of angle-bracketed type parameters
339             # so that javadoc can run on the result. The following
340             # heuristic seems to work:
341             #
342             # For all lines not starting with space(s)-asterisk-space(s),
343             #   replace <something> with a space, where there may be more
344             #   than one right angle bracket at the end, and "something"
345             #   must not contain parens or pipes. (This may need some
346             #   tweaking.)
347             -->
348    
349          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
350                        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.)  
            -->  
351            <param name="notmatching" value="^\s+\*\s.*$"/>            <param name="notmatching" value="^\s+\*\s.*$"/>
352            <param name="pattern" value="&lt;[^|>()]+?>+"/>            <param name="pattern"     value="&lt;[^|>()]+?>+"/>
353            <param name="replacement" value=" "/>            <param name="replacement" value=" "/>
354          </filterreader>          </filterreader>
355    
356          </filterchain>
357        </copy>
358    
359      </target>
360    
361    
362      <target name="filter-doccheck"
363              depends="filter-src">
364    
365        <mkdir dir="${build.dc-filter.dir}"/>
366    
367        <copy todir="${build.dc-filter.dir}">
368          <fileset dir="${build.filter.src.dir}">
369            <include name="**/*.html"/>
370          </fileset>
371        </copy>
372    
373        <property name="generic.declarations"
374                 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 {}"
375        />
376    
377        <copy todir="${build.dc-filter.dir}">
378          <fileset dir="${build.filter.src.dir}">
379            <exclude name="**/*.html"/>
380          </fileset>
381          <filterchain>
382            <!--
383             # These two filters try to make the source look like
384             # something that doccheck can process. The first removes
385             # -source 1.4 assertions and the second adds in a bunch
386             # of single letter public nested marker interfaces so that
387             # the generic type parameters are recognized.
388             -->
389    
390            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
391                          classpath="${build.ant.dir}">
392              <param name="matching"    value="^\s*assert[\s ].*$"/>
393              <param name="pattern"     value="assert"/>
394              <param name="replacement" value="//assert"/>
395            </filterreader>
396    
397          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
398                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
399            <!--            <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
400             # These arguments are to uncomment lines beginning with            <param name="pattern"     value="$"/>
401             # "//@" so that javadoc can see imports that are needed            <param name="replacement" value=" ${generic.declarations}"/>
            # to resolve links but that shouldn't be in the compiled  
            # code.  
            -->  
           <param name="matching" value="^//@.*$"/>  
           <param name="pattern" value="^//@"/>  
           <param name="replacement" value=""/>  
402          </filterreader>          </filterreader>
403    
404        </filterchain>        </filterchain>
405      </copy>      </copy>
406    
# Line 379  Line 420 
420             source="${build.sourcelevel}"             source="${build.sourcelevel}"
421               fork="true">               fork="true">
422    
423          <compilerarg line="${build.args}"/>
424        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
425        <bootclasspath refid="javac.bootclasspath"/>        
426        <compilerarg line="${build.javac.args}"/>        <include name="java/**"/>
427          <include name="jsr166/**"/>
428    
429      </javac>      </javac>
430    
# Line 403  Line 446 
446                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
447                     fork="true">                     fork="true">
448    
449        <jvmarg value="${test.bootclasspath.arg}"/>        <jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
450    
451        <formatter type="xml"/>        <formatter type="xml"/>
452    
453        <batchtest todir="${build.reports.dir}">        <batchtest todir="${build.reports.dir}">
454          <fileset dir="${test.src.dir}">          <fileset dir="${test.src.dir}">
455            <include name="**/${testcase}Test.java"/>            <include name="java/**/${testcase}Test.java"/>
456              <include name="jsr166/**/${testcase}Test.java"/>
457          </fileset>          </fileset>
458        </batchtest>        </batchtest>
459    
# Line 421  Line 465 
465    <target name="report-tests"    <target name="report-tests"
466            depends="run-tests">            depends="run-tests">
467    
468      <!-- Sets junit.report.format to frames if Xalan is present,      <!-- Sets junit.report.format to frames if redirection is present,
469           otherwise sets it to noframes. -->           otherwise sets it to noframes. -->
470      <available property="junit.report.format"      <available property="junit.report.format"
471                    value="frames"                    value="frames"
# Line 446  Line 490 
490    
491    <target name="configure-compiler">    <target name="configure-compiler">
492    
493      <property name="gjc.version"      <property name="unchecked.option" value="-Xlint:unchecked"/>
              value="1.3"/>  
494    
495      <condition property="build.novariance" value="-novariance">      <condition property="warnunchecked.arg" value="${unchecked.option}">
496        <and>        <istrue value="${build.warnunchecked}"/>
         <equals arg1="${gjc.version}" arg2="2.0"/>  
         <or>  
           <not><isset property="gjc.novariance"/></not>  
           <istrue value="${gjc.novariance}"/>  
         </or>  
       </and>  
497      </condition>      </condition>
498    
499      <property name="build.novariance"      <property name="warnunchecked.arg" value=""/>
500               value=""/>      
501        <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
502      <property name="gjc.dir"        <istrue value="${build.nothreads}"/>
              value="${lib.dir}/gjc"/>  
   
     <property name="javac.jar"  
           location="${gjc.dir}/${gjc.version}/javac.jar"/>  
   
     <property name="collect.jar"  
           location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>  
   
   
     <condition property="build.warnunchecked" value="-warnunchecked">  
       <istrue value="${gjc.warnunchecked}"/>  
503      </condition>      </condition>
504    
     <property name="build.warnunchecked" value=""/>  
   
   
     <!--  
      ! 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}'/>  
   
     <!-- Flatten bootclasspath for trace message -->  
     <property name="javac.bootclasspath"  
              refid="javac.bootclasspath"/>  
505    
506      <!-- Common options in javac invocations -->      <!-- Common options in javac invocations -->
507      <property name="build.javac.args"      <property name="build.args" value="${warnunchecked.arg}"/>
              value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>  
   
     <echo>javac ${build.javac.args}  
 bootclasspath is ${javac.bootclasspath}</echo>  
508    
509    </target>    </target>
510    
511    
512    <target name="configure-emulation">    <target name="prepare-src"
513              depends="configure-compiler"
514              if="prepare.src.dir">
515    
516      <condition property="build.emulation.true">      <mkdir dir="${prepare.src.dir}"/>
517        <or>      <copy todir="${prepare.src.dir}">
518          <and>        <fileset dir="${src.dir}">
519            <os family="windows"/>          <exclude name="java/lang/**"/>
520            <not>        </fileset>
521              <isset property="build.emulation"/>      </copy>
           </not>  
         </and>  
         <istrue value="${build.emulation}"/>  
       </or>  
     </condition>  
522    
523    </target>    </target>
524    
525    
526    <target name="configure-tests">    <target name="configure-tests"
527           depends="configure-compiler">
528    
529      <!-- 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 -->
530      <available property="junit.available"      <available property="junit.available"
# Line 542  bootclasspath is ${javac.bootclasspath}< Line 533  bootclasspath is ${javac.bootclasspath}<
533      <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"
534            unless="junit.available"/>            unless="junit.available"/>
535    
536        <!-- Xalan -->
537        <available property="xalan.available"
538                   classname="org.apache.xalan.Version"/>
539    
540        <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
541              unless="xalan.available"/>
542    
543    
544      <!--      <!--
545       ! Bootclasspath munging for testing, so JUnit can test our local       ! Bootclasspath munging for testing, so JUnit can test our local
# Line 550  bootclasspath is ${javac.bootclasspath}< Line 548  bootclasspath is ${javac.bootclasspath}<
548    
549      <path id="test.classpath">      <path id="test.classpath">
550        <pathelement location="${product.jar}"/>        <pathelement location="${product.jar}"/>
551        <pathelement location="${build.testcases.dir}"/>        <pathelement location="${rt.jar}"/>
552        <pathelement location="${junit.jar}"/>        <pathelement location="${junit.jar}"/>
553          <pathelement location="${build.testcases.dir}"/>
554      </path>      </path>
555    
556      <!-- Flatten test classpath into a platform-appropriate string -->      <path id="test.bootclasspath">
557      <property name="test.classpath" refid="test.classpath"/>        <path refid="test.classpath"/>
558        </path>
559    
560      <!-- Turn the flattened test classpath into a javac argument -->      <!-- Flatten test classpaths into platform-appropriate strings -->
561      <property name="test.bootclasspath.arg"      <property name="test.classpath"         refid="test.classpath"/>
562               value='-Xbootclasspath/p:${test.classpath}'/>      <property name="test.bootclasspath"     refid="test.bootclasspath"/>
563    
564    </target>    </target>
565    
# Line 567  bootclasspath is ${javac.bootclasspath}< Line 567  bootclasspath is ${javac.bootclasspath}<
567    
568    <!-- Anthill targets -->    <!-- Anthill targets -->
569    
570    <target name="anthill-build"    <target name="anthill-build">
571      
572        <!-- Override this in user.properties -->
573        <property name="tiger.home" location="e:/j2sdk1.5.0"/>
574        
575        <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
576          <arg value="-Xmx256000000"/>
577          <!-- classpath of new JVM -->
578          <arg value="-classpath"/> <arg path="${java.class.path}"/>
579          <!-- location of Ant home directory -->
580          <arg value="-Dant.home=${ant.home}"/>
581          <!-- the Ant main class -->
582          <arg value="org.apache.tools.ant.Main"/>
583          <!-- The build file -->
584          <arg value="-buildfile"/>  <arg value="build.xml"/>
585          <!-- the target to build on the new Ant instance -->
586          <arg value="-DJAVA_HOME=${tiger.home}"/>
587          <arg value="do-anthill-build"/>
588        </exec>
589      </target>
590      
591      <target name="do-anthill-build"
592            depends="jar, test, docs, dist-docs"/>            depends="jar, test, docs, dist-docs"/>
593    
594    <target name="anthill-publish">    <target name="anthill-publish">
# Line 590  bootclasspath is ${javac.bootclasspath}< Line 611  bootclasspath is ${javac.bootclasspath}<
611    </target>    </target>
612    
613    
614      <target name="ng" depends="test">
615        <java classname="SuperfluousAbstract" fork="true">
616    
617          <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
618    
619        </java>
620      </target>
621    
622    
623  </project>  </project>

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.58

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