You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/02/13 19:09:31 UTC
svn commit: r627549 - in /logging/log4cxx/trunk: build.xml
src/ant/common.xml src/ant/find-libesmtp.xml
Author: carnold
Date: Wed Feb 13 10:09:23 2008
New Revision: 627549
URL: http://svn.apache.org/viewvc?rev=627549&view=rev
Log:
LOGCXX-1: Fixes to Ant build with libesmtp
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/ant/common.xml
logging/log4cxx/trunk/src/ant/find-libesmtp.xml
Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=627549&r1=627548&r2=627549&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Wed Feb 13 10:09:23 2008
@@ -333,6 +333,9 @@
</condition>
<property name="has-libesmtp-value" value="0"/>
<replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
+ match="LOG4CXX_HAVE_LIBESMTP 0"
+ replace="LOG4CXX_HAVE_LIBESMTP ${has-libesmtp-value}"/>
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
match="@HAS_LIBESMTP@"
replace="${has-libesmtp-value}"/>
@@ -415,20 +418,20 @@
</target>
<target name="build-libesmtp" depends="find-esmtp" if="has-libesmtp" unless="esmtp.lib.file">
- <fail unless="libesmtp.src.dir">Could not locate libesmtp library or source.</fail>
- <property name="libesmtp.lib.type" value="static"/>
- <property name="libesmtp.lib.prefix" value=""/>
- <property name="libesmtp.lib.suffix" value=""/>
+ <fail unless="esmtp.src.dir">Could not locate libesmtp library or source.</fail>
+ <property name="esmtp.lib.type" value="static"/>
+ <property name="esmtp.lib.prefix" value=""/>
+ <property name="esmtp.lib.suffix" value=""/>
<property name="project.type" value="msvc6"/>
<ant antfile="src/ant/esmtp-build.xml" target="build" inheritAll="false">
<property name="target.dir" value="${target.dir}"/>
- <property name="basedir" value="${libesmtp.src.dir}"/>
+ <property name="basedir" value="${esmtp.src.dir}"/>
<property name="debug" value="${debug}"/>
- <property name="lib.prefix" value="${libesmtp.lib.prefix}"/>
- <property name="lib.suffix" value="${libesmtp.lib.suffix}"/>
+ <property name="lib.prefix" value="${esmtp.lib.prefix}"/>
+ <property name="lib.suffix" value="${esmtp.lib.suffix}"/>
<property name="compiler" value="${compiler}"/>
- <property name="lib.type" value="${libesmtp.lib.type}"/>
+ <property name="lib.type" value="${esmtp.lib.type}"/>
<property name="project.type" value="${project.type}"/>
<property name="projects.dir" value="${projects.dir}"/>
<property name="project.if.value" value="${project.if}"/>
@@ -436,11 +439,11 @@
<property name="os.family" value="${os.family}"/>
</ant>
- <condition property="libesmtp.lib.dir" value="${target.dir}/${debug.release}/shared">
- <equals arg1="${libesmtp.lib.type}" arg2="shared"/>
+ <condition property="esmtp.lib.dir" value="${target.dir}/${debug.release}/shared">
+ <equals arg1="${esmtp.lib.type}" arg2="shared"/>
</condition>
- <property name="libesmtp.lib.dir" location="${target.dir}/${debug.release}/static"/>
- <property name="libesmtp.project.file" location="${projects.dir}/libesmtp"/>
+ <property name="esmtp.lib.dir" location="${target.dir}/${debug.release}/static"/>
+ <property name="esmtp.project.file" location="${projects.dir}/libesmtp"/>
</target>
Modified: logging/log4cxx/trunk/src/ant/common.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/common.xml?rev=627549&r1=627548&r2=627549&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/common.xml (original)
+++ logging/log4cxx/trunk/src/ant/common.xml Wed Feb 13 10:09:23 2008
@@ -154,6 +154,9 @@
<property name="apr-util.lib.name" value="aprutil-1"/>
<property name="apr-util.sample.h" value="apr_xml.h"/>
<property name="apr-util.sample.c" value="xml/apr_xml.c"/>
+ <property name="esmtp.lib.name" value="esmtp"/>
+ <property name="esmtp.sample.h" value="libesmtp.h"/>
+ <property name="esmtp.sample.c" value="smtp-api.c"/>
</target>
Modified: logging/log4cxx/trunk/src/ant/find-libesmtp.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-libesmtp.xml?rev=627549&r1=627548&r2=627549&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-libesmtp.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-libesmtp.xml Wed Feb 13 10:09:23 2008
@@ -23,8 +23,8 @@
<condition property="esmtp.src.dir" value="${esmtp.dir}">
<available file="${esmtp.dir}/${esmtp.sample.c}"/>
</condition>
- <condition property="esmtp.src.dir" value="../esmtp">
- <available file="../esmtp/${esmtp.sample.c}"/>
+ <condition property="esmtp.src.dir" value="../libesmtp">
+ <available file="../libesmtp/${esmtp.sample.c}"/>
</condition>
</target>
@@ -109,7 +109,7 @@
</condition>
- <property name="relative-esmtp" location="../esmtp"/>
+ <property name="relative-esmtp" location="../libesmtp"/>
<condition property="esmtp.dir" value="${relative-esmtp}">
<available file="${relative-esmtp}"/>
</condition>
@@ -278,19 +278,19 @@
<target name="find-esmtp" depends="find-esmtp-lib">
<!-- use character ref to prevent directory name from
being changed on global search and replacements -->
- <condition property="esmtp.include.dir" value="${esmtp.dir}/include/apr-1.0">
- <available file="${esmtp.dir}/include/apr-1.0/${esmtp.sample.h}"/>
- </condition>
- <condition property="esmtp.include.dir" value="${esmtp.dir}/include/apr-1">
- <available file="${esmtp.dir}/include/apr-1/${esmtp.sample.h}"/>
- </condition>
<condition property="esmtp.include.dir" value="${esmtp.dir}/include">
<available file="${esmtp.dir}/include/${esmtp.sample.h}"/>
</condition>
+ <condition property="esmtp.include.dir" value="${esmtp.dir}">
+ <available file="${esmtp.dir}/${esmtp.sample.h}"/>
+ </condition>
<condition property="esmtp.include.dir" value="${esmtp.dir}/../usr/include">
<available file="${esmtp.dir}/../usr/include/${esmtp.sample.h}"/>
</condition>
<condition property="esmtp.include.dir" value="${esmtp.src.dir}/include">
+ <available file="${esmtp.src.dir}/include/${esmtp.sample.h}"/>
+ </condition>
+ <condition property="esmtp.include.dir" value="${esmtp.src.dir}">
<available file="${esmtp.src.dir}/include/${esmtp.sample.h}"/>
</condition>