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.9 by tim, Wed Dec 11 05:04:04 2002 UTC vs.
Revision 1.15 by tim, Thu Dec 12 23:50:31 2002 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="jar">
2  
3    <description>
4 +
5      Build file for JSR-166
6  
7      Note that junit.jar must be in ${ant.home}/lib for the
8      test target to work. [FIXME: This should be automatically
9      enforced by this build file by failing with a message if
10      junit.jar is not in the right place.]
11 +
12    </description>
13  
14    <!-- Compilation options -->
15 +  <property name="build.sourcelevel"    value="1.5"/>
16    <property name="build.debug"          value="true"/>
17    <property name="build.debuglevel"     value="source,lines,vars"/>
18    <property name="build.deprecation"    value="false"/>
19 <  <property name="build.sourcelevel"    value="1.5"/>
19 >  <!--
20 >  <property name="build.warnings"       value="true"/>
21 >  -->
22  
23    <!-- Build locations -->
24    <property name="build.dir"            location="build"/>
# Line 43 | Line 48
48    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
49    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
50  
51 <  <property name="gj.compiler.args"
47 <           value='-J-Xbootclasspath/p:${javac.jar} -deprecation -warnunchecked'
48 <  />
51 >  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
52  
53 <  <path id="gj.compiler.bootclasspath">
53 >  <path id="javac.bootclasspath">
54      <pathelement location="${collect.jar}"/>
55      <pathelement location="${rt.jar}"/>
56    </path>
# Line 57 | Line 60
60    </path>
61  
62  
63 <  <target name="compile">
63 >  <!-- Main targets -->
64 >
65 >  <target name="compile" depends="init"
66 >          description="Compiles all sources to build folder">
67      <mkdir dir="${build.classes.dir}"/>
68      <javac srcdir="${src.dir}"
69            destdir="${build.classes.dir}"
# Line 67 | Line 73
73             source="${build.sourcelevel}"
74               fork="true">
75  
76 <      <bootclasspath refid="gj.compiler.bootclasspath"/>
77 <      <compilerarg line="${gj.compiler.args}"/>
76 >      <bootclasspath refid="javac.bootclasspath"/>
77 >      <compilerarg line="${javac.args} ${build.warnings.option}"/>
78  
79        <!-- need this because srcdir is basedir! -->
80        <include name="java/**/*.java"/>
# Line 77 | Line 83
83    </target>
84  
85  
86 <  <target name="jar" depends="compile">
86 >  <target name="jar" depends="compile"
87 >          description="Builds library jar from compiled sources">
88      <mkdir dir="${build.lib.dir}"/>
89      <jar basedir="${build.classes.dir}"
90          destfile="${product.jar}"
# Line 85 | Line 92
92    </target>
93  
94  
95 <  <target name="test" depends="report-tests"/>
95 >  <target name="test" depends="init, report-tests"
96 >          description="Runs all tests"/>
97 >
98  
99 +  <target name="checkstyle" depends="init, clean-filtered-src, filter-src">
100 +    <taskdef resource="checkstyletask.properties"
101 +            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
102 +
103 +    <checkstyle>
104 +      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
105 +    </checkstyle>
106 +  </target>
107  
108 <  <target name="docs" depends="clean-filtered-src, filter-src"
108 >  <target name="docs" depends="init, clean-filtered-src, filter-src"
109            description="Builds javadocs with custom tags to build folder">
110      <delete dir="${build.javadocs.dir}"/>
111      <mkdir dir="${build.javadocs.dir}"/>
# Line 109 | Line 126
126    </target>
127  
128  
129 <  <target name="dist-docs" depends="clean-filtered-src, filter-src"
113 <          description="Builds javadocs without custom tags to dist folder">
114 <    <delete dir="${dist.javadocs.dir}"/>
115 <    <mkdir dir="${dist.javadocs.dir}"/>
116 <    <javadoc destdir="${dist.javadocs.dir}"
117 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
118 <            overview="${src.dir}/intro.html"
119 <              source="${build.sourcelevel}">
129 >  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"/>
130  
121      <packageset dir="${build.filter.src.dir}">
122        <include name="java/**"/>
123      </packageset>
131  
132 <    </javadoc>
132 >  <target name="clean"
133 >          description="Removes all build products">
134 >    <delete dir="${build.dir}"/>
135 >    <delete dir="${build.classes.dir}"/>
136 >    <delete dir="${build.lib.dir}"/>
137    </target>
138  
139  
140 <  <target name="dist" depends="clean, jar, dist-docs">
141 <    <!-- nothing to do here yet -->
140 >  <target name="dist-clean"
141 >          description="Removes all build and distribution products">
142 >    <delete dir="${dist.dir}"/>
143    </target>
144  
145  
146 <  <target name="clean">
147 <    <delete dir="${build.dir}"/>
148 <    <delete dir="${build.classes.dir}"/>
149 <    <delete dir="${build.lib.dir}"/>
146 >  <!-- Anthill targets -->
147 >
148 >  <!-- Should really run the tests instead of just the jar target -->
149 >  <target name="anthill-build" depends="jar, docs, dist-docs"
150 >          description="Build the jar and both the external and internal docs"/>
151 >
152 >  <target name="anthill-publish">
153 >    <copy todir="${deployDir}/docs/private">
154 >      <fileset dir="${build.javadocs.dir}"/>
155 >    </copy>
156 >    <copy todir="${deployDir}/docs/public">
157 >      <fileset dir="${dist.javadocs.dir}"/>
158 >    </copy>
159    </target>
160  
161  
162 <  <target name="dist-clean" depends="clean">
163 <    <delete dir="${dist.dir}"/>
162 >  <!-- Internal targets -->
163 >
164 >  <target name="set-warnings-if" if="build.warnings">
165 >    <property name="build.warnings.option" value="-warnunchecked"/>
166 >  </target>
167 >
168 >  <target name="set-warnings-unless" unless="build.warnings">
169 >    <property name="build.warnings.option" value=""/>
170 >  </target>
171 >
172 >  <target name="init" depends="set-warnings-if, set-warnings-unless">
173 >    <!-- Version is kept in a separate file -->
174 >    <loadfile property="version" srcFile="version.properties"/>
175 >    <echo>Building JSR-166 version ${version}</echo>
176    </target>
177  
178  
# Line 148 | Line 181
181    </target>
182  
183  
184 <  <!-- Internal targets used by docs target -->
184 >  <target name="dist-jar" depends="clean, jar">
185 >    <copy file="${product.jar}" todir="${dist.dir}"/>
186 >  </target>
187  
188 <  <target name="compile-ant">
188 >
189 >  <target name="dist-docs" depends="clean-filtered-src, filter-src"
190 >          description="Builds javadocs without custom tags to dist folder">
191 >    <delete dir="${dist.javadocs.dir}"/>
192 >    <mkdir dir="${dist.javadocs.dir}"/>
193 >    <javadoc destdir="${dist.javadocs.dir}"
194 >                link="http://java.sun.com/j2se/1.4.1/docs/api"
195 >            overview="${src.dir}/intro.html"
196 >              source="${build.sourcelevel}">
197 >
198 >      <packageset dir="${build.filter.src.dir}">
199 >        <include name="java/**"/>
200 >      </packageset>
201 >
202 >    </javadoc>
203 >  </target>
204 >
205 >
206 >  <target name="compile-ant-filter">
207      <mkdir dir="${build.ant.dir}"/>
208      <javac srcdir="${ant.src.dir}"
209            destdir="${build.ant.dir}"
# Line 159 | Line 212
212    </target>
213  
214  
215 <  <target name="filter-src" depends="compile-ant">
215 >  <target name="filter-src" depends="compile-ant-filter">
216      <mkdir dir="${build.filter.src.dir}"/>
217      <copy todir="${build.filter.src.dir}">
218        <fileset dir="${src.dir}">
219 <        <include name="**/*.java"/>
219 >        <include name="java/**/*.java"/>
220        </fileset>
221        <filterchain>
222          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
# Line 200 | Line 253
253    </target>
254  
255  
203  <!-- Internal targets used by test target -->
204
256    <target name="compile-tests" depends="jar">
257      <mkdir dir="${build.testcases.dir}"/>
258      <javac srcdir="${test.src.dir}"
# Line 212 | Line 263
263             source="${build.sourcelevel}"
264               fork="true">
265  
266 <      <bootclasspath refid="gj.compiler.bootclasspath"/>
267 <      <compilerarg line="${gj.compiler.args}"/>
266 >      <bootclasspath refid="javac.bootclasspath"/>
267 >      <compilerarg line="${javac.args} ${build.warnings.option}"/>
268        <classpath refid="test.classpath"/>
269        <include name="**/*Test.java"/>
270  
271      </javac>
272    </target>
273  
274 +
275    <target name="run-tests" depends="compile-tests">
276      <mkdir dir="${build.reports.dir}"/>
277      <junit printsummary="true"
278               showoutput="true"
279            errorProperty="junit.failed"
280          failureProperty="junit.failed"
281 <                    dir="${build.reports.dir}">
281 >                    dir="${build.reports.dir}"
282 >                   fork="true">
283 >
284 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
285  
286        <classpath>
287 <        <path refid="test.classpath"/>
287 >        <!-- <path refid="test.classpath"/> -->
288          <pathelement location="${build.testcases.dir}"/>
289        </classpath>
290  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines