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.57 by tim, Mon Sep 15 14:07:36 2003 UTC vs.
Revision 1.58 by tim, Mon Sep 15 15:13:35 2003 UTC

# Line 39 | Line 39
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"/>
42 >  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43 >  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
44  
45    <!-- Source locations -->
46    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 77 | Line 78
78  
79      <mkdir dir="${build.classes.dir}"/>
80  
80 <!--
81    <echo>javac ${build.args}</echo>
82 -->
83
81      <javac srcdir="${prepare.src.dir}"
82            destdir="${build.classes.dir}"
83              debug="${build.debug}"
# Line 89 | Line 86
86             source="${build.sourcelevel}"
87               fork="true">
88  
89 <      <compilerarg    line="${build.args}"/>
89 >      <compilerarg line="${build.args}"/>
90  
91      </javac>
92  
# Line 111 | Line 108
108            description="Reports on style errors in Java source (verbose, mostly chaff)">
109  
110      <taskdef resource="checkstyletask.properties"
111 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
111 >            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
112  
113 <    <checkstyle>
114 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
113 >    <mkdir dir="${build.checkstyle.dir}"/>
114 >    
115 >    <checkstyle config="etc/checkstyle/sun_checks.xml"
116 >       failOnViolation="false">
117 >      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
118        <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119      </checkstyle>
120 +    
121 +    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
122 +          out="${build.checkstyle.dir}/checkstyle-report.html"
123 +        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
124  
125    </target>
126  
# Line 131 | Line 135
135      <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
136           docletpath="${lib.dir}/doccheck.jar"
137              destdir="${build.doccheck.dir}">
138 <      <packageset dir="${build.filter.doccheck.dir}"/>
138 >      <packageset dir="${build.dc-filter.dir}"/>
139      </javadoc>
140  
141      <echo>DocCheck output is in ${build.doccheck.dir}</echo>
# Line 153 | Line 157
157  
158        <tag name="revised" description="Last revised:"/>
159        <tag name="spec"    description="Specified by:"/>
156      <tag name="editor"  description="Last edited by:"/>
157      <tag name="fixme"   description="FIX ME:"/>
160  
161        <packageset dir="${build.filter.src.dir}"/>
162  
# Line 202 | Line 204
204    </target>
205  
206  
205  <target name="strip"
206          depends="init, configure-compiler"
207          description="Strip generics from java source (not working yet)">
208
209    <mkdir dir="${build.stripped.dir}"/>
210
211    <!--
212     # javac -s doesn't reliably generate compilable code. It generates
213     # bridge methods (marked as "synthetic") that can have identical
214     # signatures to existing methods except for the return value.
215     -->
216    <javac srcdir="${src.dir}"
217          destdir="${build.stripped.dir}"
218            debug="${build.debug}"
219       debuglevel="${build.debuglevel}"
220      deprecation="${build.deprecation}"
221           source="${build.sourcelevel}"
222             fork="true">
223
224      <compilerarg    line="${build.args} -s"/>
225
226    </javac>
227
228  </target>
229
230
207    <target name="dist"
208            depends="init, dist-clean, dist-jar, dist-docs"
209            description="Puts all distributable products in single hierarchy"/>
210  
211 +
212    <target name="release"
213            depends="dist"
214            description="Puts entire CVS tree, plus distribution productions, in a jar">
215  
239 <!--
240    #keep build dir? - dl
241    <delete dir="${build.dir}"/>
242 -->
216      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
217  
218      <jar basedir="${basedir}" destfile="${release.jar}">
219 +      <!-- <exclude name="build/**"/> -->
220        <exclude name="${release.jar}"/>
221        <exclude name="user.properties"/>
222        <exclude name="etc/notes/**"/>
223 +      <exclude name="src/emulation/**"/>
224        <exclude name="**/SyntaxTest.java"/>
225 +      <exclude name="**/SuperfluousAbstract.java"/>
226      </jar>
227  
228    </target>
# Line 383 | Line 359
359    </target>
360  
361  
386
387
362    <target name="filter-doccheck"
363            depends="filter-src">
364  
365 <    <mkdir dir="${build.filter.doccheck.dir}"/>
365 >    <mkdir dir="${build.dc-filter.dir}"/>
366  
367 <    <copy todir="${build.filter.doccheck.dir}">
367 >    <copy todir="${build.dc-filter.dir}">
368        <fileset dir="${build.filter.src.dir}">
369          <include name="**/*.html"/>
370        </fileset>
# Line 400 | Line 374
374               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 {}"
375      />
376  
377 <    <copy todir="${build.filter.doccheck.dir}">
377 >    <copy todir="${build.dc-filter.dir}">
378        <fileset dir="${build.filter.src.dir}">
379          <exclude name="**/*.html"/>
380        </fileset>
# Line 438 | Line 412
412  
413      <mkdir dir="${build.testcases.dir}"/>
414  
441 <!--
442    <echo>javac ${build.args}</echo>
443    <echo>classpath="${test.classpath}"</echo>
444 -->
445
415      <javac srcdir="${test.src.dir}"
416            destdir="${build.testcases.dir}"
417              debug="${build.debug}"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines