-AUX 1.6.2-ant 5058 RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 SHA1 fb423fa1d5c4776950bd4b640b58fc7fc1f73ecf SHA256 ea8b41190c6a5b89b7a111a9fc901ad6fa294d3696cfcb9ba58a0f969a305071
-MD5 816ea8a6a51471da4c8df2f59434fc9d files/1.6.2-ant 5058
-RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 files/1.6.2-ant 5058
-SHA256 ea8b41190c6a5b89b7a111a9fc901ad6fa294d3696cfcb9ba58a0f969a305071 files/1.6.2-ant 5058
-AUX 1.6.2-scp.patch 877 RMD160 ec85134b9c10d603e893ebae068197761efc1b4b SHA1 777d55b752de79518c634d5d7369c3998d79d6a2 SHA256 a11a69f16a3d3e469ed9bdb87282c1e11fef103b19bf108e82ec98434d70950a
-MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
-RMD160 ec85134b9c10d603e893ebae068197761efc1b4b files/1.6.2-scp.patch 877
-SHA256 a11a69f16a3d3e469ed9bdb87282c1e11fef103b19bf108e82ec98434d70950a files/1.6.2-scp.patch 877
AUX 1.6.5-ant 5207 RMD160 95b043c0f0cab82b8a3b18625214b42945b7c69c SHA1 ad745a52964270c1713a0ae9cc1a5c5f91e61e05 SHA256 47f223399a08e199e219a4da2e42c43d37138f5ef1024b6f238ab6c8de007be5
MD5 123ab261c3aebaf247db2551a0a890b0 files/1.6.5-ant 5207
RMD160 95b043c0f0cab82b8a3b18625214b42945b7c69c files/1.6.5-ant 5207
MD5 ea37e3a5b2edbe1b1fca02ba48c4ea47 files/build.sh-exit-fix.patch 345
RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d files/build.sh-exit-fix.patch 345
SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b files/build.sh-exit-fix.patch 345
-AUX rpmbuild.patch 3116 RMD160 c30ff8e1d3011946753ed250485ef944237b54ab SHA1 ae345c1f542e176cf501526d8416aedb7ce920a9 SHA256 8980a3210e84ce2b8fce34c5f541ebe22c406c281e47e0dbf202aceefeec736e
-MD5 d956471b5a9d9f51778afe97db252d5d files/rpmbuild.patch 3116
-RMD160 c30ff8e1d3011946753ed250485ef944237b54ab files/rpmbuild.patch 3116
-SHA256 8980a3210e84ce2b8fce34c5f541ebe22c406c281e47e0dbf202aceefeec736e files/rpmbuild.patch 3116
-DIST apache-ant-1.6.2-src.tar.bz2 6282237 RMD160 ed001f753f62786e532d0ba68ff9be12836a47aa SHA1 6f43868b716b55beedbffbe3fd537c68e5588a11 SHA256 e41efd586e043acdcd649db622b4b54410eaebe4c33c7451a02c333870bc7a3c
DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
-EBUILD ant-core-1.6.2-r5.ebuild 2065 RMD160 7b40e7dc6be31d0665f929b22714675997d33f15 SHA1 7df4e684bb8980877956fc4e07409394da0a80c5 SHA256 81a0ff08e46cdba1ce651e3b77b282a669b68fb56aef762a6c868c58504fba0d
-MD5 bea43763ad224e91d869a4837ed01ac0 ant-core-1.6.2-r5.ebuild 2065
-RMD160 7b40e7dc6be31d0665f929b22714675997d33f15 ant-core-1.6.2-r5.ebuild 2065
-SHA256 81a0ff08e46cdba1ce651e3b77b282a669b68fb56aef762a6c868c58504fba0d ant-core-1.6.2-r5.ebuild 2065
EBUILD ant-core-1.6.5-r14.ebuild 1858 RMD160 1dff6e914ce7cf61b3e43ecd8a3f8649b54cbe49 SHA1 091046be56c641bc8f48876761a1300d88edba6c SHA256 d3aa3b0b072626abd77607a6788c14c97a00fb174c7e8daa6f948f897394ca9e
MD5 5eae4a13094ad5c03bb9b1a736b23434 ant-core-1.6.5-r14.ebuild 1858
RMD160 1dff6e914ce7cf61b3e43ecd8a3f8649b54cbe49 ant-core-1.6.5-r14.ebuild 1858
SHA256 d3aa3b0b072626abd77607a6788c14c97a00fb174c7e8daa6f948f897394ca9e ant-core-1.6.5-r14.ebuild 1858
-EBUILD ant-core-1.6.5-r2.ebuild 1978 RMD160 7b0e737096eecb1b43e8e38baeea5fa72fae58ed SHA1 06b8403882572608e84b9b32bd7dddb9c7a1290c SHA256 7a409add646f81750f7aba528f0c8bb352051580ac1b9b7bbf05565d43aefe0b
-MD5 c10aa50c455475738459a716c561de2c ant-core-1.6.5-r2.ebuild 1978
-RMD160 7b0e737096eecb1b43e8e38baeea5fa72fae58ed ant-core-1.6.5-r2.ebuild 1978
-SHA256 7a409add646f81750f7aba528f0c8bb352051580ac1b9b7bbf05565d43aefe0b ant-core-1.6.5-r2.ebuild 1978
-MISC ChangeLog 22278 RMD160 01e3d9816ccb68d0a7d4380c4e15a20ce744bc73 SHA1 022d34cc35111533e10f80644331c321a37f5658 SHA256 307676c70e42330eb990ad34c4d04dfc9669adae75c6e5bba358681f29733945
-MD5 97aaef851793f803d433dd975c9b127d ChangeLog 22278
-RMD160 01e3d9816ccb68d0a7d4380c4e15a20ce744bc73 ChangeLog 22278
-SHA256 307676c70e42330eb990ad34c4d04dfc9669adae75c6e5bba358681f29733945 ChangeLog 22278
+MISC ChangeLog 22538 RMD160 97e9b21e4cfb8134596b9089aa1733c5f3b3843d SHA1 ad4afb95464803a012972292936420fbad58cdd6 SHA256 552e7c20f6e664d5e25e43c58370f82c59b1d16008e0f34a089c110759776a49
+MD5 80212778d0e56604e43a77fc95eb6830 ChangeLog 22538
+RMD160 97e9b21e4cfb8134596b9089aa1733c5f3b3843d ChangeLog 22538
+SHA256 552e7c20f6e664d5e25e43c58370f82c59b1d16008e0f34a089c110759776a49 ChangeLog 22538
MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
-MD5 21d95e3502c7e14cb7893059f3d7f775 files/digest-ant-core-1.6.2-r5 268
-RMD160 aed86ecdae1d5e5a6bb57d5ae7a4730002535f7f files/digest-ant-core-1.6.2-r5 268
-SHA256 6bb84dbe413ac8ae2d5fdec3bbd48c1a25de21086b080cc616e3e55544636254 files/digest-ant-core-1.6.2-r5 268
MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-core-1.6.5-r14 268
RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-core-1.6.5-r14 268
SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-core-1.6.5-r14 268
-MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-core-1.6.5-r2 268
-RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-core-1.6.5-r2 268
-SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-core-1.6.5-r2 268
+++ /dev/null
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2-r5.ebuild,v 1.4 2006/10/05 15:00:45 gustavoz Exp $
-
-inherit java-pkg eutils
-
-MY_PN=${PN/-core}
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc ppc64"
-IUSE="doc source"
-
-DEPEND="!<dev-java/ant-1.5.4-r2
- !<dev-java/ant-tasks-${PV}
- source? ( app-arch/zip )
- >=virtual/jdk-1.4"
-RDEPEND=">=virtual/jdk-1.4
- >=dev-java/java-config-1.2"
-
-S="${WORKDIR}/apache-ant-${PV}"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # also see #77365 and
- # http://sourceforge.net/mailarchive/forum.php?thread_id=6173225&forum_id=12628
- epatch ${FILESDIR}/${PV}-scp.patch
-
- # 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
-}
-
-src_compile() {
- addwrite "/proc/self/maps"
- if [ `arch` == "ppc" ] ; then
- # We're compiling _ON_ PPC
- export THREADS_FLAG="green"
- fi
-
-
- local myc
- myc="${myc} -Ddist.dir=${D}/usr/share/${PN}"
- myc="${myc} -Djavac.target=1.4"
- echo $CLASSPATH
- CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die
-
- use doc && ./build.sh dist_javadocs
-}
-
-src_install() {
- newbin ${FILESDIR}/${PV}-ant ant || die "failed to install wrapper"
-
- dodir /usr/share/${PN}/bin
- for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
- dobin ${S}/src/script/${each}
- dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
- done
-
- dodir /etc/env.d
- echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant
-
- java-pkg_dojar build/lib/ant.jar
- java-pkg_dojar build/lib/ant-launcher.jar
-
- use source && java-pkg_dosrc src/main/*
-
- dodoc README WHATSNEW KEYS
- use doc && dohtml welcome.html
- use doc && java-pkg_dohtml -r docs/*
- use doc && java-pkg_dohtml -r dist/docs/manual/api/*
-}
+++ /dev/null
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r2.ebuild,v 1.7 2006/10/05 15:00:45 gustavoz Exp $
-
-inherit java-pkg eutils toolchain-funcs
-
-MY_PN=${PN/-core}
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc ~ppc64 ~x86"
-IUSE="doc source"
-
-DEPEND="!<dev-java/ant-1.5.4-r2
- >=virtual/jdk-1.4
- !<dev-java/ant-tasks-${PV}
- source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.4
- >=dev-java/java-config-1.2"
-
-S="${WORKDIR}/apache-ant-${MY_PV}"
-
-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
-}
-
-src_compile() {
- addwrite "/proc/self/maps"
- if [[ $(tc-arch) == "ppc" ]] ; then
- # We're compiling _ON_ PPC
- export THREADS_FLAG="green"
- fi
-
-
- local myc
- myc="${myc} -Ddist.dir=${D}/usr/share/${PN}"
- myc="${myc} -Djavac.target=1.4"
- echo $CLASSPATH
- CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die
-
- use doc && ./build.sh dist_javadocs
-}
-
-src_install() {
- newbin ${FILESDIR}/${PV/_*}-ant ant || die "failed to install wrapper"
-
- dodir /usr/share/${PN}/bin
- for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
- dobin ${S}/src/script/${each}
- dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
- done
-
- dodir /etc/env.d
- echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant
-
- java-pkg_dojar build/lib/ant.jar
- java-pkg_dojar build/lib/ant-launcher.jar
-
- use source && java-pkg_dosrc src/main/*
-
- dodoc README WHATSNEW KEYS
- use doc && dohtml welcome.html
- use doc && java-pkg_dohtml -r docs/*
- use doc && java-pkg_dohtml -r dist/docs/manual/api/*
-}
+++ /dev/null
-#! /bin/bash
-
-# Copyright 2001-2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Edited for Gentoo Linux
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.9 2005/09/11 11:26:42 axxo Exp $
-
-# Extract launch and ant arguments, (see details below).
-ant_exec_args=
-no_config=false
-use_jikes_default=false
-ant_exec_debug=false
-show_help=false
-for arg in "$@" ; do
- if [ "$arg" = "--noconfig" ] ; then
- no_config=true
- elif [ "$arg" = "--usejikes" ] ; then
- use_jikes_default=true
- elif [ "$arg" = "--execdebug" ] ; then
- ant_exec_debug=true
- elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then
- show_help=true
- ant_exec_args="$ant_exec_args -h"
- else
- if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then
- show_help=true
- fi
- ant_exec_args="$ant_exec_args \"$arg\""
- fi
-done
-
-# Source/default ant configuration
-if $no_config ; then
- rpm_mode=false
- usejikes=$use_jikes_default
-else
- # load system-wide ant configuration
- if [ -f "/etc/ant.conf" ] ; then
- . /etc/ant.conf
- fi
-
- # load user ant configuration
- if [ -f "$HOME/.ant/ant.conf" ] ; then
- . $HOME/.ant/ant.conf
- fi
- if [ -f "$HOME/.antrc" ] ; then
- . "$HOME/.antrc"
- fi
-
- # provide default configuration values
- if [ -z "$rpm_mode" ] ; then
- rpm_mode=false
- fi
- if [ -z "$usejikes" ] ; then
- usejikes=$use_jikes_default
- fi
-fi
-
-
-if [ -z $JAVA_HOME ] ; then
- if [ -f $HOME/.gentoo/java-env ] ; then
- source $HOME/.gentoo/java-env
- else
- JAVA_HOME=`java-config --jdk-home`
- CLASSPATH=`java-config --classpath`:${CLASSPATH}
- fi
-fi
-
-if [ -z $JAVA_HOME ] ; then
- echo "Error: No JDK found!"
- echo "Try using java-config script to set your JDK"
- echo "Remember that you need a JDK not a JRE"
- exit 1
-fi
-
-ANT_HOME=/usr/share/ant-core
-
-# set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
-
-JAVACMD="`java-config --java`"
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly."
- echo " We cannot execute $JAVACMD"
- exit 1
-fi
-
-if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
-else
- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
-fi
-
-# add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,sun-jaf-bin,sun-javamail-bin 2> /dev/null`"
-
-if [ -n "$JAVA_HOME" ] ; then
- if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
- fi
-
- if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
- fi
-
-else
- echo "Warning: JAVA_HOME environment variable is not set (or not exported)."
- echo " If build fails because sun.* classes could not be found"
- echo " you will need to set the JAVA_HOME environment variable"
- echo " to the installation directory of java."
- echo " Try using java-config script"
-fi
-
-# Allow Jikes support (off by default)
-if $usejikes; then
- ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
-fi
-
-# Show script help if requested
-if $show_help ; then
- echo $0 '[script options] [options] [target [target2 [target3] ..]]'
- echo 'Script Options:'
- echo ' --help, --h print this message and ant help'
- echo ' --noconfig suppress sourcing of /etc/ant.conf,'
- echo ' $HOME/.ant/ant.conf, and $HOME/.antrc'
- echo ' configuration files'
- echo ' --usejikes enable use of jikes by default, unless'
- echo ' set explicitly in configuration files'
- echo ' --execdebug print ant exec line generated by this'
- echo ' launch script'
- echo ' '
-fi
-
-# Execute ant using eval/exec to preserve spaces in paths,
-# java options, and ant args
-ant_sys_opts=
-
-
-if [ -n "$JIKESPATH" ]; then
- ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
-fi
-
-# 2002-11-02, karltk@gentoo.org:
-# The Blackdown JDK on PPC hiccups with native threads
-#
-if [ "`arch`" == "ppc" ] ; then
- export THREADS_FLAG="green"
-fi
-
-
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib \"$CLASSPATH\" $ant_exec_args"
-
-if $ant_exec_debug ; then
- echo $ant_exec_command
-fi
-eval $ant_exec_command
+++ /dev/null
-diff -urpN apache-ant-1.6.2.orig/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
---- apache-ant-1.6.2.orig/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java 2005-02-03 21:37:32.032911472 +0100
-+++ apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java 2005-02-03 21:38:37.399974168 +0100
-@@ -112,7 +112,7 @@ public class ScpToMessage extends Abstra
- }\r
- \r
- private void doMultipleTransfer() throws IOException, JSchException {\r
-- Channel channel = openExecChannel("scp -d -t " + remotePath);\r
-+ Channel channel = openExecChannel("scp -r -d -t " + remotePath);\r
- try {\r
- OutputStream out = channel.getOutputStream();\r
- InputStream in = channel.getInputStream();\r
+++ /dev/null
-MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237
-RMD160 ed001f753f62786e532d0ba68ff9be12836a47aa apache-ant-1.6.2-src.tar.bz2 6282237
-SHA256 e41efd586e043acdcd649db622b4b54410eaebe4c33c7451a02c333870bc7a3c apache-ant-1.6.2-src.tar.bz2 6282237
+++ /dev/null
-MD5 80a7ad191c40b7d8c82533524b282b6b apache-ant-1.6.5-src.tar.bz2 6283500
-RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 apache-ant-1.6.5-src.tar.bz2 6283500
-SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59 apache-ant-1.6.5-src.tar.bz2 6283500
+++ /dev/null
---- src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java 2003-10-13 02:19:42.000000000 +0000
-+++ src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java 2003-10-13 02:24:16.000000000 +0000
-@@ -59,6 +59,8 @@
- import java.io.BufferedOutputStream;
- import java.io.FileOutputStream;
- import java.io.IOException;
-+import java.util.Enumeration;
-+import java.util.Vector;
- import org.apache.tools.ant.Task;
- import org.apache.tools.ant.BuildException;
- import org.apache.tools.ant.Project;
-@@ -67,7 +69,9 @@
- import org.apache.tools.ant.taskdefs.LogOutputStream;
- import org.apache.tools.ant.taskdefs.PumpStreamHandler;
- import org.apache.tools.ant.taskdefs.Execute;
-+import org.apache.tools.ant.taskdefs.condition.Os;
- import org.apache.tools.ant.types.Commandline;
-+import org.apache.tools.ant.types.Path;
-
- /**
- * Invokes the rpm tool to build a Linux installation file.
-@@ -91,6 +95,12 @@
- private String command = "-bb";
-
- /**
-+ * The executable to use for building the packages.
-+ * @since Ant 1.6
-+ */
-+ private String rpmBuildCommand = null;
-+
-+ /**
- * clean BUILD directory
- */
- private boolean cleanBuildDir = false;
-@@ -119,6 +129,9 @@
-
- Commandline toExecute = new Commandline();
-
-- toExecute.setExecutable("rpm");
-+ toExecute.setExecutable(rpmBuildCommand == null
-+ ? guessRpmBuildCommand()
-+ : rpmBuildCommand);
-+
- if (topDir != null) {
- toExecute.createArgument().setValue("--define");
-@@ -260,4 +273,49 @@
- public void setError(File error) {
- this.error = error;
- }
-+
-+ /**
-+ * The executable to run when building; optional.
-+ * The default is <code>rpmbuild</code>.
-+ *
-+ * @since Ant 1.6
-+ * @param c the rpm build executable
-+ */
-+ public void setRpmBuildCommand(String c) {
-+ this.rpmBuildCommand = c;
-+ }
-+
-+ /**
-+ * Checks whether <code>rpmbuild</code> is on the PATH and returns
-+ * the absolute path to it - falls back to <code>rpm</code>
-+ * otherwise.
-+ *
-+ * @since 1.6
-+ */
-+ protected String guessRpmBuildCommand() {
-+ Vector env = Execute.getProcEnvironment();
-+ String path = null;
-+ for (Enumeration enum = env.elements(); enum.hasMoreElements();) {
-+ String var = (String) enum.nextElement();
-+ if (var.startsWith("PATH=") || var.startsWith("Path=")) {
-+ path = var.substring(6 /* "PATH=".length() + 1 */);
-+ break;
-+ }
-+ }
-+
-+ if (path != null) {
-+ Path p = new Path(getProject(), path);
-+ String[] pElements = p.list();
-+ for (int i = 0; i < pElements.length; i++) {
-+ File f = new File(pElements[i],
-+ "rpmbuild"
-+ + (Os.isFamily("dos") ? ".exe" : ""));
-+ if (f.canRead()) {
-+ return f.getAbsolutePath();
-+ }
-+ }
-+ }
-+
-+ return "rpm";
-+ }
- }
projects / gentoo.git / commitdiff