[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.35, Thu May 29 15:53:58 2003 UTC revision 1.48, Fri Aug 1 19:41:06 2003 UTC
# 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 59  Line 60 
60    
61    
62    
63    <!-- Files excluded from emulation and dist-docs -->    <!-- Files excluded from dist-docs and emulation jar -->
64    <patternset id="emulation.excludes">    <patternset id="unsafe.exclusion">
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 -->
# Line 77  Line 86 
86    
87      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
88    
89    <!--
90        <echo>javac ${gjc.args}</echo>
91        <echo>bootclasspath=${compile.bootclasspath}</echo>
92    -->
93    
94      <javac srcdir="${prepare.src.dir}"      <javac srcdir="${prepare.src.dir}"
95            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
96              debug="${build.debug}"              debug="${build.debug}"
# Line 85  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="${build.javac.args}"/>        <bootclasspath refid="compile.bootclasspath"/>
104    
105      </javac>      </javac>
106    
# Line 119  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 128  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        <echo>DocCheck output is in ${build.doccheck.dir}</echo>
149    
150    </target>    </target>
151    
152    
# Line 177  Line 193 
193             source="${build.sourcelevel}"             source="${build.sourcelevel}"
194               fork="true">               fork="true">
195    
196        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args} -s"/>
197        <compilerarg line="${build.javac.args} -s"/>        <bootclasspath refid="compile.bootclasspath"/>
198    
199      </javac>      </javac>
200    
# Line 189  Line 205 
205            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
206            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
207    
208      <target name="release"
209              depends="dist"
210              description="Puts entire CVS tree, plus distribution productions, in a jar">
211    
212    <!--
213        #keep build dir? - dl
214        <delete dir="${build.dir}"/>
215    -->
216        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
217    
218        <jar basedir="${basedir}" destfile="${release.jar}">
219          <exclude name="${release.jar}"/>
220          <exclude name="user.properties"/>
221          <exclude name="etc/notes/**"/>
222          <exclude name="lib/gjc/2.1/**"/>
223          <exclude name="**/SyntaxTest.java"/>
224        </jar>
225    
226      </target>
227    
228    <target name="clean"    <target name="clean"
229            description="Removes all build products">            description="Removes all build products">
# Line 272  Line 307 
307             source="${build.sourcelevel}"             source="${build.sourcelevel}"
308               fork="true">               fork="true">
309    
310        <bootclasspath refid="javac.bootclasspath"/>        <compilerarg    line="${gjc.args}"/>
311        <compilerarg line="${build.javac.args}"/>        <bootclasspath refid="compile.bootclasspath"/>
312    
313      </javac>      </javac>
314    
# Line 287  Line 322 
322    
323      <jar destfile="${product.jar}" duplicate="add">      <jar destfile="${product.jar}" duplicate="add">
324        <fileset dir="${build.classes.dir}">        <fileset dir="${build.classes.dir}">
325          <patternset refid="emulation.excludes"/>          <patternset refid="atomic.exclusion"/>
326            <patternset refid="unsafe.exclusion"/>
327        </fileset>        </fileset>
328        <fileset dir="${build.emulation.dir}"/>        <fileset dir="${build.emulation.dir}"/>
329      </jar>      </jar>
# Line 330  Line 366 
366      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
367        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
368          <exclude name="**/*.html"/>          <exclude name="**/*.html"/>
369          <patternset refid="emulation.excludes"/>          <patternset refid="unsafe.exclusion"/>
370        </fileset>        </fileset>
371        <filterchain>        <filterchain>
372          <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
                       classpath="${build.ant.dir}">  
373            <!--            <!--
374             # These arguments are to get rid of angle-bracketed type           # This filter gets rid of angle-bracketed type parameters
375             # parameters so that javadoc can run on the result. The           # so that javadoc can run on the result. The following
376             # following heuristic that seems to work:           # heuristic seems to work:
377             #             #
378             # For all lines not starting with space(s)-asterisk-space(s),             # For all lines not starting with space(s)-asterisk-space(s),
379             #   replace <something> with a space, where there may be more             #   replace <something> with a space, where there may be more
# Line 346  Line 381 
381             #   must not contain parens or pipes. (This may need some             #   must not contain parens or pipes. (This may need some
382             #   tweaking.)             #   tweaking.)
383             -->             -->
384    
385            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
386                          classpath="${build.ant.dir}">
387            <param name="notmatching" value="^\s+\*\s.*$"/>            <param name="notmatching" value="^\s+\*\s.*$"/>
388            <param name="pattern" value="&lt;[^|>()]+?>+"/>            <param name="pattern" value="&lt;[^|>()]+?>+"/>
389            <param name="replacement" value=" "/>            <param name="replacement" value=" "/>
390          </filterreader>          </filterreader>
391          <filterreader classname="jsr166.ant.filters.ReplaceFilter"  
392                        classpath="${build.ant.dir}">  
393            <!--            <!--
394             # These arguments are to uncomment lines beginning with           # This filter uncomments lines beginning with "//@" so that
395             # "//@" so that javadoc can see imports that are needed           # javadoc can see imports that are needed to resolve links
396             # to resolve links but that shouldn't be in the compiled           # but that shouldn't be in the compiled code.
            # code.  
397             -->             -->
398    
399            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
400                          classpath="${build.ant.dir}">
401            <param name="matching" value="^//@.*$"/>            <param name="matching" value="^//@.*$"/>
402            <param name="pattern" value="^//@"/>            <param name="pattern" value="^//@"/>
403            <param name="replacement" value=""/>            <param name="replacement" value=""/>
# Line 368  Line 408 
408    </target>    </target>
409    
410    
411    
412    
413      <target name="filter-doccheck"
414              depends="filter-src">
415    
416        <mkdir dir="${build.filter.doccheck.dir}"/>
417    
418        <copy todir="${build.filter.doccheck.dir}">
419          <fileset dir="${build.filter.src.dir}">
420            <include name="**/*.html"/>
421          </fileset>
422        </copy>
423    
424        <property name="generic.declarations"
425                 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 {}"
426        />
427    
428        <copy todir="${build.filter.doccheck.dir}">
429          <fileset dir="${build.filter.src.dir}">
430            <exclude name="**/*.html"/>
431          </fileset>
432          <filterchain>
433            <!--
434             # These two filters try to make the source look like
435             # something that doccheck can process. The first removes
436             # -source 1.4 assertions and the second adds in a bunch
437             # of single letter public nested marker interfaces so that
438             # the generic type parameters are recognized.
439             -->
440    
441            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
442                          classpath="${build.ant.dir}">
443              <param name="matching"    value="^\s*assert[\s ].*$"/>
444              <param name="pattern"     value="assert"/>
445              <param name="replacement" value="//assert"/>
446            </filterreader>
447    
448            <filterreader classname="jsr166.ant.filters.ReplaceFilter"
449                          classpath="${build.ant.dir}">
450              <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
451              <param name="pattern"     value="$"/>
452              <param name="replacement" value=" ${generic.declarations}"/>
453            </filterreader>
454    
455          </filterchain>
456        </copy>
457    
458      </target>
459    
460    
461    <target name="compile-tests"    <target name="compile-tests"
462            depends="jar">            depends="jar">
463    
464      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
465    
466    <!--
467        <echo>javac ${gjc.args}</echo>
468        <echo>bootclasspath=${test.compile.bootclasspath}</echo>
469        <echo>classpath="${test.classpath}"</echo>
470    -->
471    
472      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
473            destdir="${build.testcases.dir}"            destdir="${build.testcases.dir}"
474              debug="${build.debug}"              debug="${build.debug}"
# Line 381  Line 477 
477             source="${build.sourcelevel}"             source="${build.sourcelevel}"
478               fork="true">               fork="true">
479    
480          <compilerarg    line="${gjc.args}"/>
481          <bootclasspath refid="test.compile.bootclasspath"/>
482        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
       <bootclasspath refid="javac.bootclasspath"/>  
       <compilerarg line="${build.javac.args}"/>  
483    
484      </javac>      </javac>
485    
# Line 405  Line 501 
501                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
502                     fork="true">                     fork="true">
503    
504        <jvmarg value="${test.bootclasspath.arg}"/>        <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
505    
506        <formatter type="xml"/>        <formatter type="xml"/>
507    
# Line 449  Line 545 
545    <target name="configure-compiler">    <target name="configure-compiler">
546    
547      <property name="gjc.version"      <property name="gjc.version"
548               value="2.0"/>               value="2.2"/>
549    
550      <condition property="build.novariance" value="-novariance">      <condition property="novariance.arg" value="-novariance">
551        <and>        <and>
552          <equals arg1="${gjc.version}" arg2="2.0"/>          <equals arg1="${gjc.version}" arg2="2.0"/>
553          <or>          <or>
# Line 461  Line 557 
557        </and>        </and>
558      </condition>      </condition>
559    
560      <property name="build.novariance"      <property name="novariance.arg"
561               value=""/>               value=""/>
562    
563      <property name="gjc.dir"      <property name="gjc.dir"
# Line 471  Line 567 
567            location="${gjc.dir}/${gjc.version}/javac.jar"/>            location="${gjc.dir}/${gjc.version}/javac.jar"/>
568    
569      <property name="collect.jar"      <property name="collect.jar"
570            location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>            location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
571    
572    
573      <condition property="build.warnunchecked" value="-warnunchecked">      <condition property="warnunchecked.arg" value="-warnunchecked">
574        <istrue value="${gjc.warnunchecked}"/>        <istrue value="${gjc.warnunchecked}"/>
575      </condition>      </condition>
576    
577      <property name="build.warnunchecked" value=""/>      <property name="warnunchecked.arg" value=""/>
578    
579      <condition property="prepare.src.dir" value="${build.dir}/prepare-src">      <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
580        <istrue value="${build.nothreads}"/>        <istrue value="${build.nothreads}"/>
# Line 489  Line 585 
585       ! Bootclasspath munging for source compilation.       ! Bootclasspath munging for source compilation.
586       -->       -->
587    
588      <path id="javac.bootclasspath.prefix">      <path id="pre.bootclasspath">
       <!-- <pathelement location="${src.dir}"/> -->  
589        <pathelement location="${javac.jar}"/>        <pathelement location="${javac.jar}"/>
590      </path>      </path>
591    
592      <path id="javac.bootclasspath">      <path id="compile.bootclasspath">
593        <!-- <pathelement location="${src.dir}"/> -->        <pathelement location="${build.classes.dir}"/>
594        <pathelement location="${collect.jar}"/>        <pathelement location="${collect.jar}"/>
595        <pathelement location="${rt.jar}"/>        <pathelement location="${rt.jar}"/>
596      </path>      </path>
597    
598      <!-- Flatten bootclasspath prefix into a platform-appropriate string -->      <!-- Flatten paths into platform-appropriate strings -->
599      <property name="javac.bootclasspath.prefix"      <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
600               refid="javac.bootclasspath.prefix"/>      <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
   
     <!-- 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"/>  
601    
     <!-- Common options in javac invocations -->  
     <property name="build.javac.args"  
              value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>  
602    
603      <echo>javac ${build.javac.args}</echo>      <!-- Common options in javac invocations -->
604      <echo>bootclasspath=${javac.bootclasspath}</echo>      <property name="gjc.args"
605                 value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
606        />
607    
608    </target>    </target>
609    
# Line 553  Line 639 
639    </target>    </target>
640    
641    
642    <target name="configure-tests">    <target name="configure-tests"
643           depends="configure-compiler">
644    
645      <!-- 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 -->
646      <available property="junit.available"      <available property="junit.available"
# Line 574  Line 661 
661        <pathelement location="${junit.jar}"/>        <pathelement location="${junit.jar}"/>
662      </path>      </path>
663    
664      <!-- Flatten test classpath into a platform-appropriate string -->      <path id="test.compile.bootclasspath">
665      <property name="test.classpath" refid="test.classpath"/>        <pathelement location="${javac.jar}"/>
666          <pathelement location="${collect.jar}"/>
667          <pathelement location="${rt.jar}"/>
668        </path>
669    
670      <!-- Turn the flattened test classpath into a javac argument -->      <path id="test.run.bootclasspath">
671      <property name="test.bootclasspath.arg"        <pathelement location="${javac.jar}"/>
672               value='-Xbootclasspath/p:${test.classpath}'/>        <path refid="test.classpath"/>
673        </path>
674    
675        <!-- Flatten test classpaths into platform-appropriate strings -->
676        <property name="test.classpath"             refid="test.classpath"/>
677        <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
678        <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
679    
680    </target>    </target>
681    
# Line 610  Line 706 
706    </target>    </target>
707    
708    
709      <target name="ng" depends="test">
710        <java classname="SuperfluousAbstract" fork="true">
711    
712          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
713    
714        </java>
715      </target>
716    
717    
718  </project>  </project>

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.48

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8