| 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"/> |
| 29 |
|
<!-- Build locations --> |
| 30 |
|
<property name="build.dir" location="build"/> |
| 31 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
| 33 |
– |
<property name="build.emulation.dir" location="${build.dir}/emulation"/> |
| 32 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
| 33 |
|
<property name="build.lib.dir" location="${build.dir}/lib"/> |
| 34 |
|
<property name="build.ant.dir" location="${build.dir}/ant"/> |
| 35 |
|
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
| 38 |
– |
<property name="build.sinjdocs.dir" location="${build.dir}/sinjdocs"/> |
| 39 |
– |
<property name="build.stripped.dir" location="${build.dir}/stripped"/> |
| 36 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
| 37 |
+ |
<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/> |
| 38 |
|
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
| 39 |
|
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
| 40 |
< |
<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/> |
| 40 |
> |
<property name="build.dc-filter.dir" location="${build.dir}/filterdocchk"/> |
| 41 |
|
|
| 42 |
|
<!-- Source locations --> |
| 43 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
| 47 |
– |
<property name="emulation.src.dir" location="${basedir}/src/emulation"/> |
| 44 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
| 45 |
+ |
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
| 46 |
|
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
| 47 |
|
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
| 48 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
| 54 |
|
<!-- Jar locations --> |
| 55 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
| 56 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
| 57 |
< |
<property name="rt.jar" location="${java.home}/lib/rt.jar"/> |
| 58 |
< |
<property name="sinjdoc.jar" location="${lib.dir}/sinjdoc.jar"/> |
| 59 |
< |
|
| 57 |
> |
|
| 58 |
> |
<!-- Bootclasspath argument --> |
| 59 |
> |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
| 60 |
|
|
| 61 |
< |
<!-- Files excluded from dist-docs and emulation jar --> |
| 62 |
< |
<patternset id="unsafe.exclusion"> |
| 63 |
< |
<exclude name="java/util/Random.*"/> |
| 64 |
< |
<exclude name="sun/misc/Unsafe.*"/> |
| 65 |
< |
</patternset> |
| 69 |
< |
|
| 70 |
< |
<!-- Files excludes from emulation jar --> |
| 71 |
< |
<patternset id="atomic.exclusion"> |
| 72 |
< |
<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/> |
| 73 |
< |
<exclude name="java/util/concurrent/atomic/AtomicInteger*"/> |
| 74 |
< |
<exclude name="java/util/concurrent/atomic/AtomicLong*"/> |
| 75 |
< |
<exclude name="java/util/concurrent/atomic/AtomicReference*"/> |
| 76 |
< |
<exclude name="java/util/concurrent/locks/LockSupport*"/> |
| 77 |
< |
<exclude name="java/util/concurrent/locks/ReentrantLock*"/> |
| 78 |
< |
</patternset> |
| 61 |
> |
<!-- Test classpath --> |
| 62 |
> |
<path id="test.classpath"> |
| 63 |
> |
<pathelement location="${build.testcases.dir}"/> |
| 64 |
> |
<pathelement location="${junit.jar}"/> |
| 65 |
> |
</path> |
| 66 |
|
|
| 67 |
|
|
| 68 |
|
|
| 69 |
|
<!-- Main targets --> |
| 70 |
|
|
| 71 |
+ |
|
| 72 |
|
<target name="compile" |
| 73 |
< |
depends="init, configure-compiler, prepare-src" |
| 73 |
> |
depends="init, configure-compiler" |
| 74 |
|
description="Compiles main sources to build folder"> |
| 75 |
|
|
| 88 |
– |
<property name="prepare.src.dir" value="${src.dir}"/> |
| 89 |
– |
|
| 76 |
|
<mkdir dir="${build.classes.dir}"/> |
| 77 |
|
|
| 78 |
< |
<!-- |
| 93 |
< |
<echo>javac ${gjc.args}</echo> |
| 94 |
< |
<echo>bootclasspath=${compile.bootclasspath}</echo> |
| 95 |
< |
--> |
| 96 |
< |
|
| 97 |
< |
<javac srcdir="${prepare.src.dir}" |
| 78 |
> |
<javac srcdir="${src.dir}" |
| 79 |
|
destdir="${build.classes.dir}" |
| 80 |
|
debug="${build.debug}" |
| 81 |
|
debuglevel="${build.debuglevel}" |
| 83 |
|
source="${build.sourcelevel}" |
| 84 |
|
fork="true"> |
| 85 |
|
|
| 86 |
< |
<compilerarg line="${gjc.args}"/> |
| 106 |
< |
<!-- |
| 107 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
| 108 |
< |
--> |
| 86 |
> |
<compilerarg line="${build.args}"/> |
| 87 |
|
|
| 88 |
|
</javac> |
| 89 |
|
|
| 90 |
|
</target> |
| 91 |
|
|
| 92 |
|
|
| 115 |
– |
<target name="jar" |
| 116 |
– |
depends="configure-emulation, init-jar, native-jar, emulation-jar" |
| 117 |
– |
description="Builds library jar from compiled sources"/> |
| 93 |
|
|
| 94 |
+ |
<target name="jar" |
| 95 |
+ |
depends="compile" |
| 96 |
+ |
description="Builds library jar from compiled sources"> |
| 97 |
|
|
| 98 |
< |
<target name="test" |
| 121 |
< |
depends="init, configure-tests, report-tests" |
| 122 |
< |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
| 123 |
< |
|
| 124 |
< |
|
| 125 |
< |
<target name="checkstyle" |
| 126 |
< |
depends="filter-src" |
| 127 |
< |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
| 128 |
< |
|
| 129 |
< |
<taskdef resource="checkstyletask.properties" |
| 130 |
< |
classpath="${lib.dir}/checkstyle-all-2.4.jar"/> |
| 98 |
> |
<mkdir dir="${build.lib.dir}"/> |
| 99 |
|
|
| 100 |
< |
<checkstyle> |
| 101 |
< |
<formatter type="plain"/> <!-- also available: type="xml" --> |
| 102 |
< |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
| 135 |
< |
</checkstyle> |
| 100 |
> |
<jar destfile="${product.jar}"> |
| 101 |
> |
<fileset dir="${build.classes.dir}"/> |
| 102 |
> |
</jar> |
| 103 |
|
|
| 104 |
|
</target> |
| 105 |
|
|
| 106 |
|
|
| 140 |
– |
<target name="doccheck" |
| 141 |
– |
depends="filter-doccheck" |
| 142 |
– |
description="Reports on javadoc style errors"> |
| 143 |
– |
|
| 144 |
– |
<delete dir="${build.doccheck.dir}"/> |
| 145 |
– |
<mkdir dir="${build.doccheck.dir}"/> |
| 146 |
– |
|
| 147 |
– |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
| 148 |
– |
docletpath="${lib.dir}/doccheck.jar" |
| 149 |
– |
destdir="${build.doccheck.dir}"> |
| 150 |
– |
<packageset dir="${build.filter.doccheck.dir}"/> |
| 151 |
– |
</javadoc> |
| 107 |
|
|
| 108 |
< |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
| 108 |
> |
<target name="test" |
| 109 |
> |
depends="init, configure-tests, report-tests" |
| 110 |
> |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
| 111 |
|
|
| 155 |
– |
</target> |
| 112 |
|
|
| 113 |
|
|
| 114 |
|
<target name="docs" |
| 159 |
– |
depends="filter-src" |
| 115 |
|
description="Builds javadocs with custom tags to build folder"> |
| 116 |
|
|
| 117 |
|
<delete dir="${build.javadocs.dir}"/> |
| 120 |
|
<javadoc destdir="${build.javadocs.dir}" |
| 121 |
|
link="http://java.sun.com/j2se/1.4.1/docs/api" |
| 122 |
|
overview="${src.dir}/intro.html" |
| 123 |
< |
source="${build.docsourcelevel}"> |
| 123 |
> |
source="${build.sourcelevel}"> |
| 124 |
|
|
| 125 |
|
<tag name="revised" description="Last revised:"/> |
| 126 |
|
<tag name="spec" description="Specified by:"/> |
| 172 |
– |
<tag name="editor" description="Last edited by:"/> |
| 173 |
– |
<tag name="fixme" description="FIX ME:"/> |
| 127 |
|
|
| 128 |
< |
<packageset dir="${build.filter.src.dir}"/> |
| 128 |
> |
<packageset dir="${src.dir}"/> |
| 129 |
|
|
| 130 |
|
</javadoc> |
| 131 |
|
|
| 132 |
|
</target> |
| 133 |
|
|
| 134 |
|
|
| 182 |
– |
<target name="sinjdocs" |
| 183 |
– |
depends="configure-tests" |
| 184 |
– |
description="Builds javadocs with custom tags to build folder"> |
| 135 |
|
|
| 136 |
< |
<delete dir="${build.sinjdocs.dir}"/> |
| 137 |
< |
<mkdir dir="${build.sinjdocs.dir}"/> |
| 138 |
< |
|
| 189 |
< |
<java classname="net.cscott.sinjdoc.Main" fork="true"> |
| 190 |
< |
|
| 191 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
| 136 |
> |
<target name="doccheck" |
| 137 |
> |
depends="filter-doccheck" |
| 138 |
> |
description="Reports on javadoc style errors"> |
| 139 |
|
|
| 140 |
< |
<classpath> |
| 141 |
< |
<pathelement location="${sinjdoc.jar}"/> |
| 195 |
< |
<pathelement location="${lib.dir}/jutil.jar"/> |
| 196 |
< |
<pathelement location="${lib.dir}/cup.jar"/> |
| 197 |
< |
<path refid="test.classpath"/> |
| 198 |
< |
</classpath> |
| 199 |
< |
|
| 200 |
< |
|
| 201 |
< |
<arg value="-d"/> <arg value="${build.sinjdocs.dir}"/> |
| 202 |
< |
<arg value="-sourcepath"/> <arg value="${src.dir}"/> |
| 203 |
< |
<arg value="-overview"/> <arg value="${src.dir}/intro.html"/> |
| 204 |
< |
<arg value="-source"/> <arg value="${build.sourcelevel}"/> |
| 205 |
< |
<!-- <arg value="-verbose"/> --> |
| 206 |
< |
<!-- <arg value="-link"/> <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> --> |
| 207 |
< |
<arg value="java.lang"/> |
| 208 |
< |
<arg value="java.util"/> |
| 209 |
< |
<arg value="java.util.concurrent"/> |
| 210 |
< |
<arg value="java.util.concurrent.atomic"/> |
| 211 |
< |
<arg value="java.util.concurrent.locks"/> |
| 140 |
> |
<delete dir="${build.doccheck.dir}"/> |
| 141 |
> |
<mkdir dir="${build.doccheck.dir}"/> |
| 142 |
|
|
| 143 |
< |
<!-- |
| 144 |
< |
<arg value="-help"/> |
| 145 |
< |
--> |
| 143 |
> |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
| 144 |
> |
docletpath="${lib.dir}/doccheck.jar" |
| 145 |
> |
destdir="${build.doccheck.dir}"> |
| 146 |
> |
<packageset dir="${build.dc-filter.dir}"/> |
| 147 |
> |
</javadoc> |
| 148 |
|
|
| 149 |
< |
</java> |
| 149 |
> |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
| 150 |
|
|
| 151 |
|
</target> |
| 152 |
|
|
| 153 |
|
|
| 222 |
– |
<target name="strip" |
| 223 |
– |
depends="init, configure-compiler" |
| 224 |
– |
description="Strip generics from java source (not working yet)"> |
| 225 |
– |
|
| 226 |
– |
<mkdir dir="${build.stripped.dir}"/> |
| 154 |
|
|
| 155 |
< |
<!-- |
| 156 |
< |
# javac -s doesn't reliably generate compilable code. It generates |
| 157 |
< |
# bridge methods (marked as "synthetic") that can have identical |
| 231 |
< |
# signatures to existing methods except for the return value. |
| 232 |
< |
--> |
| 233 |
< |
<javac srcdir="${src.dir}" |
| 234 |
< |
destdir="${build.stripped.dir}" |
| 235 |
< |
debug="${build.debug}" |
| 236 |
< |
debuglevel="${build.debuglevel}" |
| 237 |
< |
deprecation="${build.deprecation}" |
| 238 |
< |
source="${build.sourcelevel}" |
| 239 |
< |
fork="true"> |
| 155 |
> |
<target name="checkstyle" |
| 156 |
> |
depends="filter-src" |
| 157 |
> |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
| 158 |
|
|
| 159 |
< |
<compilerarg line="${gjc.args} -s"/> |
| 160 |
< |
<!-- |
| 243 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
| 244 |
< |
--> |
| 159 |
> |
<taskdef resource="checkstyletask.properties" |
| 160 |
> |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
| 161 |
|
|
| 162 |
< |
</javac> |
| 162 |
> |
<mkdir dir="${build.checkstyle.dir}"/> |
| 163 |
> |
|
| 164 |
> |
<checkstyle config="etc/checkstyle/sun_checks.xml" |
| 165 |
> |
failOnViolation="false"> |
| 166 |
> |
<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> |
| 167 |
> |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
| 168 |
> |
</checkstyle> |
| 169 |
> |
|
| 170 |
> |
<style in="${build.checkstyle.dir}/checkstyle-report.xml" |
| 171 |
> |
out="${build.checkstyle.dir}/checkstyle-report.html" |
| 172 |
> |
style="${stylesheet.dir}/checkstyle-frames.xsl"/> |
| 173 |
|
|
| 174 |
|
</target> |
| 175 |
|
|
| 176 |
+ |
|
| 177 |
|
|
| 178 |
|
<target name="dist" |
| 179 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
| 180 |
|
description="Puts all distributable products in single hierarchy"/> |
| 181 |
|
|
| 182 |
+ |
|
| 183 |
+ |
|
| 184 |
|
<target name="release" |
| 185 |
|
depends="dist" |
| 186 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
| 187 |
|
|
| 259 |
– |
<!-- |
| 260 |
– |
#keep build dir? - dl |
| 261 |
– |
<delete dir="${build.dir}"/> |
| 262 |
– |
--> |
| 188 |
|
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
| 189 |
|
|
| 190 |
|
<jar basedir="${basedir}" destfile="${release.jar}"> |
| 191 |
+ |
<!-- <exclude name="build/**"/> --> |
| 192 |
|
<exclude name="${release.jar}"/> |
| 193 |
|
<exclude name="user.properties"/> |
| 194 |
|
<exclude name="etc/notes/**"/> |
| 195 |
< |
<exclude name="lib/gjc/2.1/**"/> |
| 195 |
> |
<exclude name="src/emulation/**"/> |
| 196 |
|
<exclude name="**/SyntaxTest.java"/> |
| 197 |
+ |
<exclude name="**/SuperfluousAbstract.java"/> |
| 198 |
|
</jar> |
| 199 |
|
|
| 200 |
|
</target> |
| 201 |
|
|
| 202 |
+ |
|
| 203 |
+ |
|
| 204 |
|
<target name="clean" |
| 205 |
|
description="Removes all build products"> |
| 206 |
|
|
| 211 |
|
</target> |
| 212 |
|
|
| 213 |
|
|
| 214 |
+ |
|
| 215 |
|
<target name="dist-clean" |
| 216 |
|
description="Removes all build and distribution products"> |
| 217 |
|
|
| 220 |
|
</target> |
| 221 |
|
|
| 222 |
|
|
| 223 |
+ |
|
| 224 |
|
<target name="dist-docs" |
| 294 |
– |
depends="filter-src" |
| 225 |
|
description="Builds javadocs without custom tags to dist folder"> |
| 226 |
|
|
| 227 |
|
<delete dir="${dist.javadocs.dir}"/> |
| 228 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
| 229 |
|
|
| 230 |
|
<javadoc destdir="${dist.javadocs.dir}" |
| 231 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
| 231 |
> |
link="http://java.sun.com/j2se/1.4.2/docs/api" |
| 232 |
|
overview="${src.dir}/intro.html" |
| 233 |
< |
source="${build.docsourcelevel}"> |
| 233 |
> |
source="${build.sourcelevel}"> |
| 234 |
|
|
| 235 |
< |
<packageset dir="${build.filter.src.dir}"/> |
| 235 |
> |
<packageset dir="${src.dir}"/> |
| 236 |
|
|
| 237 |
|
</javadoc> |
| 238 |
|
|
| 253 |
|
</target> |
| 254 |
|
|
| 255 |
|
|
| 326 |
– |
<target name="init-jar"> |
| 327 |
– |
|
| 328 |
– |
<mkdir dir="${build.lib.dir}"/> |
| 329 |
– |
|
| 330 |
– |
</target> |
| 331 |
– |
|
| 332 |
– |
|
| 333 |
– |
<target name="native-jar" |
| 334 |
– |
depends="compile" |
| 335 |
– |
unless="build.emulation.true"> |
| 336 |
– |
|
| 337 |
– |
<jar destfile="${product.jar}"> |
| 338 |
– |
<fileset dir="${build.classes.dir}"/> |
| 339 |
– |
</jar> |
| 340 |
– |
|
| 341 |
– |
</target> |
| 342 |
– |
|
| 343 |
– |
|
| 344 |
– |
<target name="compile-emulation" |
| 345 |
– |
depends="init, configure-compiler" |
| 346 |
– |
if="build.emulation.true"> |
| 347 |
– |
|
| 348 |
– |
<mkdir dir="${build.emulation.dir}"/> |
| 349 |
– |
|
| 350 |
– |
<javac srcdir="${emulation.src.dir}" |
| 351 |
– |
destdir="${build.emulation.dir}" |
| 352 |
– |
debug="${build.debug}" |
| 353 |
– |
debuglevel="${build.debuglevel}" |
| 354 |
– |
deprecation="${build.deprecation}" |
| 355 |
– |
source="${build.sourcelevel}" |
| 356 |
– |
fork="true"> |
| 357 |
– |
|
| 358 |
– |
<compilerarg line="${gjc.args}"/> |
| 359 |
– |
<!-- |
| 360 |
– |
<bootclasspath refid="compile.bootclasspath"/> |
| 361 |
– |
--> |
| 362 |
– |
|
| 363 |
– |
</javac> |
| 364 |
– |
|
| 365 |
– |
</target> |
| 366 |
– |
|
| 367 |
– |
|
| 368 |
– |
<target name="emulation-jar" |
| 369 |
– |
depends="compile-emulation" |
| 370 |
– |
if="build.emulation.true"> |
| 371 |
– |
|
| 372 |
– |
|
| 373 |
– |
<jar destfile="${product.jar}" duplicate="add"> |
| 374 |
– |
<fileset dir="${build.classes.dir}"> |
| 375 |
– |
<patternset refid="atomic.exclusion"/> |
| 376 |
– |
<patternset refid="unsafe.exclusion"/> |
| 377 |
– |
</fileset> |
| 378 |
– |
<fileset dir="${build.emulation.dir}"/> |
| 379 |
– |
</jar> |
| 380 |
– |
|
| 381 |
– |
</target> |
| 382 |
– |
|
| 383 |
– |
|
| 256 |
|
<target name="dist-jar" |
| 257 |
|
depends="clean, jar"> |
| 258 |
|
|
| 288 |
|
<copy todir="${build.filter.src.dir}"> |
| 289 |
|
<fileset dir="${src.dir}"> |
| 290 |
|
<exclude name="**/*.html"/> |
| 291 |
< |
<patternset refid="unsafe.exclusion"/> |
| 291 |
> |
<!-- Files excluded from dist-docs --> |
| 292 |
> |
<exclude name="java/util/Random.*"/> |
| 293 |
> |
<exclude name="sun/misc/Unsafe.*"/> |
| 294 |
|
</fileset> |
| 295 |
+ |
<!-- |
| 296 |
|
<filterchain> |
| 297 |
+ |
--> |
| 298 |
|
|
| 299 |
|
<!-- |
| 300 |
|
# This filter gets rid of angle-bracketed type parameters |
| 308 |
|
# tweaking.) |
| 309 |
|
--> |
| 310 |
|
|
| 311 |
+ |
<!-- |
| 312 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 313 |
|
classpath="${build.ant.dir}"> |
| 314 |
|
<param name="notmatching" value="^\s+\*\s.*$"/> |
| 315 |
|
<param name="pattern" value="<[^|>()]+?>+"/> |
| 316 |
|
<param name="replacement" value=" "/> |
| 317 |
|
</filterreader> |
| 318 |
+ |
--> |
| 319 |
|
|
| 320 |
< |
|
| 443 |
< |
<!-- |
| 444 |
< |
# This filter uncomments lines beginning with "//@" so that |
| 445 |
< |
# javadoc can see imports that are needed to resolve links |
| 446 |
< |
# but that shouldn't be in the compiled code. |
| 447 |
< |
--> |
| 448 |
< |
|
| 449 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
| 450 |
< |
classpath="${build.ant.dir}"> |
| 451 |
< |
<param name="matching" value="^//@.*$"/> |
| 452 |
< |
<param name="pattern" value="^//@"/> |
| 453 |
< |
<param name="replacement" value=""/> |
| 454 |
< |
</filterreader> |
| 320 |
> |
<!-- |
| 321 |
|
</filterchain> |
| 322 |
+ |
--> |
| 323 |
|
</copy> |
| 324 |
|
|
| 325 |
|
</target> |
| 326 |
|
|
| 327 |
|
|
| 461 |
– |
|
| 462 |
– |
|
| 328 |
|
<target name="filter-doccheck" |
| 329 |
|
depends="filter-src"> |
| 330 |
|
|
| 331 |
< |
<mkdir dir="${build.filter.doccheck.dir}"/> |
| 331 |
> |
<mkdir dir="${build.dc-filter.dir}"/> |
| 332 |
|
|
| 333 |
< |
<copy todir="${build.filter.doccheck.dir}"> |
| 333 |
> |
<copy todir="${build.dc-filter.dir}"> |
| 334 |
|
<fileset dir="${build.filter.src.dir}"> |
| 335 |
|
<include name="**/*.html"/> |
| 336 |
|
</fileset> |
| 340 |
|
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 {}" |
| 341 |
|
/> |
| 342 |
|
|
| 343 |
< |
<copy todir="${build.filter.doccheck.dir}"> |
| 343 |
> |
<copy todir="${build.dc-filter.dir}"> |
| 344 |
|
<fileset dir="${build.filter.src.dir}"> |
| 345 |
|
<exclude name="**/*.html"/> |
| 346 |
|
</fileset> |
| 378 |
|
|
| 379 |
|
<mkdir dir="${build.testcases.dir}"/> |
| 380 |
|
|
| 381 |
< |
<!-- |
| 382 |
< |
<echo>javac ${gjc.args}</echo> |
| 383 |
< |
<echo>bootclasspath=${test.compile.bootclasspath}</echo> |
| 384 |
< |
<echo>classpath="${test.classpath}"</echo> |
| 385 |
< |
--> |
| 381 |
> |
<javac srcdir="${tck.src.dir}" |
| 382 |
> |
destdir="${build.testcases.dir}" |
| 383 |
> |
debug="${build.debug}" |
| 384 |
> |
debuglevel="${build.debuglevel}" |
| 385 |
> |
deprecation="${build.deprecation}" |
| 386 |
> |
source="${build.sourcelevel}" |
| 387 |
> |
fork="true"> |
| 388 |
> |
|
| 389 |
> |
<compilerarg value="${bootclasspath.args}"/> |
| 390 |
> |
<compilerarg line="${build.args}"/> |
| 391 |
> |
|
| 392 |
> |
<classpath refid="test.classpath"/> |
| 393 |
> |
|
| 394 |
> |
</javac> |
| 395 |
|
|
| 396 |
|
<javac srcdir="${test.src.dir}" |
| 397 |
|
destdir="${build.testcases.dir}" |
| 401 |
|
source="${build.sourcelevel}" |
| 402 |
|
fork="true"> |
| 403 |
|
|
| 404 |
< |
<compilerarg line="${gjc.args}"/> |
| 531 |
< |
<!-- |
| 532 |
< |
<bootclasspath refid="test.compile.bootclasspath"/> |
| 533 |
< |
--> |
| 534 |
< |
<classpath refid="test.classpath"/> |
| 404 |
> |
<include name="jsr166/test/**"/> |
| 405 |
|
|
| 406 |
< |
<include name="java/**"/> |
| 407 |
< |
<include name="jsr166/**"/> |
| 406 |
> |
<compilerarg value="${bootclasspath.args}"/> |
| 407 |
> |
<compilerarg line="${build.args}"/> |
| 408 |
> |
|
| 409 |
> |
<classpath refid="test.classpath"/> |
| 410 |
|
|
| 411 |
|
</javac> |
| 412 |
|
|
| 428 |
|
dir="${build.reports.dir}" |
| 429 |
|
fork="true"> |
| 430 |
|
|
| 431 |
< |
<jvmarg value="-Xbootclasspath:${test.run.bootclasspath}"/> |
| 431 |
> |
<jvmarg value="${bootclasspath.args}"/> |
| 432 |
> |
|
| 433 |
> |
<classpath refid="test.classpath"/> |
| 434 |
|
|
| 435 |
|
<formatter type="xml"/> |
| 436 |
|
|
| 437 |
|
<batchtest todir="${build.reports.dir}"> |
| 438 |
+ |
<fileset dir="${tck.src.dir}"> |
| 439 |
+ |
<include name="**/${testcase}Test.java"/> |
| 440 |
+ |
</fileset> |
| 441 |
|
<fileset dir="${test.src.dir}"> |
| 442 |
< |
<include name="java/**/${testcase}Test.java"/> |
| 566 |
< |
<include name="jsr166/**/${testcase}Test.java"/> |
| 442 |
> |
<include name="jsr166/test/**/${testcase}Test.java"/> |
| 443 |
|
</fileset> |
| 444 |
|
</batchtest> |
| 445 |
|
|
| 476 |
|
|
| 477 |
|
<target name="configure-compiler"> |
| 478 |
|
|
| 603 |
– |
<property name="gjc.version" |
| 604 |
– |
value="2.2"/> |
| 605 |
– |
|
| 606 |
– |
<condition property="novariance.arg" value="-novariance"> |
| 607 |
– |
<and> |
| 608 |
– |
<equals arg1="${gjc.version}" arg2="2.0"/> |
| 609 |
– |
<or> |
| 610 |
– |
<not><isset property="gjc.novariance"/></not> |
| 611 |
– |
<istrue value="${gjc.novariance}"/> |
| 612 |
– |
</or> |
| 613 |
– |
</and> |
| 614 |
– |
</condition> |
| 615 |
– |
|
| 616 |
– |
<property name="novariance.arg" |
| 617 |
– |
value=""/> |
| 618 |
– |
|
| 619 |
– |
<property name="gjc.dir" |
| 620 |
– |
value="${lib.dir}/gjc"/> |
| 621 |
– |
|
| 622 |
– |
<property name="javac.jar" |
| 623 |
– |
location="${gjc.dir}/${gjc.version}/javac.jar"/> |
| 624 |
– |
|
| 625 |
– |
<property name="collect.jar" |
| 626 |
– |
location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/> |
| 627 |
– |
|
| 628 |
– |
<!-- |
| 629 |
– |
<property name="unchecked.option" value="-warnunchecked"/> |
| 630 |
– |
--> |
| 631 |
– |
|
| 479 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
| 480 |
|
|
| 481 |
|
<condition property="warnunchecked.arg" value="${unchecked.option}"> |
| 482 |
< |
<istrue value="${gjc.warnunchecked}"/> |
| 482 |
> |
<istrue value="${build.warnunchecked}"/> |
| 483 |
|
</condition> |
| 484 |
|
|
| 485 |
|
<property name="warnunchecked.arg" value=""/> |
| 639 |
– |
|
| 640 |
– |
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
| 641 |
– |
<istrue value="${build.nothreads}"/> |
| 642 |
– |
</condition> |
| 643 |
– |
|
| 644 |
– |
|
| 645 |
– |
<!-- |
| 646 |
– |
! Bootclasspath munging for source compilation. |
| 647 |
– |
--> |
| 648 |
– |
|
| 649 |
– |
<path id="pre.bootclasspath"> |
| 650 |
– |
<!-- |
| 651 |
– |
<pathelement location="${javac.jar}"/> |
| 652 |
– |
--> |
| 653 |
– |
</path> |
| 654 |
– |
|
| 655 |
– |
<path id="compile.bootclasspath"> |
| 656 |
– |
<pathelement location="${build.classes.dir}"/> |
| 657 |
– |
<!-- |
| 658 |
– |
<pathelement location="${collect.jar}"/> |
| 659 |
– |
--> |
| 660 |
– |
<pathelement location="${rt.jar}"/> |
| 661 |
– |
</path> |
| 662 |
– |
|
| 663 |
– |
<!-- Flatten paths into platform-appropriate strings --> |
| 664 |
– |
<property name="pre.bootclasspath" refid="pre.bootclasspath"/> |
| 665 |
– |
<property name="compile.bootclasspath" refid="compile.bootclasspath"/> |
| 486 |
|
|
| 487 |
|
|
| 488 |
|
<!-- Common options in javac invocations --> |
| 489 |
< |
<!-- |
| 670 |
< |
<property name="gjc.args" |
| 671 |
< |
value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}" |
| 672 |
< |
/> |
| 673 |
< |
--> |
| 674 |
< |
<property name="gjc.args" value="${warnunchecked.arg} ${novariance.arg}"/> |
| 675 |
< |
|
| 676 |
< |
</target> |
| 677 |
< |
|
| 678 |
< |
|
| 679 |
< |
<target name="prepare-src" |
| 680 |
< |
depends="configure-compiler" |
| 681 |
< |
if="prepare.src.dir"> |
| 682 |
< |
|
| 683 |
< |
<mkdir dir="${prepare.src.dir}"/> |
| 684 |
< |
<copy todir="${prepare.src.dir}"> |
| 685 |
< |
<fileset dir="${src.dir}"> |
| 686 |
< |
<exclude name="java/lang/**"/> |
| 687 |
< |
</fileset> |
| 688 |
< |
</copy> |
| 689 |
< |
|
| 690 |
< |
</target> |
| 691 |
< |
|
| 692 |
< |
|
| 693 |
< |
<target name="configure-emulation"> |
| 694 |
< |
|
| 695 |
< |
<condition property="build.emulation.true"> |
| 696 |
< |
<istrue value="${build.emulation}"/> |
| 697 |
< |
</condition> |
| 489 |
> |
<property name="build.args" value="${warnunchecked.arg}"/> |
| 490 |
|
|
| 491 |
|
</target> |
| 492 |
|
|
| 498 |
|
<available property="junit.available" |
| 499 |
|
classname="junit.framework.Protectable"/> |
| 500 |
|
|
| 709 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
| 710 |
– |
unless="junit.available"/> |
| 711 |
– |
|
| 501 |
|
<!-- Xalan --> |
| 502 |
|
<available property="xalan.available" |
| 503 |
|
classname="org.apache.xalan.Version"/> |
| 504 |
|
|
| 505 |
+ |
|
| 506 |
+ |
<!-- Ant 1.6beta and later don't need or want this check --> |
| 507 |
+ |
<!-- |
| 508 |
+ |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
| 509 |
+ |
unless="junit.available"/> |
| 510 |
+ |
|
| 511 |
|
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
| 512 |
|
unless="xalan.available"/> |
| 513 |
< |
|
| 719 |
< |
|
| 720 |
< |
<!-- |
| 721 |
< |
! Bootclasspath munging for testing, so JUnit can test our local |
| 722 |
< |
! modifications to java.*. |
| 723 |
< |
--> |
| 724 |
< |
|
| 725 |
< |
<path id="test.classpath"> |
| 726 |
< |
<pathelement location="${product.jar}"/> |
| 727 |
< |
<pathelement location="${rt.jar}"/> |
| 728 |
< |
<pathelement location="${build.testcases.dir}"/> |
| 729 |
< |
<pathelement location="${junit.jar}"/> |
| 730 |
< |
</path> |
| 731 |
< |
|
| 732 |
< |
<path id="test.compile.bootclasspath"> |
| 733 |
< |
<pathelement location="${javac.jar}"/> |
| 734 |
< |
<pathelement location="${collect.jar}"/> |
| 735 |
< |
<pathelement location="${rt.jar}"/> |
| 736 |
< |
</path> |
| 737 |
< |
|
| 738 |
< |
<path id="test.run.bootclasspath"> |
| 739 |
< |
<!-- |
| 740 |
< |
<pathelement location="${javac.jar}"/> |
| 741 |
< |
--> |
| 742 |
< |
<path refid="test.classpath"/> |
| 743 |
< |
</path> |
| 744 |
< |
|
| 745 |
< |
<!-- Flatten test classpaths into platform-appropriate strings --> |
| 746 |
< |
<property name="test.classpath" refid="test.classpath"/> |
| 747 |
< |
<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/> |
| 748 |
< |
<property name="test.run.bootclasspath" refid="test.run.bootclasspath"/> |
| 513 |
> |
--> |
| 514 |
|
|
| 515 |
|
</target> |
| 516 |
|
|
| 562 |
|
</target> |
| 563 |
|
|
| 564 |
|
|
| 800 |
– |
<target name="ng" depends="test"> |
| 801 |
– |
<java classname="SuperfluousAbstract" fork="true"> |
| 565 |
|
|
| 566 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
| 566 |
> |
<!-- Backward compatibility, work in progress (some files not checked in) --> |
| 567 |
> |
|
| 568 |
|
|
| 569 |
+ |
<target name="compat" depends="jar"> |
| 570 |
+ |
|
| 571 |
+ |
<mkdir dir="${build.testcases.dir}"/> |
| 572 |
+ |
|
| 573 |
+ |
<javac srcdir="${test.src.dir}" |
| 574 |
+ |
destdir="${build.testcases.dir}" |
| 575 |
+ |
debug="${build.debug}" |
| 576 |
+ |
debuglevel="${build.debuglevel}" |
| 577 |
+ |
deprecation="${build.deprecation}" |
| 578 |
+ |
source="${build.sourcelevel}" |
| 579 |
+ |
fork="true"> |
| 580 |
+ |
|
| 581 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
| 582 |
+ |
<compilerarg line="${build.args}"/> |
| 583 |
+ |
|
| 584 |
+ |
<classpath refid="test.classpath"/> |
| 585 |
+ |
|
| 586 |
+ |
<include name="Compatibility.java"/> |
| 587 |
+ |
|
| 588 |
+ |
</javac> |
| 589 |
+ |
|
| 590 |
+ |
|
| 591 |
+ |
<java classname="Compatibility" fork="true"> |
| 592 |
+ |
<jvmarg value="${bootclasspath.args}"/> |
| 593 |
+ |
<classpath refid="test.classpath"/> |
| 594 |
|
</java> |
| 595 |
|
</target> |
| 596 |
|
|
| 597 |
|
|
| 598 |
+ |
|
| 599 |
+ |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
| 600 |
+ |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
| 601 |
+ |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
| 602 |
+ |
<property name="pretiger.sourcelevel" value="1.4"/> |
| 603 |
+ |
|
| 604 |
+ |
<target name="defang" |
| 605 |
+ |
depends="init" |
| 606 |
+ |
description="Generates pre-Tiger compatible source"> |
| 607 |
+ |
|
| 608 |
+ |
<delete dir="${pretiger.src.dir}"/> |
| 609 |
+ |
<mkdir dir="${pretiger.src.dir}"/> |
| 610 |
+ |
|
| 611 |
+ |
<exec executable="perl"> |
| 612 |
+ |
<arg file="etc/defang.pl"/> |
| 613 |
+ |
<!-- <arg value="-v"/> --> |
| 614 |
+ |
<arg value="-s"/> <arg file="${src.dir}"/> |
| 615 |
+ |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
| 616 |
+ |
</exec> |
| 617 |
+ |
|
| 618 |
+ |
</target> |
| 619 |
+ |
|
| 620 |
+ |
<target name="compile-pretiger" |
| 621 |
+ |
depends="init, configure-compiler, defang" |
| 622 |
+ |
description="Compiles pre-Tiger sources to build folder"> |
| 623 |
+ |
|
| 624 |
+ |
<mkdir dir="${build.pretiger.dir}"/> |
| 625 |
+ |
|
| 626 |
+ |
<javac srcdir="${pretiger.src.dir}" |
| 627 |
+ |
destdir="${build.pretiger.dir}" |
| 628 |
+ |
debug="${build.debug}" |
| 629 |
+ |
debuglevel="${build.debuglevel}" |
| 630 |
+ |
deprecation="${build.deprecation}" |
| 631 |
+ |
source="${pretiger.sourcelevel}" |
| 632 |
+ |
fork="true"> |
| 633 |
+ |
|
| 634 |
+ |
<compilerarg line="${build.args}"/> |
| 635 |
+ |
<exclude name="**/Thread.java"/> |
| 636 |
+ |
|
| 637 |
+ |
</javac> |
| 638 |
+ |
|
| 639 |
+ |
</target> |
| 640 |
+ |
|
| 641 |
+ |
<target name="pretiger" depends="compile-pretiger"> |
| 642 |
+ |
|
| 643 |
+ |
<mkdir dir="${build.lib.dir}"/> |
| 644 |
+ |
|
| 645 |
+ |
<jar destfile="${pretiger.jar}"> |
| 646 |
+ |
<fileset dir="${build.pretiger.dir}"> |
| 647 |
+ |
</fileset> |
| 648 |
+ |
</jar> |
| 649 |
+ |
|
| 650 |
+ |
</target> |
| 651 |
+ |
|
| 652 |
|
</project> |
