diff options
| -rw-r--r-- | dev-java/ant/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/ant/Manifest | 6 | ||||
| -rw-r--r-- | dev-java/ant/ant-1.6.1-r1.ebuild | 80 | ||||
| -rw-r--r-- | dev-java/ant/files/1.6.1/ant | 12 | ||||
| -rw-r--r-- | dev-java/ant/files/digest-ant-1.6.1-r1 | 1 |
5 files changed, 97 insertions, 8 deletions
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog index 8239984aae9d..e8db9443f4ae 100644 --- a/dev-java/ant/ChangeLog +++ b/dev-java/ant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ant # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.55 2004/03/11 20:37:24 zx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.56 2004/03/17 03:31:57 zx Exp $ + + 20 Mar 2004; Chris Aniszczyk <zx@gentoo.org> files/1.6.1/ant: + Updated ant to use the new launcher interface. + Thanks to Thomas Wutsch <twutsch@iicm.edu> for the updates. Closes #44804 11 Mar 2004; Chris Aniszczyk <zx@gentoo.org> ant-1.6.0-r2.ebuild, ant-1.6.1.ebuild: diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest index 033699cfda82..9dc890b12eb2 100644 --- a/dev-java/ant/Manifest +++ b/dev-java/ant/Manifest @@ -1,9 +1,10 @@ MD5 2e9b0a5d21fc23566a2c798663715690 ant-1.5.3-r5.ebuild 2940 MD5 f4e64adea8ec934cf9cfe3715209396f ant-1.6.0-r2.ebuild 1599 MD5 7a3356d18d70ed7e31bcaae973fc5c0f ant-1.5.4-r1.ebuild 3007 +MD5 94c7db86bc227f04f2d11735797dcb83 ant-1.6.1-r1.ebuild 2130 MD5 b35059511fe5e6e0c9ce447b203c07f4 ant-1.6.1.ebuild 2127 MD5 9c571ad4ad3cbbce68817f540248d714 ant-1.6.0-r3.ebuild 1593 -MD5 721ae0133cd2a1e246c123d70cd1f3ca ChangeLog 9998 +MD5 03e6304cfbda8d9e785e1d25b41df552 ChangeLog 10188 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1 74 @@ -13,9 +14,10 @@ MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r5 76 MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-1.5.4-r1 70 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r2 74 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r3 74 +MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1-r1 74 MD5 d3c75fa274bd1f48314029ca53b2c01e files/1.6.0-r2/ant 2440 MD5 de2a686ad048c6b78da419b0aa7aa857 files/1.6.0-r3/ant 2440 MD5 c2ce37282a033b7a00993e622c685a9e files/1.5.3/ant 2207 MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916 MD5 64e1d4bf5327dd353f61bc8b53c8ff5e files/1.5.4/ant 2271 -MD5 a7b435c9157a063dc9abb29eb39f3158 files/1.6.1/ant 2432 +MD5 426edc85161e4742f4a3b060090b726a files/1.6.1/ant 2514 diff --git a/dev-java/ant/ant-1.6.1-r1.ebuild b/dev-java/ant/ant-1.6.1-r1.ebuild new file mode 100644 index 000000000000..21aa7d2f2903 --- /dev/null +++ b/dev-java/ant/ant-1.6.1-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.1-r1.ebuild,v 1.1 2004/03/17 03:31:57 zx Exp $ + +inherit java-pkg + +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files." +SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2" +HOMEPAGE="http://ant.apache.org" +LICENSE="Apache-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +DEPEND="virtual/glibc + >=virtual/jdk-1.4 + >=dev-java/java-config-1.2 + !<dev-java/ant-optional-${PV}" +RDEPEND=">=virtual/jdk-1.4 + app-shells/bash + >=dev-java/java-config-1.2" +PDEPEND="=dev-java/ant-optional-${PV}" +IUSE="doc" + +S="${WORKDIR}/apache-ant-${PV}" + +pkg_setup() { + if [ -n "$JAVA_HOME" ] ; then + export CLASSPATH=".:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar:$JAVA_HOME/jre/lib/rt.jar:." + else + einfo "Warning: JAVA_HOME environment variable is not set (or not exported)." + einfo " If build fails because sun.* classes could not be found" + einfo " you will need to set the JAVA_HOME environment variable" + einfo " to the installation directory of java." + einfo " Try using java-config script" + die + fi + + if [ `arch` == "ppc" ] ; then + # We're compiling _ON_ PPC + export THREADS_FLAG="green" + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + + # Patch build.sh to die with non-zero exit code in case of errors. + # This patch may be useful for all ant versions. + epatch ${FILESDIR}/build.sh-exit-fix.patch.gz +} + +src_compile() { + addwrite "/proc/self/maps" + + local myc + myc="${myc} -Ddist.dir=${D}/usr/share/ant" + myc="${myc} -Djavac.target=1.4" + + echo $CLASSPATH + ./build.sh -Ddist.dir=${D}/usr/share/ant || die +} + +src_install() { + cp ${FILESDIR}/${PV}/ant ${S}/src/ant + exeinto /usr/bin + doexe src/ant + for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do + dobin ${S}/src/script/${each} + done + + insinto /etc/env.d + doins ${FILESDIR}/20ant + + java-pkg_dojar build/lib/ant.jar + java-pkg_dojar build/lib/ant-launcher.jar + + dodoc LICENSE LICENSE.* README WHATSNEW KEYS + use doc && dohtml welcome.html + use doc && dohtml -r docs/* +} diff --git a/dev-java/ant/files/1.6.1/ant b/dev-java/ant/files/1.6.1/ant index 39d574906892..1145ee266800 100644 --- a/dev-java/ant/files/1.6.1/ant +++ b/dev-java/ant/files/1.6.1/ant @@ -3,7 +3,7 @@ # Copyright (c) 2001-2003 The Apache Software Foundation. All rights # reserved. # Edited for Gentoo Linux -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.1/ant,v 1.1 2004/03/11 02:35:50 zx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.1/ant,v 1.2 2004/03/17 03:31:58 zx Exp $ if [ -f $HOME/.gentoo/java-env ] ; then source $HOME/.gentoo/java-env @@ -50,12 +50,13 @@ if [ ! -x "$JAVACMD" ] ; then exit 1 fi -if [ -n "$CLASSPATH" ] ; then - LOCALCLASSPATH="$CLASSPATH" +if [ -z "$LOCALCLASSPATH" ] ; then + LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar +else + LOCALCLASSPATH="$ANT_LIB/ant-launcher.jar:${LOCALCLASSPATH}:`java-config --classpath=ant,ant-optional,log4j,xerces,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,rhino,jython,jta,jaf,javamail 2> /dev/null`" fi # add in the dependency .jar files -LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant,ant-optional,log4j,xerces,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,rhino,jython,jta,jaf,javamail 2> /dev/null`" if [ -n "$JAVA_HOME" ] ; then if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then @@ -86,4 +87,5 @@ if [ "`arch`" == "ppc" ] ; then export THREADS_FLAG="green" fi -"$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@" +"$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib "$CLASSPATH" "$@" + diff --git a/dev-java/ant/files/digest-ant-1.6.1-r1 b/dev-java/ant/files/digest-ant-1.6.1-r1 new file mode 100644 index 000000000000..60b89a8cc1ed --- /dev/null +++ b/dev-java/ant/files/digest-ant-1.6.1-r1 @@ -0,0 +1 @@ +MD5 3e1f06aae6b691543299ccb1a5cb038f apache-ant-1.6.1-src.tar.bz2 6203438 |