/[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.45 by dl, Mon Jul 14 19:53:55 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    
62    <!--    <!-- Files excluded from dist-docs and emulation jar -->
63     ! 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">  
64      <exclude name="java/util/Random.*"/>      <exclude name="java/util/Random.*"/>
65      <exclude name="sun/misc/Unsafe.*"/>      <exclude name="sun/misc/Unsafe.*"/>
66    </patternset>    </patternset>
67    
68      <!-- Files excludes from emulation jar -->
69      <patternset id="atomic.exclusion">
70        <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
71        <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
72        <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
73        <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
74      </patternset>
75    
76    
77    
78    <!-- Main targets -->    <!-- Main targets -->
79    
80    <target name="compile"    <target name="compile"
81            depends="init"            depends="init, configure-compiler, prepare-src"
82            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
83    
84        <property name="prepare.src.dir" value="${src.dir}"/>
85    
86      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
87    
88      <javac srcdir="${src.dir}"  <!--
89        <echo>javac ${gjc.args}</echo>
90        <echo>bootclasspath=${compile.bootclasspath}</echo>
91    -->
92    
93        <javac srcdir="${prepare.src.dir}"
94            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
95              debug="${build.debug}"              debug="${build.debug}"
96         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 127  Line 98 
98             source="${build.sourcelevel}"             source="${build.sourcelevel}"
99               fork="true">               fork="true">
100    
101        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
102        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="compile.bootclasspath"/>
103    
104      </javac>      </javac>
105    
# Line 136  Line 107 
107    
108    
109    <target name="jar"    <target name="jar"
110            depends="native-jar, emulation-jar"            depends="configure-emulation, init-jar, native-jar, emulation-jar"
111            description="Builds library jar from compiled sources"/>            description="Builds library jar from compiled sources"/>
112    
113    
114    <target name="test"    <target name="test"
115            depends="init, check-junit, report-tests"            depends="init, configure-tests, report-tests"
116            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)" />
117    
118    
# Line 200  Line 171 
171    </target>    </target>
172    
173    
   <!--  
    # 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.  
    -->  
174    <target name="strip"    <target name="strip"
175            depends="init">            depends="init, configure-compiler"
176              description="Strip generics from java source (not working yet)">
177    
178      <mkdir dir="${build.stripped.dir}"/>      <mkdir dir="${build.stripped.dir}"/>
179    
180        <!--
181         # javac -s doesn't reliably generate compilable code. It generates
182         # bridge methods (marked as "synthetic") that can have identical
183         # signatures to existing methods except for the return value.
184         -->
185      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
186            destdir="${build.stripped.dir}"            destdir="${build.stripped.dir}"
187              debug="${build.debug}"              debug="${build.debug}"
# Line 218  Line 190 
190             source="${build.sourcelevel}"             source="${build.sourcelevel}"
191               fork="true">               fork="true">
192    
193        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args} -s"/>
194        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>        <bootclasspath refid="compile.bootclasspath"/>
195    
196      </javac>      </javac>
197    
# Line 230  Line 202 
202            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
203            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
204    
205      <target name="release"
206              depends="dist"
207              description="Puts entire CVS tree, plus distribution productions, in a jar">
208    
209    <!--  
210        #keep build dir? - dl
211        <delete dir="${build.dir}"/>
212    -->
213        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
214    
215        <jar basedir="${basedir}" destfile="${release.jar}">
216          <exclude name="${release.jar}"/>
217          <exclude name="user.properties"/>
218          <exclude name="etc/notes/**"/>
219          <exclude name="lib/gjc/2.1/**"/>
220          <exclude name="**/SyntaxTest.java"/>
221        </jar>
222    
223      </target>
224    
225    <target name="clean"    <target name="clean"
226            description="Removes all build products">            description="Removes all build products">
# Line 271  Line 262 
262    
263    <!-- Internal targets -->    <!-- Internal targets -->
264    
   <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>  
265    
266      <target name="init">
   <target name="init"  
           depends="set-warnings-if, set-warnings-unless">  
267    
268      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
269      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
# Line 303  Line 280 
280    
281    
282    <target name="native-jar"    <target name="native-jar"
283            depends="compile, init-jar"            depends="compile"
284            unless="build.emulation">            unless="build.emulation.true">
285    
286      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
287        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
# Line 313  Line 290 
290    </target>    </target>
291    
292    
   <target name="base-jar"  
           depends="compile, init-jar">  
   
   </target>  
   
   
293    <target name="compile-emulation"    <target name="compile-emulation"
294            depends="init"            depends="init, configure-compiler"
295            if="build.emulation">            if="build.emulation.true">
296    
297      <mkdir dir="${build.emulation.dir}"/>      <mkdir dir="${build.emulation.dir}"/>
298    
# Line 333  Line 304 
304             source="${build.sourcelevel}"             source="${build.sourcelevel}"
305               fork="true">               fork="true">
306    
307        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
308        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="compile.bootclasspath"/>
309    
310      </javac>      </javac>
311    
# Line 342  Line 313 
313    
314    
315    <target name="emulation-jar"    <target name="emulation-jar"
316            depends="init-jar, compile-emulation"            depends="compile-emulation"
317            if="build.emulation">            if="build.emulation.true">
318    
319    
320      <jar destfile="${product.jar}" duplicate="add">      <jar destfile="${product.jar}" duplicate="add">
321        <fileset dir="${build.classes.dir}">        <fileset dir="${build.classes.dir}">
322          <patternset refid="emulation.excludes"/>          <patternset refid="atomic.exclusion"/>
323            <patternset refid="unsafe.exclusion"/>
324        </fileset>        </fileset>
325        <fileset dir="${build.emulation.dir}"/>        <fileset dir="${build.emulation.dir}"/>
326      </jar>      </jar>
# Line 384  Line 356 
356    
357      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
358        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
359          <patternset refid="emulation.excludes"/>          <include name="**/*.html"/>
360          </fileset>
361        </copy>
362    
363        <!-- Not needed now, used for doccheck filtering:
364        <property name="generic.declarations"
365                 value="public interface E {} public interface T {} public interface K {} public interface V {}"
366        />
367        -->
368    
369        <copy todir="${build.filter.src.dir}">
370          <fileset dir="${src.dir}">
371            <exclude name="**/*.html"/>
372            <patternset refid="unsafe.exclusion"/>
373        </fileset>        </fileset>
374        <filterchain>        <filterchain>
375    
376            <!--
377             # This filter gets rid of angle-bracketed type parameters
378             # so that javadoc can run on the result. The following
379             # heuristic seems to work:
380             #
381             # For all lines not starting with space(s)-asterisk-space(s),
382             #   replace <something> with a space, where there may be more
383             #   than one right angle bracket at the end, and "something"
384             #   must not contain parens or pipes. (This may need some
385             #   tweaking.)
386             -->
387    
388          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
389                        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.)  
            -->  
390            <param name="notmatching" value="^\s+\*\s.*$"/>            <param name="notmatching" value="^\s+\*\s.*$"/>
391            <param name="pattern" value="&lt;[^|>()]+?>+"/>            <param name="pattern"     value="&lt;[^|>()]+?>+"/>
392            <param name="replacement" value=" "/>            <param name="replacement" value=" "/>
393          </filterreader>          </filterreader>
394    
395    
396            <!--
397             # This filter uncomments lines beginning with "//@" so that
398             # javadoc can see imports that are needed to resolve links
399             # but that shouldn't be in the compiled code.
400             -->
401    
402          <filterreader classname="jsr166.ant.filters.ReplaceFilter"          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
403                        classpath="${build.ant.dir}">                        classpath="${build.ant.dir}">
404            <!--            <param name="matching"    value="^//@.*$"/>
405             # 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="^//@"/>  
406            <param name="replacement" value=""/>            <param name="replacement" value=""/>
407          </filterreader>          </filterreader>
408    
409    
410            <!--
411             # The next two filters try to make the source look like
412             # something that doccheck can process. The first removes
413             # -source 1.4 assertions and the second adds in a bunch
414             # of single letter public nested marker interfaces so that
415             # the generic type parameters are recognized.
416             #
417             # Currently commented out because doccheck doesn't work. :-(
418             -->
419    
420            <!--
421            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
422                          classpath="${build.ant.dir}">
423              <param name="matching"    value="^\s*assert[\s ].*$"/>
424              <param name="pattern"     value="assert"/>
425              <param name="replacement" value="//assert"/>
426            </filterreader>
427    
428            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
429                          classpath="${build.ant.dir}">
430              <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
431              <param name="pattern"     value="$"/>
432              <param name="replacement" value=" ${generic.declarations}"/>
433            </filterreader>
434            -->
435    
436        </filterchain>        </filterchain>
437      </copy>      </copy>
438    
# Line 427  Line 444 
444    
445      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
446    
447    <!--
448        <echo>javac ${gjc.args}</echo>
449        <echo>bootclasspath=${test.compile.bootclasspath}</echo>
450        <echo>classpath="${test.classpath}"</echo>
451    -->
452    
453      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
454            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
455              debug="${build.debug}"              debug="${build.debug}"
# Line 435  Line 458 
458             source="${build.sourcelevel}"             source="${build.sourcelevel}"
459               fork="true">               fork="true">
460    
461        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
462        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <bootclasspath refid="test.compile.bootclasspath"/>
463        <classpath refid="test.classpath"/>        <classpath     refid="test.classpath"/>
464    
465      </javac>      </javac>
466    
# Line 459  Line 482 
482                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
483                     fork="true">                     fork="true">
484    
485        <jvmarg value="${test.javac.args}"/>        <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
486    
487        <formatter type="xml"/>        <formatter type="xml"/>
488    
# Line 500  Line 523 
523    </target>    </target>
524    
525    
526    <target name="check-junit">    <target name="configure-compiler">
527    
528        <property name="gjc.version"
529                 value="2.0"/>
530    
531        <condition property="novariance.arg" value="-novariance">
532          <and>
533            <equals arg1="${gjc.version}" arg2="2.0"/>
534            <or>
535              <not><isset property="gjc.novariance"/></not>
536              <istrue value="${gjc.novariance}"/>
537            </or>
538          </and>
539        </condition>
540    
541        <property name="novariance.arg"
542                 value=""/>
543    
544        <property name="gjc.dir"
545                 value="${lib.dir}/gjc"/>
546    
547        <property name="javac.jar"
548              location="${gjc.dir}/${gjc.version}/javac.jar"/>
549    
550        <property name="collect.jar"
551              location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
552    
553    
554        <condition property="warnunchecked.arg" value="-warnunchecked">
555          <istrue value="${gjc.warnunchecked}"/>
556        </condition>
557    
558        <property name="warnunchecked.arg" value=""/>
559    
560        <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
561          <istrue value="${build.nothreads}"/>
562        </condition>
563    
564    
565        <!--
566         ! Bootclasspath munging for source compilation.
567         -->
568    
569        <path id="pre.bootclasspath">
570          <pathelement location="${javac.jar}"/>
571        </path>
572    
573        <path id="compile.bootclasspath">
574          <pathelement location="${build.classes.dir}"/>
575          <pathelement location="${collect.jar}"/>
576          <pathelement location="${rt.jar}"/>
577        </path>
578    
579        <!-- Flatten paths into platform-appropriate strings -->
580        <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
581        <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
582    
583    
584        <!-- Common options in javac invocations -->
585        <property name="gjc.args"
586                 value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
587        />
588    
589      </target>
590    
591    
592      <target name="prepare-src"
593              depends="configure-compiler"
594              if="prepare.src.dir">
595    
596        <mkdir dir="${prepare.src.dir}"/>
597        <copy todir="${prepare.src.dir}">
598          <fileset dir="${src.dir}">
599            <exclude name="java/lang/**"/>
600          </fileset>
601        </copy>
602    
603      </target>
604    
605    
606      <target name="configure-emulation">
607    
608        <condition property="build.emulation.true">
609          <or>
610            <and>
611              <os family="windows"/>
612              <not>
613                <isset property="build.emulation"/>
614              </not>
615            </and>
616            <istrue value="${build.emulation}"/>
617          </or>
618        </condition>
619    
620      </target>
621    
622    
623      <target name="configure-tests"
624           depends="configure-compiler">
625    
626      <!-- 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 -->
627      <available property="junit.available"      <available property="junit.available"
# Line 509  Line 630 
630      <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"
631            unless="junit.available"/>            unless="junit.available"/>
632    
633    
634        <!--
635         ! Bootclasspath munging for testing, so JUnit can test our local
636         ! modifications to java.*.
637         -->
638    
639        <path id="test.classpath">
640          <pathelement location="${product.jar}"/>
641          <pathelement location="${build.testcases.dir}"/>
642          <pathelement location="${junit.jar}"/>
643        </path>
644    
645        <path id="test.compile.bootclasspath">
646          <pathelement location="${javac.jar}"/>
647          <pathelement location="${collect.jar}"/>
648          <pathelement location="${rt.jar}"/>
649        </path>
650    
651        <path id="test.run.bootclasspath">
652          <pathelement location="${javac.jar}"/>
653          <path refid="test.classpath"/>
654        </path>
655    
656        <!-- Flatten test classpaths into platform-appropriate strings -->
657        <property name="test.classpath"             refid="test.classpath"/>
658        <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
659        <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
660    
661    </target>    </target>
662    
663    
# Line 538  Line 687 
687    </target>    </target>
688    
689    
690      <target name="ng" depends="test">
691        <java classname="SuperfluousAbstract" fork="true">
692    
693          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
694    
695        </java>
696      </target>
697    
698    
699  </project>  </project>

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

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