diff options
author | Julien ROZO | 2008-08-30 14:03:55 +0200 |
---|---|---|
committer | Julien ROZO | 2008-08-30 14:03:55 +0200 |
commit | b986f29ae349cbe6c6e6788c9c1d7a5fffa80b22 (patch) | |
tree | 1a1ff1358d0849b1652b483a14f6bdfd25bfd69a /java | |
parent | 51153b81fbbab0348f3e7225eef95aed92246005 (diff) |
ant: updated version to 1.7.1 (fixing bug #13749), removed PATCHLEVEL
in BUILD, added junit to CLASSPATH if installed (fixing bug #3230), added unexport of CLASSPATH
added PRE_BUILD and ant-buildfile-junit.patch to remove junit testsif not installed (fixing bugs #13749 and #3230)
Diffstat (limited to 'java')
-rwxr-xr-x | java/ant/BUILD | 11 | ||||
-rwxr-xr-x | java/ant/DETAILS | 5 | ||||
-rw-r--r-- | java/ant/HISTORY | 8 | ||||
-rwxr-xr-x | java/ant/PRE_BUILD | 7 | ||||
-rw-r--r-- | java/ant/ant-buildfile-junit.patch | 11 |
5 files changed, 37 insertions, 5 deletions
diff --git a/java/ant/BUILD b/java/ant/BUILD index 1de551a49e..259dc2ff20 100755 --- a/java/ant/BUILD +++ b/java/ant/BUILD @@ -7,7 +7,14 @@ fi && set_java_env && if list_find "$OPTS" "--with-antlr"; then - export CLASSPATH="$INSTALL_ROOT/usr/share/antlr-$(installed_version antlr)/antlr.jar:$CLASSPATH" + CLASSPATH="$INSTALL_ROOT/usr/share/antlr-$(installed_version antlr)/antlr.jar:$CLASSPATH" fi && -./build.sh -Ddist.dir=antbuild dist +# fix bug #3230 +if spell_ok junit; then + CLASSPATH="$INSTALL_ROOT/usr/lib/java/ibm-dist/junit/junit-$(installed_version junit).jar:$CLASSPATH" +fi && + +export CLASSPATH && +./build.sh -Ddist.dir=antbuild dist && +export -p CLASSPATH diff --git a/java/ant/DETAILS b/java/ant/DETAILS index b41ddbea02..ee3846a9b2 100755 --- a/java/ant/DETAILS +++ b/java/ant/DETAILS @@ -1,11 +1,10 @@ SPELL=ant - VERSION=1.6.5 + VERSION=1.7.1 SOURCE=apache-$SPELL-$VERSION-src.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/apache-$SPELL-$VERSION SOURCE_URL[0]=http://archive.apache.org/dist/ant/source/$SOURCE SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE - SOURCE_HASH=sha512:d527c86df32045a1083c141bb5604b26ae94bb77f68e1bcad57fa86aa2c96c3648392597e793845c5753b3013a76259b18e433e686a0ac34612fba56761fe268 - PATCHLEVEL=1 + SOURCE_HASH=sha512:bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc LICENSE[0]=APACHE WEB_SITE=http://ant.apache.org/ KEYWORDS="java" diff --git a/java/ant/HISTORY b/java/ant/HISTORY index eb19169804..ca3ddfd00f 100644 --- a/java/ant/HISTORY +++ b/java/ant/HISTORY @@ -1,3 +1,11 @@ +2008-08-30 Julien "_kaze_" ROZO <julien@rozo.org> + * DETAILS: updated version to 1.7.1 (fixing bug #13749), + removed PATCHLEVEL + * BUILD: added junit to CLASSPATH if installed (fixing bug #3230), + added unexport of CLASSPATH + * PRE_BUILD, ant-buildfile-junit.patch: added to remove junit tests + if not installed (fixing bugs #13749 and #3230) + 2008-08-05 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: Requires javac (from a JDK) diff --git a/java/ant/PRE_BUILD b/java/ant/PRE_BUILD new file mode 100755 index 0000000000..5c5cb06d8f --- /dev/null +++ b/java/ant/PRE_BUILD @@ -0,0 +1,7 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && + +# fix bugs #13749 and #3230 : removing junit task if not installed +if ! spell_ok junit; then + patch -p0 < ${SPELL_DIRECTORY}/ant-buildfile-junit.patch +fi diff --git a/java/ant/ant-buildfile-junit.patch b/java/ant/ant-buildfile-junit.patch new file mode 100644 index 0000000000..21a4a0de3b --- /dev/null +++ b/java/ant/ant-buildfile-junit.patch @@ -0,0 +1,11 @@ +--- build.xml.old 2008-08-30 13:59:52.000000000 +0200 ++++ build.xml 2008-08-30 14:00:00.000000000 +0200 +@@ -925,7 +925,7 @@ + =================================================================== + --> + <target name="dist-lite" +- depends="jars,test-jar" ++ depends="jars" + description="--> creates a minimum distribution to run Apache Ant"> + + <mkdir dir="${dist.dir}"/> |