--------------------------------------------------
From: <bode...@apache.org>
Sent: Wednesday, May 05, 2010 12:05 AM
To: <comm...@gump.apache.org>
Subject: svn commit: r941172 - in /gump/metadata/project: apache-httpd.xml
logging-log4cxx.xml
Author: bodewig
Date: Wed May 5 07:05:50 2010
New Revision: 941172
URL: http://svn.apache.org/viewvc?rev=941172&view=rev
Log:
what would break if we removed the old apr-util branch?
Urm, pretty much every thing. The problem is that current apr-util/trunk
won't build with apr/trunk. IMHO this is a problem for the Apache-Apr
community to work out. We could provide a legacy apr build to fix this in
the meantime, but not really the Gump Way.
Modified:
gump/metadata/project/apache-httpd.xml
gump/metadata/project/logging-log4cxx.xml
Modified: gump/metadata/project/apache-httpd.xml
URL:
http://svn.apache.org/viewvc/gump/metadata/project/apache-httpd.xml?rev=941172&r1=941171&r2=941172&view=diff
==============================================================================
--- gump/metadata/project/apache-httpd.xml (original)
+++ gump/metadata/project/apache-httpd.xml Wed May 5 07:05:50 2010
@@ -29,11 +29,11 @@
<script name="buildconf">
<arg name="--with-apr" project="apr-make-install"
reference="home"/>
- <arg name="--with-apr-util" project="apr-util-make-install"
- reference="home"/>
+ <!--arg name="--with-apr-util" project="apr-util-make-install"
+ reference="home"/-->
</script>
<depend project="apr-make-install"/>
- <depend project="apr-util-make-install"/>
+ <!--depend project="apr-util-make-install"/-->
</project>
<project name="apache-httpd-configure">
@@ -41,8 +41,8 @@
<arg name="--prefix" path="dest-@@DATE@@"/>
<arg name="--with-apr" project="apr-configure"
reference="home"/>
- <arg name="--with-apr-util" project="apr-util-configure"
- reference="home"/>
+ <!--arg name="--with-apr-util" project="apr-util-configure"
+ reference="home"/-->
<arg name="--with-pcre" project="pcre-configure"
reference="home"/>
</configure>
Modified: gump/metadata/project/logging-log4cxx.xml
URL:
http://svn.apache.org/viewvc/gump/metadata/project/logging-log4cxx.xml?rev=941172&r1=941171&r2=941172&view=diff
==============================================================================
--- gump/metadata/project/logging-log4cxx.xml (original)
+++ gump/metadata/project/logging-log4cxx.xml Wed May 5 07:05:50 2010
@@ -31,8 +31,8 @@
<!-- property name="version" value="@@DATE@@"/ -->
<property name="apr.dir" project="apr-configure"
reference="home"/>
- <property name="aprutil.dir" project="apr-util-configure"
- reference="home"/>
+ <!--property name="aprutil.dir" project="apr-util-configure"
+ reference="home"/-->
<property name="find" value="false"/>
</ant>
@@ -42,7 +42,7 @@
<depend project="ant-contrib-cpptasks"/>
<depend project="ant-contrib" inherit="runtime"/>
<depend project="apr-make-install"/>
- <depend project="apr-util-make-install"/>
+ <!--depend project="apr-util-make-install"/-->
<nag to="carn...@apache.org"
from="Gump Integration Build <carn...@apache.org>"/>
@@ -55,8 +55,8 @@
<!-- property name="version" value="@@DATE@@"/ -->
<property name="apr.dir" project="apr-configure"
reference="home"/>
- <property name="aprutil.dir" project="apr-util-configure"
- reference="home"/>
+ <!--property name="aprutil.dir" project="apr-util-configure"
+ reference="home"/-->
<property name="find" value="false"/>
</ant>
@@ -66,7 +66,7 @@
<depend project="ant-contrib-cpptasks"/>
<depend project="ant-contrib" inherit="runtime"/>
<depend project="apr-make-install"/>
- <depend project="apr-util-make-install"/>
+ <!--depend project="apr-util-make-install"/-->
<nag to="carn...@apache.org"
from="Gump Integration Build <carn...@apache.org>"/>
@@ -79,8 +79,8 @@
<!-- property name="version" value="@@DATE@@"/ -->
<property name="apr.dir" project="apr-configure"
reference="home"/>
- <property name="aprutil.dir" project="apr-util-configure"
- reference="home"/>
+ <!--property name="aprutil.dir" project="apr-util-configure"
+ reference="home"/-->
<property name="lib.type" value="static"/>
<property name="find" value="false"/>
</ant>
@@ -91,7 +91,7 @@
<depend project="ant-contrib-cpptasks"/>
<depend project="ant-contrib" inherit="runtime"/>
<depend project="apr-make-install"/>
- <depend project="apr-util-make-install"/>
+ <!--depend project="apr-util-make-install"/-->
<nag to="carn...@apache.org"
from="Gump Integration Build <carn...@apache.org>"/>
@@ -106,11 +106,11 @@
<configure>
<arg name="--prefix" path="dest-@@DATE@@"/>
<arg name="--with-apr" project="apr-make-install" reference="home"/>
- <arg name="--with-apr-util" project="apr-util-make-install"
reference="home"/>
+ <!--arg name="--with-apr-util" project="apr-util-make-install"
reference="home"/-->
</configure>
<depend project="logging-log4cxx-autogen"/>
<depend project="apr-make-install"/>
- <depend project="apr-util-make-install"/>
+ <!--depend project="apr-util-make-install"/-->
<home nested="dest-@@DATE@@"/>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscr...@gump.apache.org
For additional commands, e-mail: general-h...@gump.apache.org
