/[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.39 by tim, Sat May 31 17:24:03 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}"  <!--
81        <echo>javac ${gjc.args}</echo>
82        <echo>bootclasspath=${compile.bootclasspath}</echo>
83    -->
84    
85        <javac srcdir="${prepare.src.dir}"
86            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
87              debug="${build.debug}"              debug="${build.debug}"
88         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 127  Line 90 
90             source="${build.sourcelevel}"             source="${build.sourcelevel}"
91               fork="true">               fork="true">
92    
93        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
94        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="compile.bootclasspath"/>
95    
96      </javac>      </javac>
97    
# Line 136  Line 99 
99    
100    
101    <target name="jar"    <target name="jar"
102            depends="native-jar, emulation-jar"            depends="configure-emulation, init-jar, native-jar, emulation-jar"
103            description="Builds library jar from compiled sources"/>            description="Builds library jar from compiled sources"/>
104    
105    
106    <target name="test"    <target name="test"
107            depends="init, check-junit, report-tests"            depends="init, configure-tests, report-tests"
108            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)" />
109    
110    
# Line 200  Line 163 
163    </target>    </target>
164    
165    
   <!--  
    # 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.  
    -->  
166    <target name="strip"    <target name="strip"
167            depends="init">            depends="init, configure-compiler"
168              description="Strip generics from java source (not working yet)">
169    
170      <mkdir dir="${build.stripped.dir}"/>      <mkdir dir="${build.stripped.dir}"/>
171    
172        <!--
173         # javac -s doesn't reliably generate compilable code. It generates
174         # bridge methods (marked as "synthetic") that can have identical
175         # signatures to existing methods except for the return value.
176         -->
177      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
178            destdir="${build.stripped.dir}"            destdir="${build.stripped.dir}"
179              debug="${build.debug}"              debug="${build.debug}"
# Line 218  Line 182 
182             source="${build.sourcelevel}"             source="${build.sourcelevel}"
183               fork="true">               fork="true">
184    
185        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args} -s"/>
186        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>        <bootclasspath refid="compile.bootclasspath"/>
187    
188      </javac>      </javac>
189    
# Line 271  Line 235 
235    
236    <!-- Internal targets -->    <!-- Internal targets -->
237    
   <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=""/>  
238    
239    </target>    <target name="init">
   
   
   <target name="init"  
           depends="set-warnings-if, set-warnings-unless">  
240    
241      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
242      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
# Line 303  Line 253 
253    
254    
255    <target name="native-jar"    <target name="native-jar"
256            depends="compile, init-jar"            depends="compile"
257            unless="build.emulation">            unless="build.emulation.true">
258    
259      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
260        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
# Line 313  Line 263 
263    </target>    </target>
264    
265    
   <target name="base-jar"  
           depends="compile, init-jar">  
   
   </target>  
   
   
266    <target name="compile-emulation"    <target name="compile-emulation"
267            depends="init"            depends="init, configure-compiler"
268            if="build.emulation">            if="build.emulation.true">
269    
270      <mkdir dir="${build.emulation.dir}"/>      <mkdir dir="${build.emulation.dir}"/>
271    
# Line 333  Line 277 
277             source="${build.sourcelevel}"             source="${build.sourcelevel}"
278               fork="true">               fork="true">
279    
280        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
281        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="compile.bootclasspath"/>
282    
283      </javac>      </javac>
284    
# Line 342  Line 286 
286    
287    
288    <target name="emulation-jar"    <target name="emulation-jar"
289            depends="init-jar, compile-emulation"            depends="compile-emulation"
290            if="build.emulation">            if="build.emulation.true">
291    
292    
293      <jar destfile="${product.jar}" duplicate="add">      <jar destfile="${product.jar}" duplicate="add">
# Line 384  Line 328 
328    
329      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
330        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
331            <include name="**/*.html"/>
332          </fileset>
333        </copy>
334    
335        <!-- Not needed now, used for doccheck filtering:
336        <property name="generic.declarations"
337                 value="public interface E {} public interface T {} public interface K {} public interface V {}"
338        />
339        -->
340    
341        <copy todir="${build.filter.src.dir}">
342          <fileset dir="${src.dir}">
343            <exclude name="**/*.html"/>
344          <patternset refid="emulation.excludes"/>          <patternset refid="emulation.excludes"/>
345        </fileset>        </fileset>
346        <filterchain>        <filterchain>
347    
348            <!--
349             # This filter gets rid of angle-bracketed type parameters
350             # so that javadoc can run on the result. The following
351             # heuristic seems to work:
352             #
353             # For all lines not starting with space(s)-asterisk-space(s),
354             #   replace <something> with a space, where there may be more
355             #   than one right angle bracket at the end, and "something"
356             #   must not contain parens or pipes. (This may need some
357             #   tweaking.)
358             -->
359    
360          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
361                        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.)  
            -->  
362            <param name="notmatching" value="^\s+\*\s.*$"/>            <param name="notmatching" value="^\s+\*\s.*$"/>
363            <param name="pattern" value="&lt;[^|>()]+?>+"/>            <param name="pattern"     value="&lt;[^|>()]+?>+"/>
364            <param name="replacement" value=" "/>            <param name="replacement" value=" "/>
365          </filterreader>          </filterreader>
366    
367    
368            <!--
369             # This filter uncomments lines beginning with "//@" so that
370             # javadoc can see imports that are needed to resolve links
371             # but that shouldn't be in the compiled code.
372             -->
373    
374          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
375                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
376            <!--            <param name="matching"    value="^//@.*$"/>
377             # 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="^//@"/>  
378            <param name="replacement" value=""/>            <param name="replacement" value=""/>
379          </filterreader>          </filterreader>
380    
381    
382            <!--
383             # The next 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             # Currently commented out because doccheck doesn't work. :-(
390             -->
391    
392            <!--
393            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
394                          classpath="${build.ant.dir}">
395              <param name="matching"    value="^\s*assert[\s ].*$"/>
396              <param name="pattern"     value="assert"/>
397              <param name="replacement" value="//assert"/>
398            </filterreader>
399    
400            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
401                          classpath="${build.ant.dir}">
402              <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
403              <param name="pattern"     value="$"/>
404              <param name="replacement" value=" ${generic.declarations}"/>
405            </filterreader>
406            -->
407    
408        </filterchain>        </filterchain>
409      </copy>      </copy>
410    
# Line 427  Line 416 
416    
417      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
418    
419    <!--
420        <echo>javac ${gjc.args}</echo>
421        <echo>bootclasspath=${test.compile.bootclasspath}</echo>
422        <echo>classpath="${test.classpath}"</echo>
423    -->
424    
425      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
426            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
427              debug="${build.debug}"              debug="${build.debug}"
# Line 435  Line 430 
430             source="${build.sourcelevel}"             source="${build.sourcelevel}"
431               fork="true">               fork="true">
432    
433        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
434        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="test.compile.bootclasspath"/>
435        <classpath refid="test.classpath"/>        <classpath     refid="test.classpath"/>
436    
437      </javac>      </javac>
438    
# Line 459  Line 454 
454                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
455                     fork="true">                     fork="true">
456    
457        <jvmarg value="${test.javac.args}"/>        <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
458    
459        <formatter type="xml"/>        <formatter type="xml"/>
460    
# Line 500  Line 495 
495    </target>    </target>
496    
497    
498    <target name="check-junit">    <target name="configure-compiler">
499    
500        <property name="gjc.version"
501                 value="2.0"/>
502    
503        <condition property="novariance.arg" value="-novariance">
504          <and>
505            <equals arg1="${gjc.version}" arg2="2.0"/>
506            <or>
507              <not><isset property="gjc.novariance"/></not>
508              <istrue value="${gjc.novariance}"/>
509            </or>
510          </and>
511        </condition>
512    
513        <property name="novariance.arg"
514                 value=""/>
515    
516        <property name="gjc.dir"
517                 value="${lib.dir}/gjc"/>
518    
519        <property name="javac.jar"
520              location="${gjc.dir}/${gjc.version}/javac.jar"/>
521    
522        <property name="collect.jar"
523              location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
524    
525    
526        <condition property="warnunchecked.arg" value="-warnunchecked">
527          <istrue value="${gjc.warnunchecked}"/>
528        </condition>
529    
530        <property name="warnunchecked.arg" value=""/>
531    
532        <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533          <istrue value="${build.nothreads}"/>
534        </condition>
535    
536    
537        <!--
538         ! Bootclasspath munging for source compilation.
539         -->
540    
541        <path id="pre.bootclasspath">
542          <pathelement location="${javac.jar}"/>
543        </path>
544    
545        <path id="compile.bootclasspath">
546          <pathelement location="${build.classes.dir}"/>
547          <pathelement location="${collect.jar}"/>
548          <pathelement location="${rt.jar}"/>
549        </path>
550    
551        <!-- Flatten paths into platform-appropriate strings -->
552        <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
553        <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
554    
555    
556        <!-- Common options in javac invocations -->
557        <property name="gjc.args"
558                 value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
559        />
560    
561      </target>
562    
563    
564      <target name="prepare-src"
565              depends="configure-compiler"
566              if="prepare.src.dir">
567    
568        <mkdir dir="${prepare.src.dir}"/>
569        <copy todir="${prepare.src.dir}">
570          <fileset dir="${src.dir}">
571            <exclude name="java/lang/**"/>
572          </fileset>
573        </copy>
574    
575      </target>
576    
577    
578      <target name="configure-emulation">
579    
580        <condition property="build.emulation.true">
581          <or>
582            <and>
583              <os family="windows"/>
584              <not>
585                <isset property="build.emulation"/>
586              </not>
587            </and>
588            <istrue value="${build.emulation}"/>
589          </or>
590        </condition>
591    
592      </target>
593    
594    
595      <target name="configure-tests"
596           depends="configure-compiler">
597    
598      <!-- 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 -->
599      <available property="junit.available"      <available property="junit.available"
# Line 509  Line 602 
602      <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"
603            unless="junit.available"/>            unless="junit.available"/>
604    
605    
606        <!--
607         ! Bootclasspath munging for testing, so JUnit can test our local
608         ! modifications to java.*.
609         -->
610    
611        <path id="test.classpath">
612          <pathelement location="${product.jar}"/>
613          <pathelement location="${build.testcases.dir}"/>
614          <pathelement location="${junit.jar}"/>
615        </path>
616    
617        <path id="test.compile.bootclasspath">
618          <pathelement location="${javac.jar}"/>
619          <pathelement location="${collect.jar}"/>
620          <pathelement location="${rt.jar}"/>
621        </path>
622    
623        <path id="test.run.bootclasspath">
624          <pathelement location="${javac.jar}"/>
625          <path refid="test.classpath"/>
626        </path>
627    
628        <!-- Flatten test classpaths into platform-appropriate strings -->
629        <property name="test.classpath"             refid="test.classpath"/>
630        <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
631        <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
632    
633    </target>    </target>
634    
635    
Legend:
Removed from v.1.29  
changed lines
  Added in v.1.39
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27