ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.36 by tim, Thu May 29 17:29:08 2003 UTC vs.
Revision 1.57 by tim, Mon Sep 15 14:07:36 2003 UTC

# Line 30 | Line 30
30    <!-- Build locations -->
31    <property name="build.dir"            location="build"/>
32    <property name="build.classes.dir"    location="${build.dir}/classes"/>
33  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
33    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
34    <property name="build.lib.dir"        location="${build.dir}/lib"/>
35    <property name="build.ant.dir"        location="${build.dir}/ant"/>
36    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37 +  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
38    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
39    <property name="build.reports.dir"    location="${build.dir}/reports"/>
40    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41    <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 -->
45    <property name="src.dir"              location="${basedir}/src/main"/>
45  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
46    <property name="test.src.dir"         location="${basedir}/src/test"/>
47    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
48    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
# Line 56 | Line 56
56    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
57    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59 +  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
60  
61  
62 <
63 <  <!-- Files excluded from emulation and dist-docs -->
63 <  <patternset id="emulation.excludes">
62 >  <!-- Files excluded from dist-docs -->
63 >  <patternset id="docs.exclusion">
64      <exclude name="java/util/Random.*"/>
65      <exclude name="sun/misc/Unsafe.*"/>
66    </patternset>
# Line 77 | Line 77
77  
78      <mkdir dir="${build.classes.dir}"/>
79  
80 + <!--
81 +    <echo>javac ${build.args}</echo>
82 + -->
83 +
84      <javac srcdir="${prepare.src.dir}"
85            destdir="${build.classes.dir}"
86              debug="${build.debug}"
# Line 85 | Line 89
89             source="${build.sourcelevel}"
90               fork="true">
91  
92 <      <bootclasspath refid="javac.bootclasspath"/>
89 <      <compilerarg line="${build.javac.args}"/>
92 >      <compilerarg    line="${build.args}"/>
93  
94      </javac>
95  
# Line 94 | Line 97
97  
98  
99    <target name="jar"
100 <          depends="configure-emulation, init-jar, native-jar, emulation-jar"
100 >          depends="init-jar, native-jar"
101            description="Builds library jar from compiled sources"/>
102  
103  
# Line 119 | Line 122
122  
123  
124    <target name="doccheck"
125 <          depends="filter-src"
126 <          description="Reports on javadoc style errors (not working yet)">
125 >          depends="filter-doccheck"
126 >          description="Reports on javadoc style errors">
127  
128      <delete dir="${build.doccheck.dir}"/>
129      <mkdir dir="${build.doccheck.dir}"/>
# Line 128 | Line 131
131      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132           docletpath="${lib.dir}/doccheck.jar"
133              destdir="${build.doccheck.dir}">
134 <      <packageset dir="${build.filter.src.dir}"/>
134 >      <packageset dir="${build.filter.doccheck.dir}"/>
135      </javadoc>
136  
137 +    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
138 +
139    </target>
140  
141  
# Line 158 | Line 163
163    </target>
164  
165  
166 +  <target name="sinjdocs"
167 +          depends="configure-tests"
168 +          description="Builds javadocs with custom tags to build folder">
169 +
170 +    <delete dir="${build.sinjdocs.dir}"/>
171 +    <mkdir dir="${build.sinjdocs.dir}"/>
172 +
173 +    <java classname="net.cscott.sinjdoc.Main" fork="true">
174 +
175 +      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
176 +
177 +      <classpath>
178 +        <pathelement location="${sinjdoc.jar}"/>
179 +        <pathelement location="${lib.dir}/jutil.jar"/>
180 +        <pathelement location="${lib.dir}/cup.jar"/>
181 +        <path refid="test.classpath"/>
182 +      </classpath>
183 +
184 +      <!-- <arg value="-help"/> -->
185 +      <!-- <arg value="-verbose"/> -->
186 +      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187 +      
188 +      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189 +      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
190 +      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191 +      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192 +      
193 +      <arg value="java.lang"/>
194 +      <arg value="java.util"/>
195 +      <arg value="java.util.concurrent"/>
196 +      <arg value="java.util.concurrent.atomic"/>
197 +      <arg value="java.util.concurrent.locks"/>
198 +
199 +
200 +    </java>
201 +
202 +  </target>
203 +
204 +
205    <target name="strip"
206            depends="init, configure-compiler"
207            description="Strip generics from java source (not working yet)">
# Line 177 | Line 221
221             source="${build.sourcelevel}"
222               fork="true">
223  
224 <      <bootclasspath refid="javac.bootclasspath"/>
181 <      <compilerarg line="${build.javac.args} -s"/>
224 >      <compilerarg    line="${build.args} -s"/>
225  
226      </javac>
227  
# Line 189 | Line 232
232            depends="init, dist-clean, dist-jar, dist-docs"
233            description="Puts all distributable products in single hierarchy"/>
234  
235 +  <target name="release"
236 +          depends="dist"
237 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
238 +
239 + <!--
240 +    #keep build dir? - dl
241 +    <delete dir="${build.dir}"/>
242 + -->
243 +    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
244 +
245 +    <jar basedir="${basedir}" destfile="${release.jar}">
246 +      <exclude name="${release.jar}"/>
247 +      <exclude name="user.properties"/>
248 +      <exclude name="etc/notes/**"/>
249 +      <exclude name="**/SyntaxTest.java"/>
250 +    </jar>
251 +
252 +  </target>
253  
254    <target name="clean"
255            description="Removes all build products">
# Line 236 | Line 297
297      <!-- Version is kept in a separate file -->
298      <loadfile property="version" srcFile="version.properties"/>
299      <echo>Building JSR-166 version ${version}</echo>
300 +    <echo>java.home is ${java.home}</echo>
301  
302    </target>
303  
# Line 248 | Line 310
310  
311  
312    <target name="native-jar"
313 <          depends="compile"
252 <          unless="build.emulation.true">
313 >          depends="compile">
314  
315      <jar destfile="${product.jar}">
316        <fileset dir="${build.classes.dir}"/>
# Line 258 | Line 319
319    </target>
320  
321  
261  <target name="compile-emulation"
262          depends="init, configure-compiler"
263          if="build.emulation.true">
264
265    <mkdir dir="${build.emulation.dir}"/>
266
267    <javac srcdir="${emulation.src.dir}"
268          destdir="${build.emulation.dir}"
269            debug="${build.debug}"
270       debuglevel="${build.debuglevel}"
271      deprecation="${build.deprecation}"
272           source="${build.sourcelevel}"
273             fork="true">
274
275      <bootclasspath refid="javac.bootclasspath"/>
276      <compilerarg line="${build.javac.args}"/>
277
278    </javac>
279
280  </target>
281
282
283  <target name="emulation-jar"
284          depends="compile-emulation"
285          if="build.emulation.true">
286
287
288    <jar destfile="${product.jar}" duplicate="add">
289      <fileset dir="${build.classes.dir}">
290        <patternset refid="emulation.excludes"/>
291      </fileset>
292      <fileset dir="${build.emulation.dir}"/>
293    </jar>
294
295  </target>
296
297
322    <target name="dist-jar"
323            depends="clean, jar">
324  
# Line 327 | Line 351
351        </fileset>
352      </copy>
353  
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
354      <copy todir="${build.filter.src.dir}">
355        <fileset dir="${src.dir}">
356          <exclude name="**/*.html"/>
357 <        <patternset refid="emulation.excludes"/>
357 >        <patternset refid="docs.exclusion"/>
358        </fileset>
359        <filterchain>
360  
# Line 359 | Line 377
377            <param name="replacement" value=" "/>
378          </filterreader>
379  
380 +      </filterchain>
381 +    </copy>
382  
383 <        <!--
364 <         # This filter uncomments lines beginning with "//@" so that
365 <         # javadoc can see imports that are needed to resolve links
366 <         # but that shouldn't be in the compiled code.
367 <         -->
383 >  </target>
384  
369        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370                      classpath="${build.ant.dir}">
371          <param name="matching"    value="^//@.*$"/>
372          <param name="pattern"     value="^//@"/>
373          <param name="replacement" value=""/>
374        </filterreader>
385  
386  
387 +
388 +  <target name="filter-doccheck"
389 +          depends="filter-src">
390 +
391 +    <mkdir dir="${build.filter.doccheck.dir}"/>
392 +
393 +    <copy todir="${build.filter.doccheck.dir}">
394 +      <fileset dir="${build.filter.src.dir}">
395 +        <include name="**/*.html"/>
396 +      </fileset>
397 +    </copy>
398 +
399 +    <property name="generic.declarations"
400 +             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 {}"
401 +    />
402 +
403 +    <copy todir="${build.filter.doccheck.dir}">
404 +      <fileset dir="${build.filter.src.dir}">
405 +        <exclude name="**/*.html"/>
406 +      </fileset>
407 +      <filterchain>
408          <!--
409 <         # The next two filters try to make the source look like
409 >         # These two filters try to make the source look like
410           # something that doccheck can process. The first removes
411           # -source 1.4 assertions and the second adds in a bunch
412           # of single letter public nested marker interfaces so that
413           # the generic type parameters are recognized.
383         #
384         # Currently commented out because doccheck doesn't work. :-(
414           -->
415  
387        <!--
416          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
417                        classpath="${build.ant.dir}">
418            <param name="matching"    value="^\s*assert[\s ].*$"/>
# Line 394 | Line 422
422  
423          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
424                        classpath="${build.ant.dir}">
425 <          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
425 >          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
426            <param name="pattern"     value="$"/>
427            <param name="replacement" value=" ${generic.declarations}"/>
428          </filterreader>
401        -->
429  
430        </filterchain>
431      </copy>
# Line 411 | Line 438
438  
439      <mkdir dir="${build.testcases.dir}"/>
440  
441 + <!--
442 +    <echo>javac ${build.args}</echo>
443 +    <echo>classpath="${test.classpath}"</echo>
444 + -->
445 +
446      <javac srcdir="${test.src.dir}"
447            destdir="${build.testcases.dir}"
448              debug="${build.debug}"
# Line 419 | Line 451
451             source="${build.sourcelevel}"
452               fork="true">
453  
454 +      <compilerarg line="${build.args}"/>
455        <classpath refid="test.classpath"/>
456 <      <bootclasspath refid="javac.bootclasspath"/>
457 <      <compilerarg line="${build.javac.args}"/>
456 >      
457 >      <include name="java/**"/>
458 >      <include name="jsr166/**"/>
459  
460      </javac>
461  
# Line 443 | Line 477
477                      dir="${build.reports.dir}"
478                     fork="true">
479  
480 <      <jvmarg value="${test.bootclasspath.arg}"/>
480 >      <jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
481  
482        <formatter type="xml"/>
483  
484        <batchtest todir="${build.reports.dir}">
485          <fileset dir="${test.src.dir}">
486 <          <include name="**/${testcase}Test.java"/>
486 >          <include name="java/**/${testcase}Test.java"/>
487 >          <include name="jsr166/**/${testcase}Test.java"/>
488          </fileset>
489        </batchtest>
490  
# Line 461 | Line 496
496    <target name="report-tests"
497            depends="run-tests">
498  
499 <    <!-- Sets junit.report.format to frames if Xalan is present,
499 >    <!-- Sets junit.report.format to frames if redirection is present,
500           otherwise sets it to noframes. -->
501      <available property="junit.report.format"
502                    value="frames"
# Line 486 | Line 521
521  
522    <target name="configure-compiler">
523  
524 <    <property name="gjc.version"
490 <             value="2.0"/>
524 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
525  
526 <    <condition property="build.novariance" value="-novariance">
527 <      <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>
526 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
527 >      <istrue value="${build.warnunchecked}"/>
528      </condition>
529  
530 <    <property name="build.novariance"
531 <             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 <
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  
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
537      <!-- Common options in javac invocations -->
538 <    <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>
538 >    <property name="build.args" value="${warnunchecked.arg}"/>
539  
540    </target>
541  
# Line 574 | Line 554
554    </target>
555  
556  
557 <  <target name="configure-emulation">
558 <
579 <    <condition property="build.emulation.true">
580 <      <or>
581 <        <and>
582 <          <os family="windows"/>
583 <          <not>
584 <            <isset property="build.emulation"/>
585 <          </not>
586 <        </and>
587 <        <istrue value="${build.emulation}"/>
588 <      </or>
589 <    </condition>
590 <
591 <  </target>
592 <
593 <
594 <  <target name="configure-tests">
557 >  <target name="configure-tests"
558 >       depends="configure-compiler">
559  
560      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
561      <available property="junit.available"
# Line 600 | Line 564
564      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565            unless="junit.available"/>
566  
567 +    <!-- Xalan -->
568 +    <available property="xalan.available"
569 +               classname="org.apache.xalan.Version"/>
570 +
571 +    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
572 +          unless="xalan.available"/>
573 +
574  
575      <!--
576       ! Bootclasspath munging for testing, so JUnit can test our local
# Line 608 | Line 579
579  
580      <path id="test.classpath">
581        <pathelement location="${product.jar}"/>
582 <      <pathelement location="${build.testcases.dir}"/>
582 >      <pathelement location="${rt.jar}"/>
583        <pathelement location="${junit.jar}"/>
584 +      <pathelement location="${build.testcases.dir}"/>
585      </path>
586  
587 <    <!-- Flatten test classpath into a platform-appropriate string -->
588 <    <property name="test.classpath" refid="test.classpath"/>
587 >    <path id="test.bootclasspath">
588 >      <path refid="test.classpath"/>
589 >    </path>
590  
591 <    <!-- Turn the flattened test classpath into a javac argument -->
592 <    <property name="test.bootclasspath.arg"
593 <             value='-Xbootclasspath/p:${test.classpath}'/>
591 >    <!-- Flatten test classpaths into platform-appropriate strings -->
592 >    <property name="test.classpath"         refid="test.classpath"/>
593 >    <property name="test.bootclasspath"     refid="test.bootclasspath"/>
594  
595    </target>
596  
# Line 625 | Line 598
598  
599    <!-- Anthill targets -->
600  
601 <  <target name="anthill-build"
601 >  <target name="anthill-build">
602 >  
603 >    <!-- Override this in user.properties -->
604 >    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
605 >    
606 >    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
607 >      <arg value="-Xmx256000000"/>
608 >      <!-- classpath of new JVM -->
609 >      <arg value="-classpath"/> <arg path="${java.class.path}"/>
610 >      <!-- location of Ant home directory -->
611 >      <arg value="-Dant.home=${ant.home}"/>
612 >      <!-- the Ant main class -->
613 >      <arg value="org.apache.tools.ant.Main"/>
614 >      <!-- The build file -->
615 >      <arg value="-buildfile"/>  <arg value="build.xml"/>
616 >      <!-- the target to build on the new Ant instance -->
617 >      <arg value="-DJAVA_HOME=${tiger.home}"/>
618 >      <arg value="do-anthill-build"/>
619 >    </exec>
620 >  </target>
621 >  
622 >  <target name="do-anthill-build"
623            depends="jar, test, docs, dist-docs"/>
624  
625    <target name="anthill-publish">
# Line 648 | Line 642
642    </target>
643  
644  
645 +  <target name="ng" depends="test">
646 +    <java classname="SuperfluousAbstract" fork="true">
647 +
648 +      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
649 +
650 +    </java>
651 +  </target>
652 +
653 +
654   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines