Author: carnold
Date: Tue Jul 24 16:32:29 2007
New Revision: 559259
URL: http://svn.apache.org/viewvc?view=rev&rev=559259
Log:
LOGCXX-189: Update build for snapshotted APR, APR-util
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/apr-util/apr-util-1.2.8/xml/expat/lib/ (props
changed)
logging/log4cxx/trunk/src/apr/apr-1.2.9/docs/pool-design.html (contents,
props changed)
Modified: logging/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?view=diff&rev=559259&r1=559258&r2=559259
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Jul 24 16:32:29 2007
@@ -455,26 +455,8 @@
replace="1"/>
</target>
-<target name="untar-apr-module">
- <untar src="src/${module}/${module}-${module.version}.tar.gz"
- dest="${lib.dir}" compression="gzip"/>
- <chmod file="${lib.dir}/${module}-${module.version}/configure"
- perm="u+x"/>
- <chmod file="${lib.dir}/${module}-${module.version}/build/get-version.sh"
- perm="u+x"/>
-</target>
-
-<target name="untar-apr-src" unless="apr-src-expanded">
- <antcall target="untar-apr-module">
- <param name="module" value="apr"/>
- <param name="module.version" value="${apr.version}"/>
- </antcall>
-</target>
-
<target name="build-apr" depends="init" unless="apr-available">
- <antcall target="untar-apr-src"/>
-
- <property name="apr.dir" location="${lib.dir}/apr-${apr.version}"/>
+ <property name="apr.dir" location="src/apr/apr-${apr.version}"/>
<property name="apr.include.dir" location="${apr.dir}/include"/>
<property name="apr.lib.dir" location="${executable.dir}/${apr.lib.type}"/>
@@ -501,22 +483,9 @@
</target>
-<target name="untar-aprutil-src" unless="aprutil-src-expanded">
- <antcall target="untar-apr-module">
- <param name="module" value="apr-util"/>
- <param name="module.version" value="${aprutil.version}"/>
- </antcall>
- <chmod file="${lib.dir}/apr-util-${aprutil.version}/xml/expat/configure"
- perm="u+x"/>
-
-</target>
-
-
-
<target name="build-aprutil" depends="build-apr" unless="aprutil-available">
- <antcall target="untar-aprutil-src"/>
- <property name="aprutil.dir"
location="${lib.dir}/apr-util-${aprutil.version}"/>
+ <property name="aprutil.dir"
location="src/apr-util/apr-util-${aprutil.version}"/>
<property name="aprutil.include.dir" location="${aprutil.dir}/include"/>
<property name="aprutil.lib.dir"
location="${executable.dir}/${aprutil.lib.type}"/>
Propchange: logging/log4cxx/trunk/src/apr-util/apr-util-1.2.8/xml/expat/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 24 16:32:29 2007
@@ -15,3 +15,4 @@
*.stt
*.sto
*.vcproj
+xmlparse.c
Modified: logging/log4cxx/trunk/src/apr/apr-1.2.9/docs/pool-design.html
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/apr/apr-1.2.9/docs/pool-design.html?view=diff&rev=559259&r1=559258&r2=559259
==============================================================================
--- logging/log4cxx/trunk/src/apr/apr-1.2.9/docs/pool-design.html (original)
+++ logging/log4cxx/trunk/src/apr/apr-1.2.9/docs/pool-design.html Tue Jul 24
16:32:29 2007
@@ -4,7 +4,7 @@
</head>
<body>
<div align="right">
- Last modified at [$Date$]
+ Last modified at [$Date: 2004-11-24 16:51:51 -0600 (Wed, 24 Nov 2004) $]
</div>
<h1>Using APR Pools</h1>
Propchange: logging/log4cxx/trunk/src/apr/apr-1.2.9/docs/pool-design.html
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jul 24 16:32:29 2007
@@ -1 +0,0 @@
-Date
