[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.30, Wed May 28 14:19:25 2003 UTC revision 1.36, Thu May 29 17:29:08 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 54  Line 54 
54    
55    <!-- Jar locations -->    <!-- Jar locations -->
56    <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"/>  
57    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59    
60    
61    
   <!--  
    ! 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}'/>  
   
   
   
62    <!-- Files excluded from emulation and dist-docs -->    <!-- Files excluded from emulation and dist-docs -->
63    <patternset id="emulation.excludes">    <patternset id="emulation.excludes">
64      <exclude name="java/util/Random.*"/>      <exclude name="java/util/Random.*"/>
# Line 114  Line 70 
70    <!-- Main targets -->    <!-- Main targets -->
71    
72    <target name="compile"    <target name="compile"
73            depends="init"            depends="init, configure-compiler, prepare-src"
74            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
75    
76        <property name="prepare.src.dir" value="${src.dir}"/>
77    
78      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
79    
80      <javac srcdir="${src.dir}"      <javac srcdir="${prepare.src.dir}"
81            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
82              debug="${build.debug}"              debug="${build.debug}"
83         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 128  Line 86 
86               fork="true">               fork="true">
87    
88        <bootclasspath refid="javac.bootclasspath"/>        <bootclasspath refid="javac.bootclasspath"/>
89        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <compilerarg line="${build.javac.args}"/>
90    
91      </javac>      </javac>
92    
# Line 136  Line 94 
94    
95    
96    <target name="jar"    <target name="jar"
97            depends="check-emulation, init-jar, native-jar, emulation-jar"            depends="configure-emulation, init-jar, native-jar, emulation-jar"
98            description="Builds library jar from compiled sources"/>            description="Builds library jar from compiled sources"/>
99    
100    
101    <target name="test"    <target name="test"
102            depends="init, check-junit, report-tests"            depends="init, configure-tests, report-tests"
103            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)" />
104    
105    
# Line 200  Line 158 
158    </target>    </target>
159    
160    
161      <target name="strip"
162              depends="init, configure-compiler"
163              description="Strip generics from java source (not working yet)">
164    
165        <mkdir dir="${build.stripped.dir}"/>
166    
167    <!--    <!--
168     # javac -s doesn't reliably generate compilable code. It generates     # javac -s doesn't reliably generate compilable code. It generates
169     # bridge methods (marked as "synthetic") that can have identical     # bridge methods (marked as "synthetic") that can have identical
170     # signatures to existing methods except for the return value.     # signatures to existing methods except for the return value.
171     -->     -->
   <target name="strip"  
           depends="init">  
   
     <mkdir dir="${build.stripped.dir}"/>  
   
172      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
173            destdir="${build.stripped.dir}"            destdir="${build.stripped.dir}"
174              debug="${build.debug}"              debug="${build.debug}"
# Line 219  Line 178 
178               fork="true">               fork="true">
179    
180        <bootclasspath refid="javac.bootclasspath"/>        <bootclasspath refid="javac.bootclasspath"/>
181        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>        <compilerarg line="${build.javac.args} -s"/>
182    
183      </javac>      </javac>
184    
# Line 271  Line 230 
230    
231    <!-- Internal targets -->    <!-- Internal targets -->
232    
   <target name="set-warnings-if" if="build.warnings">  
   
     <property name="build.warnings.option" value="-warnunchecked"/>  
233    
234    </target>    <target name="init">
   
   
   <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">  
235    
236      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
237      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
# Line 314  Line 259 
259    
260    
261    <target name="compile-emulation"    <target name="compile-emulation"
262            depends="init"            depends="init, configure-compiler"
263            if="build.emulation.true">            if="build.emulation.true">
264    
265      <mkdir dir="${build.emulation.dir}"/>      <mkdir dir="${build.emulation.dir}"/>
# Line 328  Line 273 
273               fork="true">               fork="true">
274    
275        <bootclasspath refid="javac.bootclasspath"/>        <bootclasspath refid="javac.bootclasspath"/>
276        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <compilerarg line="${build.javac.args}"/>
277    
278      </javac>      </javac>
279    
# Line 378  Line 323 
323    
324      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
325        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
326            <include name="**/*.html"/>
327          </fileset>
328        </copy>
329    
330        <!-- Not needed now, used for doccheck filtering:
331        <property name="generic.declarations"
332                 value="public interface E {} public interface T {} public interface K {} public interface V {}"
333        />
334        -->
335    
336        <copy todir="${build.filter.src.dir}">
337          <fileset dir="${src.dir}">
338            <exclude name="**/*.html"/>
339          <patternset refid="emulation.excludes"/>          <patternset refid="emulation.excludes"/>
340        </fileset>        </fileset>
341        <filterchain>        <filterchain>
342          <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
343            <!--            <!--
344             # These arguments are to get rid of angle-bracketed type           # This filter gets rid of angle-bracketed type parameters
345             # parameters so that javadoc can run on the result. The           # so that javadoc can run on the result. The following
346             # following heuristic that seems to work:           # heuristic seems to work:
347             #             #
348             # For all lines not starting with space(s)-asterisk-space(s),             # For all lines not starting with space(s)-asterisk-space(s),
349             #   replace <something> with a space, where there may be more             #   replace <something> with a space, where there may be more
# Line 394  Line 351 
351             #   must not contain parens or pipes. (This may need some             #   must not contain parens or pipes. (This may need some
352             #   tweaking.)             #   tweaking.)
353             -->             -->
354    
355            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
356                          classpath="${build.ant.dir}">
357            <param name="notmatching" value="^\s+\*\s.*$"/>            <param name="notmatching" value="^\s+\*\s.*$"/>
358            <param name="pattern" value="&lt;[^|>()]+?>+"/>            <param name="pattern" value="&lt;[^|>()]+?>+"/>
359            <param name="replacement" value=" "/>            <param name="replacement" value=" "/>
360          </filterreader>          </filterreader>
361          <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
362                        classpath="${build.ant.dir}">  
363            <!--            <!--
364             # These arguments are to uncomment lines beginning with           # This filter uncomments lines beginning with "//@" so that
365             # "//@" so that javadoc can see imports that are needed           # javadoc can see imports that are needed to resolve links
366             # to resolve links but that shouldn't be in the compiled           # but that shouldn't be in the compiled code.
            # code.  
367             -->             -->
368    
369            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370                          classpath="${build.ant.dir}">
371            <param name="matching" value="^//@.*$"/>            <param name="matching" value="^//@.*$"/>
372            <param name="pattern" value="^//@"/>            <param name="pattern" value="^//@"/>
373            <param name="replacement" value=""/>            <param name="replacement" value=""/>
374          </filterreader>          </filterreader>
375    
376    
377            <!--
378             # The next two filters try to make the source look like
379             # something that doccheck can process. The first removes
380             # -source 1.4 assertions and the second adds in a bunch
381             # of single letter public nested marker interfaces so that
382             # the generic type parameters are recognized.
383             #
384             # Currently commented out because doccheck doesn't work. :-(
385             -->
386    
387            <!--
388            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
389                          classpath="${build.ant.dir}">
390              <param name="matching"    value="^\s*assert[\s ].*$"/>
391              <param name="pattern"     value="assert"/>
392              <param name="replacement" value="//assert"/>
393            </filterreader>
394    
395            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
396                          classpath="${build.ant.dir}">
397              <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
398              <param name="pattern"     value="$"/>
399              <param name="replacement" value=" ${generic.declarations}"/>
400            </filterreader>
401            -->
402    
403        </filterchain>        </filterchain>
404      </copy>      </copy>
405    
# Line 429  Line 419 
419             source="${build.sourcelevel}"             source="${build.sourcelevel}"
420               fork="true">               fork="true">
421    
       <bootclasspath refid="javac.bootclasspath"/>  
       <compilerarg line="${javac.args} ${build.warnings.option}"/>  
422        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
423          <bootclasspath refid="javac.bootclasspath"/>
424          <compilerarg line="${build.javac.args}"/>
425    
426      </javac>      </javac>
427    
# Line 453  Line 443 
443                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
444                     fork="true">                     fork="true">
445    
446        <jvmarg value="${test.javac.args}"/>        <jvmarg value="${test.bootclasspath.arg}"/>
447    
448        <formatter type="xml"/>        <formatter type="xml"/>
449    
# Line 494  Line 484 
484    </target>    </target>
485    
486    
487    <target name="check-junit">    <target name="configure-compiler">
488    
489      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->      <property name="gjc.version"
490      <available property="junit.available"               value="2.0"/>
                classname="junit.framework.Protectable"/>  
491    
492      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"      <condition property="build.novariance" value="-novariance">
493            unless="junit.available"/>        <and>
494            <equals arg1="${gjc.version}" arg2="2.0"/>
495            <or>
496              <not><isset property="gjc.novariance"/></not>
497              <istrue value="${gjc.novariance}"/>
498            </or>
499          </and>
500        </condition>
501    
502        <property name="build.novariance"
503                 value=""/>
504    
505        <property name="gjc.dir"
506                 value="${lib.dir}/gjc"/>
507    
508        <property name="javac.jar"
509              location="${gjc.dir}/${gjc.version}/javac.jar"/>
510    
511        <property name="collect.jar"
512              location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
513    
514    
515        <condition property="build.warnunchecked" value="-warnunchecked">
516          <istrue value="${gjc.warnunchecked}"/>
517        </condition>
518    
519        <property name="build.warnunchecked" value=""/>
520    
521        <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
522          <istrue value="${build.nothreads}"/>
523        </condition>
524    
525    
526        <!--
527         ! Bootclasspath munging for source compilation.
528         -->
529    
530        <path id="javac.bootclasspath.prefix">
531          <!-- <pathelement location="${src.dir}"/> -->
532          <pathelement location="${javac.jar}"/>
533        </path>
534    
535        <path id="javac.bootclasspath">
536          <!-- <pathelement location="${src.dir}"/> -->
537          <pathelement location="${collect.jar}"/>
538          <pathelement location="${rt.jar}"/>
539        </path>
540    
541        <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
542        <property name="javac.bootclasspath.prefix"
543                 refid="javac.bootclasspath.prefix"/>
544    
545        <!-- Turn the flattened bootclasspath prefix into a javac argument -->
546        <property name="build.bootclasspath.arg"
547                 value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
548    
549        <!-- Flatten bootclasspath for trace message -->
550        <property name="javac.bootclasspath"
551                 refid="javac.bootclasspath"/>
552    
553        <!-- Common options in javac invocations -->
554        <property name="build.javac.args"
555                 value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
556    
557        <echo>javac ${build.javac.args}</echo>
558        <echo>bootclasspath=${javac.bootclasspath}</echo>
559    
560      </target>
561    
562    
563      <target name="prepare-src"
564              depends="configure-compiler"
565              if="prepare.src.dir">
566    
567        <mkdir dir="${prepare.src.dir}"/>
568        <copy todir="${prepare.src.dir}">
569          <fileset dir="${src.dir}">
570            <exclude name="java/lang/**"/>
571          </fileset>
572        </copy>
573    
574    </target>    </target>
575    
576    
577    <target name="check-emulation">    <target name="configure-emulation">
578    
579      <condition property="build.emulation.true">      <condition property="build.emulation.true">
580        <or>        <or>
581          <isset property="build.emulation"/>          <and>
582          <os family="windows"/>          <os family="windows"/>
583              <not>
584                <isset property="build.emulation"/>
585              </not>
586            </and>
587            <istrue value="${build.emulation}"/>
588        </or>        </or>
589      </condition>      </condition>
590    
591      </target>
592    
593    
594      <target name="configure-tests">
595    
596        <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
597        <available property="junit.available"
598                   classname="junit.framework.Protectable"/>
599    
600        <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
601              unless="junit.available"/>
602    
603    
604        <!--
605         ! Bootclasspath munging for testing, so JUnit can test our local
606         ! modifications to java.*.
607         -->
608    
609        <path id="test.classpath">
610          <pathelement location="${product.jar}"/>
611          <pathelement location="${build.testcases.dir}"/>
612          <pathelement location="${junit.jar}"/>
613        </path>
614    
615        <!-- Flatten test classpath into a platform-appropriate string -->
616        <property name="test.classpath" refid="test.classpath"/>
617    
618        <!-- Turn the flattened test classpath into a javac argument -->
619        <property name="test.bootclasspath.arg"
620                 value='-Xbootclasspath/p:${test.classpath}'/>
621    
622    </target>    </target>
623    
624    
Legend:
Removed from v.1.30  
changed lines
  Added in v.1.36
Doug Lea
 ViewVC Help
Powered by ViewVC 1.0.8