OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Jun-2009 13:05:48
Branch: HEAD Handle: 2009062512054800
Added files:
openpkg-src/ant ant.patch
Modified files:
openpkg-src/ant ant.spec
Log:
run Ant and Ivy in headless mode
Summary:
Revision Changes Path
1.1 +12 -0 openpkg-src/ant/ant.patch
1.66 +4 -2 openpkg-src/ant/ant.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.patch
============================================================================
$ cvs diff -u -r0 -r1.1 ant.patch
--- /dev/null 2009-06-25 13:05:36 +0200
+++ ant.patch 2009-06-25 13:05:48 +0200
@@ -0,0 +1,12 @@
+Index: bin/ant
+--- bin/ant.orig 2008-06-27 07:03:55 +0200
++++ bin/ant 2009-06-25 13:02:37 +0200
+@@ -307,7 +307,7 @@
+ fi
+ # Execute ant using eval/exec to preserve spaces in paths,
+ # java options, and ant args
+-ant_sys_opts=
++ant_sys_opts="-Djava.awt.headless=true"
+ if [ -n "$CYGHOME" ]; then
+ if [ -n "$JIKESPATH" ]; then
+ ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\"
-Dcygwin.user.home=\"$CYGHOME\""
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.spec
============================================================================
$ cvs diff -u -r1.65 -r1.66 ant.spec
--- openpkg-src/ant/ant.spec 8 Jun 2009 08:50:21 -0000 1.65
+++ openpkg-src/ant/ant.spec 25 Jun 2009 11:05:48 -0000 1.66
@@ -38,7 +38,7 @@
Group: Building
License: Apache Software License
Version: %{V_ant}
-Release: 20090608
+Release: 20090625
# package options
%option with_docs no
@@ -52,6 +52,7 @@
Source5: rc.ant
Source6: ant.1
Source7: build.xml.5
+Patch0: ant.patch
# build information
Prefix: %{l_prefix}
@@ -92,6 +93,7 @@
%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}
+ %patch -p0
%build
# Note that there is nothing to build since the Ant binary distribution
@@ -131,7 +133,7 @@
echo "for jar in %{l_prefix}/libexec/ant/lib/ivy-*.jar; do"
echo " CP=\"\${CP}:\${jar}\""
echo "done"
- echo "%{l_prefix}/bin/java -cp \$CP org.apache.ivy.Main
\${1+\"\...@\"}"
+ echo "%{l_prefix}/bin/java -Djava.awt.headless=true -cp \$CP
org.apache.ivy.Main \${1+\"\...@\"}"
) >ivy.sh
%{l_shtool} install -c -m 755 \
ivy.sh $RPM_BUILD_ROOT%{l_prefix}/bin/ivy
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
