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

Diff of /jsr166/build.xml

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

revision 1.30 by tim, Wed May 28 14:19:25 2003 UTC revision 1.47 by tim, Fri Aug 1 19:34:05 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    
61    
62    
63    <!--    <!-- Files excluded from dist-docs and emulation jar -->
64     ! Bootclasspath munging for source compilation.    <patternset id="unsafe.exclusion">
    -->  
   
   <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      </patternset>
76    
77    
78    
79    <!-- Main targets -->    <!-- Main targets -->
80    
81    <target name="compile"    <target name="compile"
82            depends="init"            depends="init, configure-compiler, prepare-src"
83            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
84    
85        <property name="prepare.src.dir" value="${src.dir}"/>
86    
87      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
88    
89      <javac srcdir="${src.dir}"  <!--
90        <echo>javac ${gjc.args}</echo>
91        <echo>bootclasspath=${compile.bootclasspath}</echo>
92    -->
93    
94        <javac srcdir="${prepare.src.dir}"
95            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
96              debug="${build.debug}"              debug="${build.debug}"
97         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 127  Line 99 
99             source="${build.sourcelevel}"             source="${build.sourcelevel}"
100               fork="true">               fork="true">
101    
102        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
103        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="compile.bootclasspath"/>
104    
105      </javac>      </javac>
106    
# Line 136  Line 108 
108    
109    
110    <target name="jar"    <target name="jar"
111            depends="check-emulation, init-jar, native-jar, emulation-jar"            depends="configure-emulation, init-jar, native-jar, emulation-jar"
112            description="Builds library jar from compiled sources"/>            description="Builds library jar from compiled sources"/>
113    
114    
115    <target name="test"    <target name="test"
116            depends="init, check-junit, report-tests"            depends="init, configure-tests, report-tests"
117            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)" />
118    
119    
# Line 161  Line 133 
133    
134    
135    <target name="doccheck"    <target name="doccheck"
136            depends="filter-src"            depends="filter-doccheck"
137            description="Reports on javadoc style errors (not working yet)">            description="Reports on javadoc style errors">
138    
139      <delete dir="${build.doccheck.dir}"/>      <delete dir="${build.doccheck.dir}"/>
140      <mkdir dir="${build.doccheck.dir}"/>      <mkdir dir="${build.doccheck.dir}"/>
# Line 170  Line 142 
142      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
143           docletpath="${lib.dir}/doccheck.jar"           docletpath="${lib.dir}/doccheck.jar"
144              destdir="${build.doccheck.dir}">              destdir="${build.doccheck.dir}">
145        <packageset dir="${build.filter.src.dir}"/>        <packageset dir="${build.filter.doccheck.dir}"/>
146      </javadoc>      </javadoc>
147    
148    </target>    </target>
# Line 200  Line 172 
172    </target>    </target>
173    
174    
   <!--  
    # 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.  
    -->  
175    <target name="strip"    <target name="strip"
176            depends="init">            depends="init, configure-compiler"
177              description="Strip generics from java source (not working yet)">
178    
179      <mkdir dir="${build.stripped.dir}"/>      <mkdir dir="${build.stripped.dir}"/>
180    
181        <!--
182         # javac -s doesn't reliably generate compilable code. It generates
183         # bridge methods (marked as "synthetic") that can have identical
184         # signatures to existing methods except for the return value.
185         -->
186      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
187            destdir="${build.stripped.dir}"            destdir="${build.stripped.dir}"
188              debug="${build.debug}"              debug="${build.debug}"
# Line 218  Line 191 
191             source="${build.sourcelevel}"             source="${build.sourcelevel}"
192               fork="true">               fork="true">
193    
194        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args} -s"/>
195        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>        <bootclasspath refid="compile.bootclasspath"/>
196    
197      </javac>      </javac>
198    
# Line 230  Line 203 
203            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
204            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
205    
206      <target name="release"
207              depends="dist"
208              description="Puts entire CVS tree, plus distribution productions, in a jar">
209    
210    <!--
211        #keep build dir? - dl
212        <delete dir="${build.dir}"/>
213    -->
214        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
215    
216        <jar basedir="${basedir}" destfile="${release.jar}">
217          <exclude name="${release.jar}"/>
218          <exclude name="user.properties"/>
219          <exclude name="etc/notes/**"/>
220          <exclude name="lib/gjc/2.1/**"/>
221          <exclude name="**/SyntaxTest.java"/>
222        </jar>
223    
224      </target>
225    
226    <target name="clean"    <target name="clean"
227            description="Removes all build products">            description="Removes all build products">
# Line 271  Line 263 
263    
264    <!-- Internal targets -->    <!-- Internal targets -->
265    
   <target name="set-warnings-if" if="build.warnings">  
   
     <property name="build.warnings.option" value="-warnunchecked"/>  
   
   </target>  
   
   
   <target name="set-warnings-unless" unless="build.warnings">  
   
     <property name="build.warnings.option" value=""/>  
   
   </target>  
   
266    
267    <target name="init"    <target name="init">
           depends="set-warnings-if, set-warnings-unless">  
268    
269      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
270      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
# Line 314  Line 292 
292    
293    
294    <target name="compile-emulation"    <target name="compile-emulation"
295            depends="init"            depends="init, configure-compiler"
296            if="build.emulation.true">            if="build.emulation.true">
297    
298      <mkdir dir="${build.emulation.dir}"/>      <mkdir dir="${build.emulation.dir}"/>
# Line 327  Line 305 
305             source="${build.sourcelevel}"             source="${build.sourcelevel}"
306               fork="true">               fork="true">
307    
308        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
309        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="compile.bootclasspath"/>
310    
311      </javac>      </javac>
312    
# Line 342  Line 320 
320    
321      <jar destfile="${product.jar}" duplicate="add">      <jar destfile="${product.jar}" duplicate="add">
322        <fileset dir="${build.classes.dir}">        <fileset dir="${build.classes.dir}">
323          <patternset refid="emulation.excludes"/>          <patternset refid="atomic.exclusion"/>
324            <patternset refid="unsafe.exclusion"/>
325        </fileset>        </fileset>
326        <fileset dir="${build.emulation.dir}"/>        <fileset dir="${build.emulation.dir}"/>
327      </jar>      </jar>
# Line 378  Line 357 
357    
358      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
359        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
360          <patternset refid="emulation.excludes"/>          <include name="**/*.html"/>
361          </fileset>
362        </copy>
363    
364        <copy todir="${build.filter.src.dir}">
365          <fileset dir="${src.dir}">
366            <exclude name="**/*.html"/>
367            <patternset refid="unsafe.exclusion"/>
368        </fileset>        </fileset>
369        <filterchain>        <filterchain>
370    
371            <!--
372             # This filter gets rid of angle-bracketed type parameters
373             # so that javadoc can run on the result. The following
374             # heuristic seems to work:
375             #
376             # For all lines not starting with space(s)-asterisk-space(s),
377             #   replace <something> with a space, where there may be more
378             #   than one right angle bracket at the end, and "something"
379             #   must not contain parens or pipes. (This may need some
380             #   tweaking.)
381             -->
382    
383          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
384                        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.)  
            -->  
385            <param name="notmatching" value="^\s+\*\s.*$"/>            <param name="notmatching" value="^\s+\*\s.*$"/>
386            <param name="pattern" value="&lt;[^|>()]+?>+"/>            <param name="pattern"     value="&lt;[^|>()]+?>+"/>
387            <param name="replacement" value=" "/>            <param name="replacement" value=" "/>
388          </filterreader>          </filterreader>
389    
390    
391            <!--
392             # This filter uncomments lines beginning with "//@" so that
393             # javadoc can see imports that are needed to resolve links
394             # but that shouldn't be in the compiled code.
395             -->
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="^//@.*$"/>
400             # 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="^//@"/>  
401            <param name="replacement" value=""/>            <param name="replacement" value=""/>
402          </filterreader>          </filterreader>
403        </filterchain>        </filterchain>
# Line 416  Line 406 
406    </target>    </target>
407    
408    
409    
410    
411      <target name="filter-doccheck"
412              depends="filter-src">
413    
414        <mkdir dir="${build.filter.doccheck.dir}"/>
415    
416        <copy todir="${build.filter.doccheck.dir}">
417          <fileset dir="${build.filter.src.dir}">
418            <include name="**/*.html"/>
419          </fileset>
420        </copy>
421    
422        <property name="generic.declarations"
423                 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 {}"
424        />
425    
426        <copy todir="${build.filter.doccheck.dir}">
427          <fileset dir="${build.filter.src.dir}">
428            <exclude name="**/*.html"/>
429          </fileset>
430          <filterchain>
431            <!--
432             # These two filters try to make the source look like
433             # something that doccheck can process. The first removes
434             # -source 1.4 assertions and the second adds in a bunch
435             # of single letter public nested marker interfaces so that
436             # the generic type parameters are recognized.
437             -->
438    
439            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
440                          classpath="${build.ant.dir}">
441              <param name="matching"    value="^\s*assert[\s ].*$"/>
442              <param name="pattern"     value="assert"/>
443              <param name="replacement" value="//assert"/>
444            </filterreader>
445    
446            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
447                          classpath="${build.ant.dir}">
448              <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
449              <param name="pattern"     value="$"/>
450              <param name="replacement" value=" ${generic.declarations}"/>
451            </filterreader>
452    
453          </filterchain>
454        </copy>
455    
456      </target>
457    
458    
459    <target name="compile-tests"    <target name="compile-tests"
460            depends="jar">            depends="jar">
461    
462      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
463    
464    <!--
465        <echo>javac ${gjc.args}</echo>
466        <echo>bootclasspath=${test.compile.bootclasspath}</echo>
467        <echo>classpath="${test.classpath}"</echo>
468    -->
469    
470      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
471            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
472              debug="${build.debug}"              debug="${build.debug}"
# Line 429  Line 475 
475             source="${build.sourcelevel}"             source="${build.sourcelevel}"
476               fork="true">               fork="true">
477    
478        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
479        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="test.compile.bootclasspath"/>
480        <classpath refid="test.classpath"/>        <classpath     refid="test.classpath"/>
481    
482      </javac>      </javac>
483    
# Line 453  Line 499 
499                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
500                     fork="true">                     fork="true">
501    
502        <jvmarg value="${test.javac.args}"/>        <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
503    
504        <formatter type="xml"/>        <formatter type="xml"/>
505    
# Line 494  Line 540 
540    </target>    </target>
541    
542    
543    <target name="check-junit">    <target name="configure-compiler">
544    
545      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->      <property name="gjc.version"
546      <available property="junit.available"               value="2.2"/>
547                 classname="junit.framework.Protectable"/>  
548        <condition property="novariance.arg" value="-novariance">
549          <and>
550            <equals arg1="${gjc.version}" arg2="2.0"/>
551            <or>
552              <not><isset property="gjc.novariance"/></not>
553              <istrue value="${gjc.novariance}"/>
554            </or>
555          </and>
556        </condition>
557    
558        <property name="novariance.arg"
559                 value=""/>
560    
561        <property name="gjc.dir"
562                 value="${lib.dir}/gjc"/>
563    
564        <property name="javac.jar"
565              location="${gjc.dir}/${gjc.version}/javac.jar"/>
566    
567        <property name="collect.jar"
568              location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
569    
570    
571        <condition property="warnunchecked.arg" value="-warnunchecked">
572          <istrue value="${gjc.warnunchecked}"/>
573        </condition>
574    
575        <property name="warnunchecked.arg" value=""/>
576    
577        <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
578          <istrue value="${build.nothreads}"/>
579        </condition>
580    
581      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"  
582            unless="junit.available"/>      <!--
583         ! Bootclasspath munging for source compilation.
584         -->
585    
586        <path id="pre.bootclasspath">
587          <pathelement location="${javac.jar}"/>
588        </path>
589    
590        <path id="compile.bootclasspath">
591          <pathelement location="${build.classes.dir}"/>
592          <pathelement location="${collect.jar}"/>
593          <pathelement location="${rt.jar}"/>
594        </path>
595    
596        <!-- Flatten paths into platform-appropriate strings -->
597        <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
598        <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
599    
600    
601        <!-- Common options in javac invocations -->
602        <property name="gjc.args"
603                 value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
604        />
605    
606    </target>    </target>
607    
608    
609    <target name="check-emulation">    <target name="prepare-src"
610              depends="configure-compiler"
611              if="prepare.src.dir">
612    
613        <mkdir dir="${prepare.src.dir}"/>
614        <copy todir="${prepare.src.dir}">
615          <fileset dir="${src.dir}">
616            <exclude name="java/lang/**"/>
617          </fileset>
618        </copy>
619    
620      </target>
621    
622    
623      <target name="configure-emulation">
624    
625      <condition property="build.emulation.true">      <condition property="build.emulation.true">
626        <or>        <or>
627          <isset property="build.emulation"/>          <and>
628          <os family="windows"/>            <os family="windows"/>
629              <not>
630                <isset property="build.emulation"/>
631              </not>
632            </and>
633            <istrue value="${build.emulation}"/>
634        </or>        </or>
635      </condition>      </condition>
636    
637      </target>
638    
639    
640      <target name="configure-tests"
641           depends="configure-compiler">
642    
643        <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
644        <available property="junit.available"
645                   classname="junit.framework.Protectable"/>
646    
647        <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
648              unless="junit.available"/>
649    
650    
651        <!--
652         ! Bootclasspath munging for testing, so JUnit can test our local
653         ! modifications to java.*.
654         -->
655    
656        <path id="test.classpath">
657          <pathelement location="${product.jar}"/>
658          <pathelement location="${build.testcases.dir}"/>
659          <pathelement location="${junit.jar}"/>
660        </path>
661    
662        <path id="test.compile.bootclasspath">
663          <pathelement location="${javac.jar}"/>
664          <pathelement location="${collect.jar}"/>
665          <pathelement location="${rt.jar}"/>
666        </path>
667    
668        <path id="test.run.bootclasspath">
669          <pathelement location="${javac.jar}"/>
670          <path refid="test.classpath"/>
671        </path>
672    
673        <!-- Flatten test classpaths into platform-appropriate strings -->
674        <property name="test.classpath"             refid="test.classpath"/>
675        <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
676        <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
677    
678    </target>    </target>
679    
680    
# Line 542  Line 704 
704    </target>    </target>
705    
706    
707      <target name="ng" depends="test">
708        <java classname="SuperfluousAbstract" fork="true">
709    
710          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
711    
712        </java>
713      </target>
714    
715    
716  </project>  </project>

Legend:
Removed from v.1.30  
changed lines
  Added in v.1.47

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