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.1 by tim, Mon Oct 7 04:07:37 2002 UTC vs.
Revision 1.5 by tim, Sun Dec 8 19:06:09 2002 UTC

# Line 2 | Line 2
2  
3    <description>
4      Build file for JSR-166
5 +
6 +    Note that junit.jar must be in ${ant.home}/lib for the
7 +    test target to work. [FIXME: This should be automatically
8 +    enforced by this build file by failing with a message if
9 +    junit.jar is not in the right place.]
10    </description>
11  
12    <!-- Compilation options -->
13    <property name="build.debug"          value="true"/>
14    <property name="build.debuglevel"     value="source,lines,vars"/>
15    <property name="build.deprecation"    value="false"/>
16 <  <property name="build.sourcelevel"    value="1.4"/>
16 >  <property name="build.sourcelevel"    value="1.5"/>
17  
18    <!-- Build locations -->
19    <property name="build.dir"            location="build"/>
# Line 35 | Line 40
40    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
41  
42    <property name="gj.compiler.args"
43 <           value='-J-Xbootclasspath/p:${javac.jar} -bootclasspath ${collect.jar};${rt.jar} -gj'
43 >           value='-J-Xbootclasspath/p:${javac.jar}'
44    />
45  
46 +  <path id="gj.compiler.bootclasspath">
47 +    <pathelement location="${collect.jar}"/>
48 +    <pathelement location="${rt.jar}"/>
49 +  </path>
50 +
51 +  <path id="test.classpath">
52 +    <pathelement location="${product.jar}"/>
53 +  </path>
54 +
55  
56    <target name="compile">
57      <mkdir dir="${build.classes.dir}"/>
# Line 49 | Line 63
63             source="${build.sourcelevel}"
64               fork="true">
65  
66 +      <bootclasspath refid="gj.compiler.bootclasspath"/>
67        <compilerarg line="${gj.compiler.args}"/>
68  
69        <!-- need this because srcdir is basedir! -->
# Line 79 | Line 94
94  
95        <tag name="revised" description="Last revised:"/>
96        <tag name="spec" description="Specified by:"/>
97 <
97 >      <tag name="editor" description="Last edited by:"/>
98 >      <tag name="fixme" description="FIX ME:"/>
99        <packageset dir="${build.filter.src.dir}">
100          <include name="java/**"/>
101        </packageset>
# Line 160 | Line 176
176             source="${build.sourcelevel}"
177               fork="true">
178  
179 +      <bootclasspath refid="gj.compiler.bootclasspath"/>
180        <compilerarg line="${gj.compiler.args}"/>
181 <
165 <      <classpath id="test.classpath">
166 <        <pathelement location="${product.jar}"/>
167 <        <pathelement location="${junit.jar}"/>
168 <      </classpath>
169 <
181 >      <classpath refid="test.classpath"/>
182        <include name="**/*Test.java"/>
183  
184      </javac>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines