|
@@ -41,6 +41,7 @@ |
|
|
<property name="regexp.package" value="${util.package}/regexp"/> |
|
|
<property name="regexp.package" value="${util.package}/regexp"/> |
|
|
|
|
|
|
|
|
<property name="optional.jars.prefix" value="ant"/> |
|
|
<property name="optional.jars.prefix" value="ant"/> |
|
|
|
|
|
<property name="optional.jars.whenmanifestonly" value="skip"/> |
|
|
|
|
|
|
|
|
<!-- |
|
|
<!-- |
|
|
=================================================================== |
|
|
=================================================================== |
|
@@ -166,7 +167,7 @@ |
|
|
<filename name="${taskdefs.package}/AptTest*"/> |
|
|
<filename name="${taskdefs.package}/AptTest*"/> |
|
|
</or> |
|
|
</or> |
|
|
</selector> |
|
|
</selector> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- Kaffe has some JDK 1.5 features including java.lang.Readable, |
|
|
<!-- Kaffe has some JDK 1.5 features including java.lang.Readable, |
|
|
but not all of them --> |
|
|
but not all of them --> |
|
|
<selector id="not.in.kaffe"> |
|
|
<selector id="not.in.kaffe"> |
|
@@ -899,8 +900,8 @@ |
|
|
<sequential> |
|
|
<sequential> |
|
|
<jar destfile="${build.lib}/${optional.jars.prefix}-@{dep}.jar" |
|
|
<jar destfile="${build.lib}/${optional.jars.prefix}-@{dep}.jar" |
|
|
basedir="${build.classes}" |
|
|
basedir="${build.classes}" |
|
|
manifest="${manifest.tmp}" |
|
|
|
|
|
whenmanifestonly="skip"> |
|
|
|
|
|
|
|
|
manifest="${manifest.tmp}" |
|
|
|
|
|
whenmanifestonly="${optional.jars.whenmanifestonly}"> |
|
|
<selector refid="needs.@{dep}"/> |
|
|
<selector refid="needs.@{dep}"/> |
|
|
</jar> |
|
|
</jar> |
|
|
</sequential> |
|
|
</sequential> |
|
@@ -1262,7 +1263,7 @@ |
|
|
<checksum fileext=".sha1" algorithm="SHA"> |
|
|
<checksum fileext=".sha1" algorithm="SHA"> |
|
|
<fileset dir="${java-repository.dir}" includes="*${version}.jar"/> |
|
|
<fileset dir="${java-repository.dir}" includes="*${version}.jar"/> |
|
|
</checksum> |
|
|
</checksum> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<delete dir="${dist.name}"/> |
|
|
<delete dir="${dist.name}"/> |
|
|
<checksum fileext=".md5"> |
|
|
<checksum fileext=".md5"> |
|
|
<fileset dir="${dist.base.binaries}/"> |
|
|
<fileset dir="${dist.base.binaries}/"> |
|
@@ -1608,7 +1609,7 @@ |
|
|
value="${tests-classpath.value}"/> |
|
|
value="${tests-classpath.value}"/> |
|
|
<sysproperty key="root" file="${basedir}"/> |
|
|
<sysproperty key="root" file="${basedir}"/> |
|
|
<sysproperty key="build.compiler" value="${build.compiler}"/> |
|
|
<sysproperty key="build.compiler" value="${build.compiler}"/> |
|
|
<sysproperty key="tests.and.ant.share.classloader" |
|
|
|
|
|
|
|
|
<sysproperty key="tests.and.ant.share.classloader" |
|
|
value="${tests.and.ant.share.classloader}"/> |
|
|
value="${tests.and.ant.share.classloader}"/> |
|
|
<formatter type="brief" usefile="false"/> |
|
|
<formatter type="brief" usefile="false"/> |
|
|
|
|
|
|
|
@@ -1807,4 +1808,4 @@ |
|
|
description="--> creates a minimum distribution in ./dist" |
|
|
description="--> creates a minimum distribution in ./dist" |
|
|
depends="dist-lite"/> |
|
|
depends="dist-lite"/> |
|
|
|
|
|
|
|
|
</project> |
|
|
|
|
|
|
|
|
</project> |