OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Mar-2008 09:02:33
Branch: HEAD Handle: 2008030508023200
Modified files:
openpkg-src/ant ant.spec
Log:
add Apache Ivy dependency resolver for Ant
Summary:
Revision Changes Path
1.51 +25 -6 openpkg-src/ant/ant.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 ant.spec
--- openpkg-src/ant/ant.spec 1 Jan 2008 14:50:29 -0000 1.50
+++ openpkg-src/ant/ant.spec 5 Mar 2008 08:02:32 -0000 1.51
@@ -23,6 +23,7 @@
# package version
%define V_ant 1.7.0
+%define V_ivy 2.0.0-beta2
%define V_junit 4.4
# package information
@@ -36,16 +37,17 @@
Group: Building
License: Apache Software License
Version: %{V_ant}
-Release: 20080101
+Release: 20080305
# package options
%option with_docs no
# list of sources
Source0:
http://www.apache.org/dist/ant/binaries/apache-ant-%{V_ant}-bin.tar.bz2
-Source1: http://switch.dl.sourceforge.net/junit/junit%{V_junit}.zip
-Source2: ant.conf
-Source3: rc.ant
+Source1:
http://www.apache.org/dist/ant/ivy/%{V_ivy}/apache-ivy-%{V_ivy}-bin-with-deps.tar.gz
+Source2: http://switch.dl.sourceforge.net/junit/junit%{V_junit}.zip
+Source3: ant.conf
+Source4: rc.ant
# build information
Prefix: %{l_prefix}
@@ -56,8 +58,9 @@
AutoReqProv: no
%description
- Apache Ant is a Java based build tool. In theory it is kind of like make
- without make's wrinkles. In practice it has its own wrinkles.
+ Apache Ant is a Java based build tool. In theory it is kind of like
+ make(1) without make(1)'s wrinkles. In practice it has its own
+ wrinkles.
%track
prog ant = {
@@ -65,6 +68,11 @@
url = http://www.apache.org/dist/ant/binaries/
regex = apache-ant-(__VER__)-bin\.tar\.bz2
}
+ prog ant:ivy = {
+ version = %{V_ivy}
+ url = http://www.apache.org/dist/ant/ivy/
+ regex = (\d+\.\d+(?:\.\d+)?-(?:beta\d+)?)
+ }
prog ant:junit = {
version = %{V_junit}
url = http://prdownloads.sourceforge.net/junit/
@@ -73,6 +81,7 @@
%prep
%setup -q -n apache-ant-%{V_ant}
+ %setup -q -n apache-ant-%{V_ant} -T -D -a 1
%{l_prefix}/bin/unzip -q %{SOURCE junit%{V_junit}.zip}
%build
@@ -97,6 +106,16 @@
%{l_shtool} install -c -m 644 \
lib/*.jar etc/*.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/
%{l_shtool} install -c -m 644 \
+ apache-ivy-*/ivy-%{V_ivy}.jar
$RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/ivy.jar
+ ( cd apache-ivy-*/lib
+ for jar in commons-cli-*.jar commons-codec-*.jar
commons-httpclient-*.jar commons-lang-*.jar \
+ commons-logging-*.jar commons-vfs-*.jar jsch-*.jar
oro-*.jar; do
+ newjar="ivy-`echo $jar | sed -e 's;-[0-9].*$;;'`.jar"
+ %{l_shtool} install -c -m 644 \
+ $jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/$newjar
+ done
+ ) || exit $?
+ %{l_shtool} install -c -m 644 \
junit*/junit-%{V_junit}.jar
$RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/junit.jar
%{l_shtool} install -c -m 644 \
etc/*.xsl etc/checkstyle/*.xsl $RPM_BUILD_ROOT%{l_prefix}/etc/ant/
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
