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.30 by tim, Wed May 28 14:19:25 2003 UTC vs.
Revision 1.35 by tim, Thu May 29 15:53:58 2003 UTC

# Line 7 | Line 7
7    Usage: ant [target]
8  
9    User-specific settings are read from user.properties.
10 <  See user.properties.sample for examples.
10 >  See user.properties.sample for an explanation of some useful settings.
11   ------------------------------------------------------------------------------
12    </description>
13  
# Line 54 | Line 54
54  
55    <!-- Jar locations -->
56    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
57  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
58  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
57    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59  
60  
61  
64  <!--
65   ! Bootclasspath munging for source compilation.
66   -->
67
68  <path id="javac.bootclasspath.prefix">
69    <!-- <pathelement location="${src.dir}"/> -->
70    <pathelement location="${javac.jar}"/>
71  </path>
72
73  <path id="javac.bootclasspath">
74    <!-- <pathelement location="${src.dir}"/> -->
75    <pathelement location="${collect.jar}"/>
76    <pathelement location="${rt.jar}"/>
77  </path>
78
79  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
80  <property name="javac.bootclasspath.prefix" refid="javac.bootclasspath.prefix"/>
81
82  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
83  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
84
85
86
87  <!--
88   ! Bootclasspath munging for testing, so JUnit can test our local
89   ! modifications to java.*.
90   -->
91
92  <path id="test.classpath">
93    <pathelement location="${product.jar}"/>
94    <pathelement location="${build.testcases.dir}"/>
95    <pathelement location="${junit.jar}"/>
96  </path>
97
98  <!-- Flatten test classpath into a platform-appropriate string -->
99  <property name="test.classpath" refid="test.classpath"/>
100
101  <!-- Turn the flattened test classpath into a javac argument -->
102  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
103
104
105
62    <!-- Files excluded from emulation and dist-docs -->
63    <patternset id="emulation.excludes">
64      <exclude name="java/util/Random.*"/>
# Line 114 | Line 70
70    <!-- Main targets -->
71  
72    <target name="compile"
73 <          depends="init"
73 >          depends="init, configure-compiler, prepare-src"
74            description="Compiles main sources to build folder">
75  
76 +    <property name="prepare.src.dir" value="${src.dir}"/>
77 +
78      <mkdir dir="${build.classes.dir}"/>
79  
80 <    <javac srcdir="${src.dir}"
80 >    <javac srcdir="${prepare.src.dir}"
81            destdir="${build.classes.dir}"
82              debug="${build.debug}"
83         debuglevel="${build.debuglevel}"
# Line 128 | Line 86
86               fork="true">
87  
88        <bootclasspath refid="javac.bootclasspath"/>
89 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
89 >      <compilerarg line="${build.javac.args}"/>
90  
91      </javac>
92  
# Line 136 | Line 94
94  
95  
96    <target name="jar"
97 <          depends="check-emulation, init-jar, native-jar, emulation-jar"
97 >          depends="configure-emulation, init-jar, native-jar, emulation-jar"
98            description="Builds library jar from compiled sources"/>
99  
100  
101    <target name="test"
102 <          depends="init, check-junit, report-tests"
102 >          depends="init, configure-tests, report-tests"
103            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
104  
105  
# Line 200 | Line 158
158    </target>
159  
160  
203  <!--
204   # javac -s doesn't reliably generate compilable code. It generates
205   # bridge methods (marked as "synthetic") that can have identical
206   # signatures to existing methods except for the return value.
207   -->
161    <target name="strip"
162 <          depends="init">
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
169 +     # bridge methods (marked as "synthetic") that can have identical
170 +     # signatures to existing methods except for the return value.
171 +     -->
172      <javac srcdir="${src.dir}"
173            destdir="${build.stripped.dir}"
174              debug="${build.debug}"
# Line 219 | Line 178
178               fork="true">
179  
180        <bootclasspath refid="javac.bootclasspath"/>
181 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
181 >      <compilerarg line="${build.javac.args} -s"/>
182  
183      </javac>
184  
# Line 271 | Line 230
230  
231    <!-- Internal targets -->
232  
274  <target name="set-warnings-if" if="build.warnings">
275
276    <property name="build.warnings.option" value="-warnunchecked"/>
277
278  </target>
279
233  
234 <  <target name="set-warnings-unless" unless="build.warnings">
282 <
283 <    <property name="build.warnings.option" value=""/>
284 <
285 <  </target>
286 <
287 <
288 <  <target name="init"
289 <          depends="set-warnings-if, set-warnings-unless">
234 >  <target name="init">
235  
236      <!-- Version is kept in a separate file -->
237      <loadfile property="version" srcFile="version.properties"/>
# Line 314 | Line 259
259  
260  
261    <target name="compile-emulation"
262 <          depends="init"
262 >          depends="init, configure-compiler"
263            if="build.emulation.true">
264  
265      <mkdir dir="${build.emulation.dir}"/>
# Line 328 | Line 273
273               fork="true">
274  
275        <bootclasspath refid="javac.bootclasspath"/>
276 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
276 >      <compilerarg line="${build.javac.args}"/>
277  
278      </javac>
279  
# Line 378 | Line 323
323  
324      <copy todir="${build.filter.src.dir}">
325        <fileset dir="${src.dir}">
326 +        <include name="**/*.html"/>
327 +      </fileset>
328 +    </copy>
329 +
330 +    <copy todir="${build.filter.src.dir}">
331 +      <fileset dir="${src.dir}">
332 +        <exclude name="**/*.html"/>
333          <patternset refid="emulation.excludes"/>
334        </fileset>
335        <filterchain>
# Line 429 | Line 381
381             source="${build.sourcelevel}"
382               fork="true">
383  
432      <bootclasspath refid="javac.bootclasspath"/>
433      <compilerarg line="${javac.args} ${build.warnings.option}"/>
384        <classpath refid="test.classpath"/>
385 +      <bootclasspath refid="javac.bootclasspath"/>
386 +      <compilerarg line="${build.javac.args}"/>
387  
388      </javac>
389  
# Line 453 | Line 405
405                      dir="${build.reports.dir}"
406                     fork="true">
407  
408 <      <jvmarg value="${test.javac.args}"/>
408 >      <jvmarg value="${test.bootclasspath.arg}"/>
409  
410        <formatter type="xml"/>
411  
# Line 494 | Line 446
446    </target>
447  
448  
449 <  <target name="check-junit">
449 >  <target name="configure-compiler">
450  
451 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
452 <    <available property="junit.available"
501 <               classname="junit.framework.Protectable"/>
451 >    <property name="gjc.version"
452 >             value="2.0"/>
453  
454 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
455 <          unless="junit.available"/>
454 >    <condition property="build.novariance" value="-novariance">
455 >      <and>
456 >        <equals arg1="${gjc.version}" arg2="2.0"/>
457 >        <or>
458 >          <not><isset property="gjc.novariance"/></not>
459 >          <istrue value="${gjc.novariance}"/>
460 >        </or>
461 >      </and>
462 >    </condition>
463 >
464 >    <property name="build.novariance"
465 >             value=""/>
466 >
467 >    <property name="gjc.dir"
468 >             value="${lib.dir}/gjc"/>
469 >
470 >    <property name="javac.jar"
471 >          location="${gjc.dir}/${gjc.version}/javac.jar"/>
472 >
473 >    <property name="collect.jar"
474 >          location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
475 >
476 >
477 >    <condition property="build.warnunchecked" value="-warnunchecked">
478 >      <istrue value="${gjc.warnunchecked}"/>
479 >    </condition>
480 >
481 >    <property name="build.warnunchecked" value=""/>
482 >
483 >    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
484 >      <istrue value="${build.nothreads}"/>
485 >    </condition>
486 >
487 >
488 >    <!--
489 >     ! Bootclasspath munging for source compilation.
490 >     -->
491 >
492 >    <path id="javac.bootclasspath.prefix">
493 >      <!-- <pathelement location="${src.dir}"/> -->
494 >      <pathelement location="${javac.jar}"/>
495 >    </path>
496 >
497 >    <path id="javac.bootclasspath">
498 >      <!-- <pathelement location="${src.dir}"/> -->
499 >      <pathelement location="${collect.jar}"/>
500 >      <pathelement location="${rt.jar}"/>
501 >    </path>
502 >
503 >    <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
504 >    <property name="javac.bootclasspath.prefix"
505 >             refid="javac.bootclasspath.prefix"/>
506 >
507 >    <!-- Turn the flattened bootclasspath prefix into a javac argument -->
508 >    <property name="build.bootclasspath.arg"
509 >             value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
510 >
511 >    <!-- Flatten bootclasspath for trace message -->
512 >    <property name="javac.bootclasspath"
513 >             refid="javac.bootclasspath"/>
514 >
515 >    <!-- Common options in javac invocations -->
516 >    <property name="build.javac.args"
517 >             value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
518 >
519 >    <echo>javac ${build.javac.args}</echo>
520 >    <echo>bootclasspath=${javac.bootclasspath}</echo>
521 >
522 >  </target>
523 >
524 >
525 >  <target name="prepare-src"
526 >          depends="configure-compiler"
527 >          if="prepare.src.dir">
528 >
529 >    <mkdir dir="${prepare.src.dir}"/>
530 >    <copy todir="${prepare.src.dir}">
531 >      <fileset dir="${src.dir}">
532 >        <exclude name="java/lang/**"/>
533 >      </fileset>
534 >    </copy>
535  
536    </target>
537  
538  
539 <  <target name="check-emulation">
539 >  <target name="configure-emulation">
540 >
541      <condition property="build.emulation.true">
542        <or>
543 <        <isset property="build.emulation"/>
544 <        <os family="windows"/>
543 >        <and>
544 >          <os family="windows"/>
545 >          <not>
546 >            <isset property="build.emulation"/>
547 >          </not>
548 >        </and>
549 >        <istrue value="${build.emulation}"/>
550        </or>
551      </condition>
552 +
553 +  </target>
554 +
555 +
556 +  <target name="configure-tests">
557 +
558 +    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
559 +    <available property="junit.available"
560 +               classname="junit.framework.Protectable"/>
561 +
562 +    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
563 +          unless="junit.available"/>
564 +
565 +
566 +    <!--
567 +     ! Bootclasspath munging for testing, so JUnit can test our local
568 +     ! modifications to java.*.
569 +     -->
570 +
571 +    <path id="test.classpath">
572 +      <pathelement location="${product.jar}"/>
573 +      <pathelement location="${build.testcases.dir}"/>
574 +      <pathelement location="${junit.jar}"/>
575 +    </path>
576 +
577 +    <!-- Flatten test classpath into a platform-appropriate string -->
578 +    <property name="test.classpath" refid="test.classpath"/>
579 +
580 +    <!-- Turn the flattened test classpath into a javac argument -->
581 +    <property name="test.bootclasspath.arg"
582 +             value='-Xbootclasspath/p:${test.classpath}'/>
583 +
584    </target>
585  
586  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines