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.8 by tim, Wed Dec 11 04:43:23 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 16 | Line 21
21    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
22    <property name="build.lib.dir"        location="${build.dir}/lib"/>
23    <property name="build.ant.dir"        location="${build.dir}/ant"/>
24 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
24 >  <property name="build.pubdocs.dir"    location="${build.dir}/javadocs"/>
25 >  <property name="build.privdocs.dir"   location="${build.dir}/privdocs"/>
26    <property name="build.reports.dir"    location="${build.dir}/reports"/>
27    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
28  
# Line 35 | Line 41
41    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
42  
43    <property name="gj.compiler.args"
44 <           value='-J-Xbootclasspath/p:${javac.jar} -bootclasspath ${collect.jar};${rt.jar} -gj'
44 >           value='-J-Xbootclasspath/p:${javac.jar} -deprecation -warnunchecked'
45    />
46  
47 +  <path id="gj.compiler.bootclasspath">
48 +    <pathelement location="${collect.jar}"/>
49 +    <pathelement location="${rt.jar}"/>
50 +  </path>
51 +
52 +  <path id="test.classpath">
53 +    <pathelement location="${product.jar}"/>
54 +  </path>
55 +
56  
57    <target name="compile">
58      <mkdir dir="${build.classes.dir}"/>
# Line 49 | Line 64
64             source="${build.sourcelevel}"
65               fork="true">
66  
67 +      <bootclasspath refid="gj.compiler.bootclasspath"/>
68        <compilerarg line="${gj.compiler.args}"/>
69  
70        <!-- need this because srcdir is basedir! -->
# Line 68 | Line 84
84  
85    <target name="test" depends="report-tests"/>
86  
87 +  <target name="docs" depends="public-docs, private-docs"/>
88 +
89 +  <target name="public-docs" depends="clean-docs, filter-src">
90 +    <delete dir="${build.pubdocs.dir}"/>
91 +    <mkdir dir="${build.pubdocs.dir}"/>
92 +    <javadoc destdir="${build.pubdocs.dir}"
93 +                link="http://java.sun.com/j2se/1.4.1/docs/api"
94 +            overview="${src.dir}/intro.html"
95 +              source="${build.sourcelevel}">
96 +
97 +      <packageset dir="${build.filter.src.dir}">
98 +        <include name="java/**"/>
99 +      </packageset>
100 +
101 +    </javadoc>
102 +  </target>
103  
104 <  <target name="docs" depends="filter-src">
105 <    <delete dir="${build.javadocs.dir}"/>
106 <    <mkdir dir="${build.javadocs.dir}"/>
107 <    <javadoc destdir="${build.javadocs.dir}"
104 >
105 >  <target name="private-docs" depends="clean-docs, filter-src">
106 >    <delete dir="${build.privdocs.dir}"/>
107 >    <mkdir dir="${build.privdocs.dir}"/>
108 >    <javadoc destdir="${build.privdocs.dir}"
109                  link="http://java.sun.com/j2se/1.4.1/docs/api"
110              overview="${src.dir}/intro.html"
111                source="${build.sourcelevel}">
112  
113        <tag name="revised" description="Last revised:"/>
114        <tag name="spec" description="Specified by:"/>
115 <
115 >      <tag name="editor" description="Last edited by:"/>
116 >      <tag name="fixme" description="FIX ME:"/>
117        <packageset dir="${build.filter.src.dir}">
118          <include name="java/**"/>
119        </packageset>
# Line 88 | Line 122
122    </target>
123  
124  
125 <  <target name="clean">
125 >  <target name="clean" depends="clean-docs">
126      <delete dir="${build.dir}"/>
127      <delete dir="${build.classes.dir}"/>
128      <delete dir="${build.lib.dir}"/>
129 <    <delete dir="${build.javadocs.dir}"/>
129 >  </target>
130 >
131 >
132 >  <target name="clean-docs">
133 >    <delete dir="${build.filter.src.dir}"/>
134 >    <delete dir="${build.pubdocs.dir}"/>
135 >    <delete dir="${build.privdocs.dir}"/>
136    </target>
137  
138  
# Line 160 | Line 200
200             source="${build.sourcelevel}"
201               fork="true">
202  
203 +      <bootclasspath refid="gj.compiler.bootclasspath"/>
204        <compilerarg line="${gj.compiler.args}"/>
205 <
165 <      <classpath id="test.classpath">
166 <        <pathelement location="${product.jar}"/>
167 <        <pathelement location="${junit.jar}"/>
168 <      </classpath>
169 <
205 >      <classpath refid="test.classpath"/>
206        <include name="**/*Test.java"/>
207  
208      </javac>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines