diff options
| author | Vlad Glagolev | 2011-10-15 23:00:58 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2011-10-15 23:00:58 +0400 |
| commit | 8b7c13c8a46321f86af437d134e8438a13c26740 (patch) | |
| tree | 3f9c56a97c7e0e6749d4072f8191fa89ccbe8816 | |
| parent | d61e78ea43ad201de56edb7affb63fc23965e983 (diff) | |
ant: => 1.8.2
| -rwxr-xr-x | java/ant/DETAILS | 7 | ||||
| -rw-r--r-- | java/ant/HISTORY | 7 | ||||
| -rwxr-xr-x | java/ant/PRE_BUILD | 4 | ||||
| -rw-r--r-- | java/ant/ant-buildfile-junit.patch | 11 | ||||
| -rw-r--r-- | java/ant/ant.sh | 7 |
5 files changed, 15 insertions, 21 deletions
diff --git a/java/ant/DETAILS b/java/ant/DETAILS index ee3846a9b2..e2231c668d 100755 --- a/java/ant/DETAILS +++ b/java/ant/DETAILS @@ -1,10 +1,9 @@ SPELL=ant - VERSION=1.7.1 + VERSION=1.8.2 SOURCE=apache-$SPELL-$VERSION-src.tar.bz2 -SOURCE_DIRECTORY=$BUILD_DIRECTORY/apache-$SPELL-$VERSION +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:bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc + SOURCE_HASH=sha512:d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c LICENSE[0]=APACHE WEB_SITE=http://ant.apache.org/ KEYWORDS="java" diff --git a/java/ant/HISTORY b/java/ant/HISTORY index ca3ddfd00f..74ea80abbc 100644 --- a/java/ant/HISTORY +++ b/java/ant/HISTORY @@ -1,3 +1,10 @@ +2011-10-15 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 1.8.2; removed broken mirror; quoting paths + * PRE_BUILD: replaced patch with simple sed + * ant-buildfile-junit.patch: removed + * ant.sh: always override JAVA_HOME (in situations like when a user + switches from JRE to JDK with different java binary paths) + 2008-08-30 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: updated version to 1.7.1 (fixing bug #13749), removed PATCHLEVEL diff --git a/java/ant/PRE_BUILD b/java/ant/PRE_BUILD index 5c5cb06d8f..b9ee217a2f 100755 --- a/java/ant/PRE_BUILD +++ b/java/ant/PRE_BUILD @@ -1,7 +1,7 @@ default_pre_build && -cd $SOURCE_DIRECTORY && +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 + sedit "s:,test-jar::" build.xml fi diff --git a/java/ant/ant-buildfile-junit.patch b/java/ant/ant-buildfile-junit.patch deleted file mode 100644 index 21a4a0de3b..0000000000 --- a/java/ant/ant-buildfile-junit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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}"/> diff --git a/java/ant/ant.sh b/java/ant/ant.sh index 6362a9fcdb..c71fb6667a 100644 --- a/java/ant/ant.sh +++ b/java/ant/ant.sh @@ -3,10 +3,9 @@ # then if not set, check it (maybe), then set it if [ -z "$ANT_HOME" ] ; then - if [ -z "$JAVA_HOME" ] ; then - source /etc/profile.d/java.sh - fi - ANT_HOME=/opt/ant + source /etc/profile.d/java.sh + + ANT_HOME=/opt/ant fi export ANT_HOME |