| 22 |
|
|
| 23 |
|
<!-- Compilation options --> |
| 24 |
|
<property name="build.sourcelevel" value="1.5"/> |
| 25 |
– |
<property name="build.docsourcelevel" value="1.4"/> |
| 25 |
|
<property name="build.debug" value="true"/> |
| 26 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
| 27 |
|
<property name="build.deprecation" value="false"/> |
| 30 |
|
<property name="build.dir" location="build"/> |
| 31 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
| 32 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
| 33 |
+ |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
| 34 |
|
<property name="build.lib.dir" location="${build.dir}/lib"/> |
| 35 |
– |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
| 35 |
|
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
| 37 |
– |
<property name="build.sinjdocs.dir" location="${build.dir}/sinjdocs"/> |
| 38 |
– |
<property name="build.stripped.dir" location="${build.dir}/stripped"/> |
| 36 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
| 37 |
< |
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
| 38 |
< |
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
| 39 |
< |
<property name="build.dc-filter.dir" location="${build.dir}/filterdocchk"/> |
| 40 |
< |
<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/> |
| 37 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
| 38 |
> |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
| 39 |
> |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
| 40 |
> |
|
| 41 |
> |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
| 42 |
> |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
| 43 |
> |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
| 44 |
|
|
| 45 |
|
<!-- Source locations --> |
| 46 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
| 47 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
| 48 |
< |
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
| 49 |
< |
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
| 48 |
> |
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
| 49 |
> |
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
| 50 |
> |
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
| 51 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
| 52 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
| 53 |
+ |
<property name="topsrc.dir" location="${basedir}/src"/> |
| 54 |
+ |
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
| 55 |
+ |
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
| 56 |
|
|
| 57 |
|
<!-- Distribution locations --> |
| 58 |
|
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
| 59 |
+ |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
| 60 |
+ |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
| 61 |
|
|
| 62 |
|
<!-- Jar locations --> |
| 63 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
| 64 |
+ |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
| 65 |
+ |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
| 66 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
| 59 |
– |
<property name="rt.jar" location="${java.home}/lib/rt.jar"/> |
| 60 |
– |
<property name="sinjdoc.jar" location="${lib.dir}/sinjdoc.jar"/> |
| 67 |
|
|
| 68 |
+ |
<!-- Bootclasspath argument --> |
| 69 |
+ |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
| 70 |
|
|
| 71 |
< |
<!-- Files excluded from dist-docs --> |
| 72 |
< |
<patternset id="docs.exclusion"> |
| 73 |
< |
<exclude name="java/util/Random.*"/> |
| 74 |
< |
<exclude name="sun/misc/Unsafe.*"/> |
| 75 |
< |
</patternset> |
| 76 |
< |
|
| 71 |
> |
<!-- Test classpath --> |
| 72 |
> |
<path id="test.classpath"> |
| 73 |
> |
<pathelement location="${build.testcases.dir}"/> |
| 74 |
> |
<pathelement location="${junit.jar}"/> |
| 75 |
> |
</path> |
| 76 |
> |
|
| 77 |
> |
<!-- ALoops classpath --> |
| 78 |
> |
<path id="loops.classpath"> |
| 79 |
> |
<pathelement location="${build.loops.dir}"/> |
| 80 |
> |
</path> |
| 81 |
|
|
| 82 |
|
|
| 83 |
|
<!-- Main targets --> |
| 84 |
|
|
| 85 |
+ |
|
| 86 |
|
<target name="compile" |
| 87 |
< |
depends="init, configure-compiler, prepare-src" |
| 87 |
> |
depends="init, configure-compiler" |
| 88 |
|
description="Compiles main sources to build folder"> |
| 89 |
|
|
| 77 |
– |
<property name="prepare.src.dir" value="${src.dir}"/> |
| 78 |
– |
|
| 90 |
|
<mkdir dir="${build.classes.dir}"/> |
| 91 |
|
|
| 92 |
< |
<javac srcdir="${prepare.src.dir}" |
| 92 |
> |
<javac srcdir="${src.dir}" |
| 93 |
|
destdir="${build.classes.dir}" |
| 94 |
|
debug="${build.debug}" |
| 95 |
|
debuglevel="${build.debuglevel}" |
| 97 |
|
source="${build.sourcelevel}" |
| 98 |
|
fork="true"> |
| 99 |
|
|
| 100 |
+ |
<include name="**/*.java"/> |
| 101 |
+ |
<compilerarg value="-XDignore.symbol.file"/> |
| 102 |
+ |
|
| 103 |
+ |
<!-- |
| 104 |
+ |
<exclude name="java/lang/**"/> |
| 105 |
|
<compilerarg line="${build.args}"/> |
| 106 |
+ |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
| 107 |
+ |
--> |
| 108 |
|
|
| 109 |
|
</javac> |
| 110 |
|
|
| 111 |
|
</target> |
| 112 |
|
|
| 113 |
|
|
| 96 |
– |
<target name="jar" |
| 97 |
– |
depends="init-jar, native-jar" |
| 98 |
– |
description="Builds library jar from compiled sources"/> |
| 99 |
– |
|
| 114 |
|
|
| 115 |
< |
<target name="test" |
| 116 |
< |
depends="init, configure-tests, report-tests" |
| 117 |
< |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
| 115 |
> |
<target name="jar" |
| 116 |
> |
depends="compile" |
| 117 |
> |
description="Builds library jar from compiled sources"> |
| 118 |
|
|
| 119 |
+ |
<mkdir dir="${build.lib.dir}"/> |
| 120 |
|
|
| 121 |
< |
<target name="checkstyle" |
| 122 |
< |
depends="filter-src" |
| 123 |
< |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
| 109 |
< |
|
| 110 |
< |
<taskdef resource="checkstyletask.properties" |
| 111 |
< |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
| 112 |
< |
|
| 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"/> |
| 121 |
> |
<jar destfile="${product.jar}"> |
| 122 |
> |
<fileset dir="${build.classes.dir}"/> |
| 123 |
> |
</jar> |
| 124 |
|
|
| 125 |
|
</target> |
| 126 |
|
|
| 127 |
|
|
| 128 |
– |
<target name="doccheck" |
| 129 |
– |
depends="filter-doccheck" |
| 130 |
– |
description="Reports on javadoc style errors"> |
| 131 |
– |
|
| 132 |
– |
<delete dir="${build.doccheck.dir}"/> |
| 133 |
– |
<mkdir dir="${build.doccheck.dir}"/> |
| 134 |
– |
|
| 135 |
– |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
| 136 |
– |
docletpath="${lib.dir}/doccheck.jar" |
| 137 |
– |
destdir="${build.doccheck.dir}"> |
| 138 |
– |
<packageset dir="${build.dc-filter.dir}"/> |
| 139 |
– |
</javadoc> |
| 128 |
|
|
| 129 |
< |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
| 129 |
> |
<target name="test" |
| 130 |
> |
depends="init, configure-tests, report-tests" |
| 131 |
> |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
| 132 |
|
|
| 143 |
– |
</target> |
| 133 |
|
|
| 134 |
|
|
| 135 |
|
<target name="docs" |
| 147 |
– |
depends="filter-src" |
| 136 |
|
description="Builds javadocs with custom tags to build folder"> |
| 137 |
|
|
| 138 |
|
<delete dir="${build.javadocs.dir}"/> |
| 139 |
|
<mkdir dir="${build.javadocs.dir}"/> |
| 140 |
|
|
| 141 |
|
<javadoc destdir="${build.javadocs.dir}" |
| 142 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
| 142 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 143 |
|
overview="${src.dir}/intro.html" |
| 144 |
< |
source="${build.docsourcelevel}"> |
| 145 |
< |
|
| 158 |
< |
<tag name="revised" description="Last revised:"/> |
| 159 |
< |
<tag name="spec" description="Specified by:"/> |
| 144 |
> |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
| 145 |
> |
> |
| 146 |
|
|
| 147 |
< |
<packageset dir="${build.filter.src.dir}"/> |
| 147 |
> |
<packageset dir="${src.dir}"/> |
| 148 |
|
|
| 149 |
|
</javadoc> |
| 150 |
|
|
| 151 |
|
</target> |
| 152 |
|
|
| 153 |
|
|
| 168 |
– |
<target name="sinjdocs" |
| 169 |
– |
depends="configure-tests" |
| 170 |
– |
description="Builds javadocs with custom tags to build folder"> |
| 171 |
– |
|
| 172 |
– |
<delete dir="${build.sinjdocs.dir}"/> |
| 173 |
– |
<mkdir dir="${build.sinjdocs.dir}"/> |
| 174 |
– |
|
| 175 |
– |
<java classname="net.cscott.sinjdoc.Main" fork="true"> |
| 176 |
– |
|
| 177 |
– |
<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/> |
| 178 |
– |
|
| 179 |
– |
<classpath> |
| 180 |
– |
<pathelement location="${sinjdoc.jar}"/> |
| 181 |
– |
<pathelement location="${lib.dir}/jutil.jar"/> |
| 182 |
– |
<pathelement location="${lib.dir}/cup.jar"/> |
| 183 |
– |
<path refid="test.classpath"/> |
| 184 |
– |
</classpath> |
| 185 |
– |
|
| 186 |
– |
<!-- <arg value="-help"/> --> |
| 187 |
– |
<!-- <arg value="-verbose"/> --> |
| 188 |
– |
<!-- <arg value="-link"/> <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> --> |
| 189 |
– |
|
| 190 |
– |
<arg value="-d"/> <arg value="${build.sinjdocs.dir}"/> |
| 191 |
– |
<arg value="-sourcepath"/> <arg value="${src.dir}"/> |
| 192 |
– |
<arg value="-overview"/> <arg value="${src.dir}/intro.html"/> |
| 193 |
– |
<arg value="-source"/> <arg value="${build.sourcelevel}"/> |
| 194 |
– |
|
| 195 |
– |
<arg value="java.lang"/> |
| 196 |
– |
<arg value="java.util"/> |
| 197 |
– |
<arg value="java.util.concurrent"/> |
| 198 |
– |
<arg value="java.util.concurrent.atomic"/> |
| 199 |
– |
<arg value="java.util.concurrent.locks"/> |
| 200 |
– |
|
| 201 |
– |
|
| 202 |
– |
</java> |
| 203 |
– |
|
| 204 |
– |
</target> |
| 205 |
– |
|
| 154 |
|
|
| 155 |
|
<target name="dist" |
| 156 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
| 157 |
|
description="Puts all distributable products in single hierarchy"/> |
| 158 |
|
|
| 159 |
|
|
| 160 |
+ |
|
| 161 |
|
<target name="release" |
| 162 |
|
depends="dist" |
| 163 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
| 176 |
|
|
| 177 |
|
</target> |
| 178 |
|
|
| 179 |
+ |
|
| 180 |
+ |
|
| 181 |
|
<target name="clean" |
| 182 |
|
description="Removes all build products"> |
| 183 |
|
|
| 188 |
|
</target> |
| 189 |
|
|
| 190 |
|
|
| 191 |
+ |
|
| 192 |
|
<target name="dist-clean" |
| 193 |
|
description="Removes all build and distribution products"> |
| 194 |
|
|
| 197 |
|
</target> |
| 198 |
|
|
| 199 |
|
|
| 200 |
+ |
|
| 201 |
|
<target name="dist-docs" |
| 249 |
– |
depends="filter-src" |
| 202 |
|
description="Builds javadocs without custom tags to dist folder"> |
| 203 |
|
|
| 204 |
|
<delete dir="${dist.javadocs.dir}"/> |
| 205 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
| 206 |
|
|
| 207 |
|
<javadoc destdir="${dist.javadocs.dir}" |
| 208 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
| 208 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 209 |
|
overview="${src.dir}/intro.html" |
| 258 |
– |
source="${build.docsourcelevel}"> |
| 259 |
– |
|
| 260 |
– |
<packageset dir="${build.filter.src.dir}"/> |
| 210 |
|
|
| 211 |
+ |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
| 212 |
+ |
> |
| 213 |
+ |
<!-- |
| 214 |
+ |
<packageset dir="${src.dir}" defaultexcludes="yes"> |
| 215 |
+ |
<include name="java/util/concurrent"/> |
| 216 |
+ |
<include name="java/util/concurrent/atomic"/> |
| 217 |
+ |
<include name="java/util/concurrent/locks"/> |
| 218 |
+ |
</packageset> |
| 219 |
+ |
--> |
| 220 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 221 |
+ |
<include name="main/java/util/concurrent/*.java"/> |
| 222 |
+ |
<include name="main/java/util/concurrent/atomic/*.java"/> |
| 223 |
+ |
<include name="main/java/util/concurrent/locks/*.java"/> |
| 224 |
+ |
<include name="main/java/util/*.java"/> |
| 225 |
+ |
<!-- |
| 226 |
+ |
<include name="main/java/util/concurrent/*.html"/> |
| 227 |
+ |
<include name="main/java/util/concurrent/atomic/*.html"/> |
| 228 |
+ |
<include name="main/java/util/concurrent/locks/*.html"/> |
| 229 |
+ |
<include name="main/java/util/*.html"/> |
| 230 |
+ |
--> |
| 231 |
+ |
<!-- <include name="jsr166x/*.java"/> --> |
| 232 |
+ |
</fileset> |
| 233 |
|
</javadoc> |
| 234 |
|
|
| 235 |
|
</target> |
| 249 |
|
</target> |
| 250 |
|
|
| 251 |
|
|
| 281 |
– |
<target name="init-jar"> |
| 282 |
– |
|
| 283 |
– |
<mkdir dir="${build.lib.dir}"/> |
| 284 |
– |
|
| 285 |
– |
</target> |
| 286 |
– |
|
| 287 |
– |
|
| 288 |
– |
<target name="native-jar" |
| 289 |
– |
depends="compile"> |
| 290 |
– |
|
| 291 |
– |
<jar destfile="${product.jar}"> |
| 292 |
– |
<fileset dir="${build.classes.dir}"/> |
| 293 |
– |
</jar> |
| 294 |
– |
|
| 295 |
– |
</target> |
| 296 |
– |
|
| 297 |
– |
|
| 252 |
|
<target name="dist-jar" |
| 253 |
|
depends="clean, jar"> |
| 254 |
|
|
| 257 |
|
</target> |
| 258 |
|
|
| 259 |
|
|
| 260 |
< |
<target name="compile-ant-filter" |
| 261 |
< |
depends="init"> |
| 308 |
< |
|
| 309 |
< |
<mkdir dir="${build.ant.dir}"/> |
| 310 |
< |
|
| 311 |
< |
<javac srcdir="${ant.src.dir}" |
| 312 |
< |
destdir="${build.ant.dir}" |
| 313 |
< |
source="1.4" |
| 314 |
< |
/> |
| 315 |
< |
|
| 316 |
< |
</target> |
| 317 |
< |
|
| 318 |
< |
|
| 319 |
< |
<target name="filter-src" |
| 320 |
< |
depends="compile-ant-filter"> |
| 321 |
< |
|
| 322 |
< |
<mkdir dir="${build.filter.src.dir}"/> |
| 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="docs.exclusion"/> |
| 334 |
< |
</fileset> |
| 335 |
< |
<filterchain> |
| 336 |
< |
|
| 337 |
< |
<!-- |
| 338 |
< |
# This filter gets rid of angle-bracketed type parameters |
| 339 |
< |
# so that javadoc can run on the result. The following |
| 340 |
< |
# heuristic seems to work: |
| 341 |
< |
# |
| 342 |
< |
# For all lines not starting with space(s)-asterisk-space(s), |
| 343 |
< |
# replace <something> with a space, where there may be more |
| 344 |
< |
# than one right angle bracket at the end, and "something" |
| 345 |
< |
# must not contain parens or pipes. (This may need some |
| 346 |
< |
# tweaking.) |
| 347 |
< |
--> |
| 348 |
< |
|
| 349 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 350 |
< |
classpath="${build.ant.dir}"> |
| 351 |
< |
<param name="notmatching" value="^\s+\*\s.*$"/> |
| 352 |
< |
<param name="pattern" value="<[^|>()]+?>+"/> |
| 353 |
< |
<param name="replacement" value=" "/> |
| 354 |
< |
</filterreader> |
| 355 |
< |
|
| 356 |
< |
</filterchain> |
| 357 |
< |
</copy> |
| 358 |
< |
|
| 359 |
< |
</target> |
| 360 |
< |
|
| 260 |
> |
<target name="compile-tests" |
| 261 |
> |
depends="jar"> |
| 262 |
|
|
| 263 |
< |
<target name="filter-doccheck" |
| 363 |
< |
depends="filter-src"> |
| 263 |
> |
<mkdir dir="${build.testcases.dir}"/> |
| 264 |
|
|
| 265 |
< |
<mkdir dir="${build.dc-filter.dir}"/> |
| 265 |
> |
<javac srcdir="${tck.src.dir}" |
| 266 |
> |
destdir="${build.testcases.dir}" |
| 267 |
> |
debug="${build.debug}" |
| 268 |
> |
debuglevel="${build.debuglevel}" |
| 269 |
> |
deprecation="${build.deprecation}" |
| 270 |
> |
source="${build.sourcelevel}" |
| 271 |
> |
fork="true"> |
| 272 |
|
|
| 273 |
< |
<copy todir="${build.dc-filter.dir}"> |
| 274 |
< |
<fileset dir="${build.filter.src.dir}"> |
| 369 |
< |
<include name="**/*.html"/> |
| 370 |
< |
</fileset> |
| 371 |
< |
</copy> |
| 273 |
> |
<compilerarg value="${bootclasspath.args}"/> |
| 274 |
> |
<compilerarg line="${build.args}"/> |
| 275 |
|
|
| 276 |
< |
<property name="generic.declarations" |
| 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 |
< |
/> |
| 276 |
> |
<classpath refid="test.classpath"/> |
| 277 |
|
|
| 278 |
< |
<copy todir="${build.dc-filter.dir}"> |
| 378 |
< |
<fileset dir="${build.filter.src.dir}"> |
| 379 |
< |
<exclude name="**/*.html"/> |
| 380 |
< |
</fileset> |
| 381 |
< |
<filterchain> |
| 382 |
< |
<!-- |
| 383 |
< |
# These two filters try to make the source look like |
| 384 |
< |
# something that doccheck can process. The first removes |
| 385 |
< |
# -source 1.4 assertions and the second adds in a bunch |
| 386 |
< |
# of single letter public nested marker interfaces so that |
| 387 |
< |
# the generic type parameters are recognized. |
| 388 |
< |
--> |
| 389 |
< |
|
| 390 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 391 |
< |
classpath="${build.ant.dir}"> |
| 392 |
< |
<param name="matching" value="^\s*assert[\s ].*$"/> |
| 393 |
< |
<param name="pattern" value="assert"/> |
| 394 |
< |
<param name="replacement" value="//assert"/> |
| 395 |
< |
</filterreader> |
| 396 |
< |
|
| 397 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 398 |
< |
classpath="${build.ant.dir}"> |
| 399 |
< |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
| 400 |
< |
<param name="pattern" value="$"/> |
| 401 |
< |
<param name="replacement" value=" ${generic.declarations}"/> |
| 402 |
< |
</filterreader> |
| 278 |
> |
</javac> |
| 279 |
|
|
| 280 |
< |
</filterchain> |
| 281 |
< |
</copy> |
| 280 |
> |
<javac srcdir="${test.src.dir}" |
| 281 |
> |
destdir="${build.testcases.dir}" |
| 282 |
> |
debug="${build.debug}" |
| 283 |
> |
debuglevel="${build.debuglevel}" |
| 284 |
> |
deprecation="${build.deprecation}" |
| 285 |
> |
source="${build.sourcelevel}" |
| 286 |
> |
fork="true"> |
| 287 |
|
|
| 288 |
< |
</target> |
| 288 |
> |
<include name="jsr166/test/**"/> |
| 289 |
|
|
| 290 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
| 291 |
+ |
<compilerarg line="${build.args}"/> |
| 292 |
|
|
| 293 |
< |
<target name="compile-tests" |
| 411 |
< |
depends="jar"> |
| 293 |
> |
<classpath refid="test.classpath"/> |
| 294 |
|
|
| 295 |
< |
<mkdir dir="${build.testcases.dir}"/> |
| 295 |
> |
</javac> |
| 296 |
|
|
| 297 |
< |
<javac srcdir="${test.src.dir}" |
| 297 |
> |
<!-- |
| 298 |
> |
<javac srcdir="${jtreg.src.dir}" |
| 299 |
|
destdir="${build.testcases.dir}" |
| 300 |
|
debug="${build.debug}" |
| 301 |
|
debuglevel="${build.debuglevel}" |
| 303 |
|
source="${build.sourcelevel}" |
| 304 |
|
fork="true"> |
| 305 |
|
|
| 306 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
| 307 |
|
<compilerarg line="${build.args}"/> |
| 308 |
+ |
|
| 309 |
|
<classpath refid="test.classpath"/> |
| 425 |
– |
|
| 426 |
– |
<include name="java/**"/> |
| 427 |
– |
<include name="jsr166/**"/> |
| 310 |
|
|
| 311 |
|
</javac> |
| 312 |
+ |
--> |
| 313 |
|
|
| 314 |
|
</target> |
| 315 |
|
|
| 329 |
|
dir="${build.reports.dir}" |
| 330 |
|
fork="true"> |
| 331 |
|
|
| 332 |
< |
<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/> |
| 332 |
> |
<jvmarg value="${bootclasspath.args}"/> |
| 333 |
> |
<jvmarg value="-server"/> |
| 334 |
> |
<jvmarg value="-showversion"/> |
| 335 |
> |
|
| 336 |
> |
<classpath refid="test.classpath"/> |
| 337 |
|
|
| 338 |
|
<formatter type="xml"/> |
| 339 |
|
|
| 340 |
< |
<batchtest todir="${build.reports.dir}"> |
| 340 |
> |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
| 341 |
> |
<fileset dir="${tck.src.dir}"> |
| 342 |
> |
<include name="**/${testcase}Test.java"/> |
| 343 |
> |
</fileset> |
| 344 |
> |
</batchtest> |
| 345 |
> |
|
| 346 |
> |
<batchtest todir="${build.reports.dir}" if="do.test.old"> |
| 347 |
|
<fileset dir="${test.src.dir}"> |
| 348 |
< |
<include name="java/**/${testcase}Test.java"/> |
| 349 |
< |
<include name="jsr166/**/${testcase}Test.java"/> |
| 348 |
> |
<include name="jsr166/test/**/${testcase}Test.java"/> |
| 349 |
> |
</fileset> |
| 350 |
> |
</batchtest> |
| 351 |
> |
|
| 352 |
> |
<!-- |
| 353 |
> |
<batchtest todir="${build.reports.dir}" if="do.test.jtreg"> |
| 354 |
> |
<fileset dir="${jtreg.src.dir}"> |
| 355 |
> |
<include name="**/${testcase}Test.java"/> |
| 356 |
|
</fileset> |
| 357 |
|
</batchtest> |
| 358 |
+ |
--> |
| 359 |
|
|
| 360 |
|
</junit> |
| 361 |
|
|
| 377 |
|
<fileset dir="${build.reports.dir}"> |
| 378 |
|
<include name="TEST-*.xml"/> |
| 379 |
|
</fileset> |
| 380 |
< |
<report styledir="${stylesheet.dir}" |
| 481 |
< |
format="${junit.report.format}" |
| 482 |
< |
todir="${build.reports.dir}" |
| 380 |
> |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
| 381 |
|
/> |
| 382 |
|
</junitreport> |
| 383 |
|
|
| 395 |
|
</condition> |
| 396 |
|
|
| 397 |
|
<property name="warnunchecked.arg" value=""/> |
| 500 |
– |
|
| 501 |
– |
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
| 502 |
– |
<istrue value="${build.nothreads}"/> |
| 503 |
– |
</condition> |
| 398 |
|
|
| 399 |
|
|
| 400 |
|
<!-- Common options in javac invocations --> |
| 403 |
|
</target> |
| 404 |
|
|
| 405 |
|
|
| 512 |
– |
<target name="prepare-src" |
| 513 |
– |
depends="configure-compiler" |
| 514 |
– |
if="prepare.src.dir"> |
| 515 |
– |
|
| 516 |
– |
<mkdir dir="${prepare.src.dir}"/> |
| 517 |
– |
<copy todir="${prepare.src.dir}"> |
| 518 |
– |
<fileset dir="${src.dir}"> |
| 519 |
– |
<exclude name="java/lang/**"/> |
| 520 |
– |
</fileset> |
| 521 |
– |
</copy> |
| 522 |
– |
|
| 523 |
– |
</target> |
| 524 |
– |
|
| 525 |
– |
|
| 406 |
|
<target name="configure-tests" |
| 407 |
|
depends="configure-compiler"> |
| 408 |
|
|
| 410 |
|
<available property="junit.available" |
| 411 |
|
classname="junit.framework.Protectable"/> |
| 412 |
|
|
| 533 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
| 534 |
– |
unless="junit.available"/> |
| 535 |
– |
|
| 413 |
|
<!-- Xalan --> |
| 414 |
|
<available property="xalan.available" |
| 415 |
|
classname="org.apache.xalan.Version"/> |
| 416 |
|
|
| 417 |
+ |
|
| 418 |
+ |
<!-- Ant 1.6beta and later don't need or want this check --> |
| 419 |
+ |
<!-- |
| 420 |
+ |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
| 421 |
+ |
unless="junit.available"/> |
| 422 |
+ |
|
| 423 |
|
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
| 424 |
|
unless="xalan.available"/> |
| 425 |
+ |
--> |
| 426 |
|
|
| 427 |
+ |
</target> |
| 428 |
|
|
| 544 |
– |
<!-- |
| 545 |
– |
! Bootclasspath munging for testing, so JUnit can test our local |
| 546 |
– |
! modifications to java.*. |
| 547 |
– |
--> |
| 429 |
|
|
| 430 |
< |
<path id="test.classpath"> |
| 431 |
< |
<pathelement location="${product.jar}"/> |
| 551 |
< |
<pathelement location="${rt.jar}"/> |
| 552 |
< |
<pathelement location="${junit.jar}"/> |
| 553 |
< |
<pathelement location="${build.testcases.dir}"/> |
| 554 |
< |
</path> |
| 430 |
> |
<!-- Various demos and test programs --> |
| 431 |
> |
|
| 432 |
|
|
| 433 |
< |
<path id="test.bootclasspath"> |
| 434 |
< |
<path refid="test.classpath"/> |
| 558 |
< |
</path> |
| 433 |
> |
<target name="loops" depends="init, configure-compiler" |
| 434 |
> |
description="Benchmark from Doug Lea's AQS paper"> |
| 435 |
|
|
| 436 |
< |
<!-- Flatten test classpaths into platform-appropriate strings --> |
| 437 |
< |
<property name="test.classpath" refid="test.classpath"/> |
| 438 |
< |
<property name="test.bootclasspath" refid="test.bootclasspath"/> |
| 436 |
> |
<mkdir dir="${build.loops.dir}"/> |
| 437 |
> |
|
| 438 |
> |
<javac srcdir="${loops.src.dir}" |
| 439 |
> |
destdir="${build.loops.dir}" |
| 440 |
> |
debug="${build.debug}" |
| 441 |
> |
debuglevel="${build.debuglevel}" |
| 442 |
> |
deprecation="${build.deprecation}" |
| 443 |
> |
source="${build.sourcelevel}" |
| 444 |
> |
fork="true"> |
| 445 |
> |
|
| 446 |
> |
<compilerarg line="${build.args}"/> |
| 447 |
> |
<classpath refid="loops.classpath"/> |
| 448 |
> |
|
| 449 |
> |
</javac> |
| 450 |
> |
|
| 451 |
> |
<java classname="ALoops" fork="true"> |
| 452 |
> |
<classpath refid="loops.classpath"/> |
| 453 |
> |
</java> |
| 454 |
|
|
| 455 |
|
</target> |
| 456 |
|
|
| 457 |
|
|
| 458 |
+ |
<!-- jsr166x --> |
| 459 |
+ |
|
| 460 |
+ |
|
| 461 |
+ |
<target name="jsr166xcompile" |
| 462 |
+ |
depends="init, configure-compiler" |
| 463 |
+ |
description="Compiles jsr166x sources"> |
| 464 |
+ |
|
| 465 |
+ |
<mkdir dir="${build.jsr166x.dir}"/> |
| 466 |
+ |
|
| 467 |
+ |
<javac srcdir="${jsr166xsrc.dir}" |
| 468 |
+ |
destdir="${build.jsr166x.dir}" |
| 469 |
+ |
debug="${build.debug}" |
| 470 |
+ |
debuglevel="${build.debuglevel}" |
| 471 |
+ |
deprecation="${build.deprecation}" |
| 472 |
+ |
source="${build.sourcelevel}" |
| 473 |
+ |
fork="true"> |
| 474 |
+ |
|
| 475 |
+ |
<include name="**/*.java"/> |
| 476 |
+ |
<compilerarg line="${build.args}"/> |
| 477 |
|
|
| 478 |
< |
<!-- Anthill targets --> |
| 478 |
> |
</javac> |
| 479 |
|
|
| 570 |
– |
<target name="anthill-build"> |
| 571 |
– |
|
| 572 |
– |
<!-- Override this in user.properties --> |
| 573 |
– |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
| 574 |
– |
|
| 575 |
– |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
| 576 |
– |
<arg value="-Xmx256000000"/> |
| 577 |
– |
<!-- classpath of new JVM --> |
| 578 |
– |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
| 579 |
– |
<!-- location of Ant home directory --> |
| 580 |
– |
<arg value="-Dant.home=${ant.home}"/> |
| 581 |
– |
<!-- the Ant main class --> |
| 582 |
– |
<arg value="org.apache.tools.ant.Main"/> |
| 583 |
– |
<!-- The build file --> |
| 584 |
– |
<arg value="-buildfile"/> <arg value="build.xml"/> |
| 585 |
– |
<!-- the target to build on the new Ant instance --> |
| 586 |
– |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
| 587 |
– |
<arg value="do-anthill-build"/> |
| 588 |
– |
</exec> |
| 480 |
|
</target> |
| 590 |
– |
|
| 591 |
– |
<target name="do-anthill-build" |
| 592 |
– |
depends="jar, test, docs, dist-docs"/> |
| 481 |
|
|
| 594 |
– |
<target name="anthill-publish"> |
| 482 |
|
|
| 596 |
– |
<copy todir="${deployDir}/docs/private"> |
| 597 |
– |
<fileset dir="${build.javadocs.dir}"/> |
| 598 |
– |
</copy> |
| 483 |
|
|
| 484 |
< |
<copy todir="${deployDir}/docs/public"> |
| 485 |
< |
<fileset dir="${dist.javadocs.dir}"/> |
| 486 |
< |
</copy> |
| 484 |
> |
<target name="jsr166xjar" |
| 485 |
> |
depends="jsr166xcompile" |
| 486 |
> |
description="Builds library jar from compiled sources"> |
| 487 |
|
|
| 488 |
< |
<copy tofile="${deployDir}/index.html" |
| 605 |
< |
file="${basedir}/etc/anthill-index.html"/> |
| 488 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
| 489 |
|
|
| 490 |
< |
<copy todir="${deployDir}/notes"> |
| 491 |
< |
<fileset dir="${basedir}/etc/notes"/> |
| 492 |
< |
</copy> |
| 490 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
| 491 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
| 492 |
> |
</jar> |
| 493 |
|
|
| 494 |
|
</target> |
| 495 |
|
|
| 496 |
|
|
| 614 |
– |
<target name="ng" depends="test"> |
| 615 |
– |
<java classname="SuperfluousAbstract" fork="true"> |
| 497 |
|
|
| 498 |
< |
<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/> |
| 498 |
> |
<target name="jsr166xdocs" |
| 499 |
> |
description="Builds javadocs with custom tags to build folder"> |
| 500 |
> |
|
| 501 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
| 502 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
| 503 |
> |
|
| 504 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
| 505 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 506 |
> |
|
| 507 |
> |
sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
| 508 |
> |
|
| 509 |
> |
> |
| 510 |
> |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 511 |
> |
<include name="jsr166x"/> |
| 512 |
> |
</packageset> |
| 513 |
> |
|
| 514 |
> |
|
| 515 |
> |
</javadoc> |
| 516 |
> |
|
| 517 |
> |
</target> |
| 518 |
> |
|
| 519 |
> |
|
| 520 |
> |
<target name="jsr166xdist" |
| 521 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
| 522 |
> |
description="Puts all distributable products in single hierarchy"/> |
| 523 |
> |
|
| 524 |
> |
|
| 525 |
> |
|
| 526 |
> |
<target name="jsr166xclean" |
| 527 |
> |
description="Removes all build products"> |
| 528 |
> |
|
| 529 |
> |
<delete dir="${build.jsr166x.dir}"/> |
| 530 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
| 531 |
> |
|
| 532 |
> |
</target> |
| 533 |
> |
|
| 534 |
> |
|
| 535 |
> |
|
| 536 |
> |
<target name="jsr166xdist-clean" |
| 537 |
> |
description="Removes all build and distribution products"> |
| 538 |
> |
|
| 539 |
> |
</target> |
| 540 |
> |
|
| 541 |
> |
|
| 542 |
> |
|
| 543 |
> |
<target name="jsr166xdist-docs" |
| 544 |
> |
description="Builds javadocs without custom tags to dist folder"> |
| 545 |
> |
|
| 546 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
| 547 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
| 548 |
> |
|
| 549 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
| 550 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
| 551 |
> |
source="${build.sourcelevel}"> |
| 552 |
> |
|
| 553 |
> |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 554 |
> |
<include name="jsr166x"/> |
| 555 |
> |
</packageset> |
| 556 |
> |
|
| 557 |
> |
</javadoc> |
| 558 |
> |
|
| 559 |
> |
</target> |
| 560 |
> |
|
| 561 |
> |
<target name="jsr166xdist-jar" |
| 562 |
> |
depends="jsr166xclean, jsr166xjar"> |
| 563 |
> |
|
| 564 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
| 565 |
> |
|
| 566 |
> |
</target> |
| 567 |
> |
|
| 568 |
> |
<!-- jsr166y --> |
| 569 |
> |
|
| 570 |
> |
|
| 571 |
> |
<target name="jsr166ycompile" |
| 572 |
> |
depends="init, configure-compiler" |
| 573 |
> |
description="Compiles jsr166y sources"> |
| 574 |
> |
|
| 575 |
> |
<mkdir dir="${build.jsr166y.dir}"/> |
| 576 |
> |
|
| 577 |
> |
<javac srcdir="${jsr166ysrc.dir}" |
| 578 |
> |
destdir="${build.jsr166y.dir}" |
| 579 |
> |
debug="${build.debug}" |
| 580 |
> |
debuglevel="${build.debuglevel}" |
| 581 |
> |
deprecation="${build.deprecation}" |
| 582 |
> |
source="${build.sourcelevel}" |
| 583 |
> |
fork="true"> |
| 584 |
> |
|
| 585 |
> |
<include name="**/*.java"/> |
| 586 |
> |
<compilerarg line="${build.args}"/> |
| 587 |
> |
<compilerarg value="${bootclasspath.args}"/> |
| 588 |
> |
|
| 589 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
| 590 |
> |
|
| 591 |
> |
</javac> |
| 592 |
> |
|
| 593 |
> |
</target> |
| 594 |
> |
|
| 595 |
> |
|
| 596 |
> |
|
| 597 |
> |
<target name="jsr166yjar" |
| 598 |
> |
depends="jsr166ycompile" |
| 599 |
> |
description="Builds library jar from compiled sources"> |
| 600 |
> |
|
| 601 |
> |
<mkdir dir="${build.jsr166ylib.dir}"/> |
| 602 |
> |
|
| 603 |
> |
<jar destfile="${jsr166yproduct.jar}"> |
| 604 |
> |
<fileset dir="${build.jsr166y.dir}"/> |
| 605 |
> |
</jar> |
| 606 |
|
|
| 619 |
– |
</java> |
| 607 |
|
</target> |
| 608 |
|
|
| 609 |
|
|
| 610 |
+ |
|
| 611 |
+ |
<target name="jsr166ydocs" |
| 612 |
+ |
description="Builds javadocs with custom tags to build folder"> |
| 613 |
+ |
|
| 614 |
+ |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
| 615 |
+ |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
| 616 |
+ |
|
| 617 |
+ |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
| 618 |
+ |
link="http://java.sun.com/javase/6/docs/api/" |
| 619 |
+ |
sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
| 620 |
+ |
|
| 621 |
+ |
> |
| 622 |
+ |
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
| 623 |
+ |
<include name="jsr166y"/> |
| 624 |
+ |
</packageset> |
| 625 |
+ |
|
| 626 |
+ |
|
| 627 |
+ |
</javadoc> |
| 628 |
+ |
|
| 629 |
+ |
</target> |
| 630 |
+ |
|
| 631 |
+ |
|
| 632 |
+ |
<target name="jsr166ydist" |
| 633 |
+ |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
| 634 |
+ |
description="Puts all distributable products in single hierarchy"/> |
| 635 |
+ |
|
| 636 |
+ |
|
| 637 |
+ |
|
| 638 |
+ |
<target name="jsr166yclean" |
| 639 |
+ |
description="Removes all build products"> |
| 640 |
+ |
|
| 641 |
+ |
<delete dir="${build.jsr166y.dir}"/> |
| 642 |
+ |
<delete dir="${build.jsr166ylib.dir}"/> |
| 643 |
+ |
|
| 644 |
+ |
</target> |
| 645 |
+ |
|
| 646 |
+ |
|
| 647 |
+ |
|
| 648 |
+ |
<target name="jsr166ydist-clean" |
| 649 |
+ |
description="Removes all build and distribution products"> |
| 650 |
+ |
|
| 651 |
+ |
</target> |
| 652 |
+ |
|
| 653 |
+ |
<target name="jsr166ydist-docs" |
| 654 |
+ |
description="Builds javadocs without custom tags to dist folder"> |
| 655 |
+ |
|
| 656 |
+ |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
| 657 |
+ |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
| 658 |
+ |
|
| 659 |
+ |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
| 660 |
+ |
link="http://java.sun.com/javase/6/docs/api/" |
| 661 |
+ |
source="${build.sourcelevel}"> |
| 662 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
| 663 |
+ |
<include name="jsr166y/*.java"/> |
| 664 |
+ |
<include name="jsr166y/forkjoin/*.java"/> |
| 665 |
+ |
</fileset> |
| 666 |
+ |
</javadoc> |
| 667 |
+ |
|
| 668 |
+ |
</target> |
| 669 |
+ |
|
| 670 |
+ |
<target name="jsr166ydist-jar" |
| 671 |
+ |
depends="jsr166yclean, jsr166yjar"> |
| 672 |
+ |
|
| 673 |
+ |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
| 674 |
+ |
|
| 675 |
+ |
</target> |
| 676 |
+ |
|
| 677 |
|
</project> |
