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/01/31 02:18:37 UTC
svn commit: r616974 - in /logging/log4cxx/trunk: build.xml
src/ant/apr-util-build.xml src/ant/find-apr-util.xml src/ant/find-apr.xml
src/ant/find-libesmtp.xml
Author: carnold
Date: Wed Jan 30 17:18:35 2008
New Revision: 616974
URL: http://svn.apache.org/viewvc?rev=616974&view=rev
Log:
LOGCXX-230: ODBC and expat link issues
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/ant/apr-util-build.xml
logging/log4cxx/trunk/src/ant/find-apr-util.xml
logging/log4cxx/trunk/src/ant/find-apr.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=616974&r1=616973&r2=616974&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Wed Jan 30 17:18:35 2008
@@ -6,12 +6,9 @@
<libset libs="${apr.lib.prefix}${apr.lib.name}${apr.lib.suffix}" dir="${apr.lib.dir}" if="apr.lib.dir"/>
<libset libs="${apr.lib.prefix}${apr.lib.name}${spr.lib.suffix}" unless="apr.lib.dir"/>
<libset libs="esmtp" if="has-libesmtp"/>
- <libset libs="iodbc" if="has-iODBC"/>
- <libset libs="unixodbc" if="has-unixODBC"/>
- <libset libs="odbc32" if="has-MSODBC"/>
- <libset libs="iconv" if="has-iconv"/>
+ <libset libs="${odbc.lib}" if="odbc.lib"/>
+ <libset libs="${apr-util.dependencies}" if="apr-util.dependencies"/>
<libset libs="pthread" if="is-unix"/>
- <libset libs="expat" if="has-expat"/>
<syslibset libs="advapi32 ws2_32 mswsock shell32" if="is-windows"/>
<syslibset libs="stdc++" if="is-gcc"/>
<syslibset libs="cw32mt" if="is-bcc"/>
@@ -158,31 +155,23 @@
<equals arg1="${with-SMTP}" arg2="libesmtp"/>
</condition>
- <condition property="has-unixODBC" value="1">
- <equals arg1="${with-ODBC}" arg2="unixODBC"/>
- </condition>
+ <condition property="odbc.lib" value="iodbc">
+ <equals arg1="${with-ODBC}" arg2="iODBC"/>
+ </condition>
- <condition property="has-iODBC" value="1">
- <equals arg1="${with-ODBC}" arg2="iODBC"/>
- </condition>
+ <condition property="odbc.lib" value="unixodbc">
+ <equals arg1="${with-ODBC}" arg2="unixODBC"/>
+ </condition>
- <condition property="has-MSODBC" value="1">
- <equals arg1="${with-ODBC}" arg2="Microsoft"/>
- </condition>
-
- <condition property="has-ODBC" value="1">
- <or>
- <isset property="has-unixODBC"/>
- <isset property="has-iODBC"/>
- <isset property="has-MSODBC"/>
- </or>
- </condition>
- <property name="has-ODBC" value="0"/>
+ <condition property="odbc.lib" value="odbc32">
+ <equals arg1="${with-ODBC}" arg2="Microsoft"/>
+ </condition>
- <condition property="lib.suffix" value="d">
- <istrue value="${debug}"/>
+ <condition property="has-ODBC" value="1">
+ <isset property="odbc.lib"/>
</condition>
- <property name="lib.suffix" value=""/>
+ <property name="has-ODBC" value="0"/>
+
</target>
<target name="clean" depends="init" description="Removes built files">
@@ -205,7 +194,7 @@
file="${include.dir}/log4cxx/log4cxx.hw" overwrite="true"/>
<copy tofile="${include.dir}/log4cxx/private/log4cxx_private.tmp"
file="${include.dir}/log4cxx/private/log4cxx_private.hw" overwrite="true"/>
- <property name="has-MSODBC" value="1"/>
+ <property name="odbc.lib" value="odbc32"/>
</target>
@@ -491,8 +480,15 @@
<fail unless="apr-libs-match">apr is ${apr.lib.type} and apr-util is ${apr-util.lib.type}, must be same type.</fail>
<property name="lib.name" value="log4cxx"/>
+ <property name="lib.prefix" value=""/>
+ <condition property="lib.suffix" value="d">
+ <istrue value="${debug}"/>
+ </condition>
<property name="lib.suffix" value=""/>
- <property name="lib.suffix" value=""/>
+
+ <condition property="apr-util.dependencies" value="expat iconv">
+ <equals arg1="${apr-util.lib.type}" arg2="static"/>
+ </condition>
<property name="project.compiler" value="${compiler}"/>
@@ -519,7 +515,7 @@
<defineset define="WIN32" if="is-windows"/>
<compilerarg value="${pic-option}" if="pic-option"/>
&libsets;
- <project type="${project.type}" outfile="${projects.dir}/log4cxx" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/${lib.name}" if="project.if"/>
</cc>
</target>
Modified: logging/log4cxx/trunk/src/ant/apr-util-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-util-build.xml?rev=616974&r1=616973&r2=616974&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-util-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-util-build.xml Wed Jan 30 17:18:35 2008
@@ -118,6 +118,9 @@
<replacefilter token="XML_MICRO_VERSION" value="1"/>
<replacefilter token="VERSION" value='"expat_1.95.1"'/>
</replace>
+ <property name="apr.lib.prefix" value=""/>
+ <property name="apr.lib.name" value="apr-1"/>
+ <property name="apr.lib.suffix" value=""/>
<property name="project.compiler" value="${compiler}"/>
<property name="project.type" value="msvc6"/>
<cc name="${project.compiler}"
@@ -149,7 +152,7 @@
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
<compilerarg value="${pic-option}" if="pic-option"/>
- <libset dir="${executable.dir}" libs="apr-1${lib-suffix}"/>
+ <libset dir="${executable.dir}" libs="${apr.lib.prefix}${apr.lib.name}${apr.lib.suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="pthread dl" if="is-unix"/>
<libset libs="iconv" if="has-iconv"/>
Modified: logging/log4cxx/trunk/src/ant/find-apr-util.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-apr-util.xml?rev=616974&r1=616973&r2=616974&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr-util.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-apr-util.xml Wed Jan 30 17:18:35 2008
@@ -15,10 +15,21 @@
limitations under the License.
-->
-<target name="find-apr-util" depends="init">
+
+<target name="find-apr-util-src" depends="init">
<condition property="apr-util.dir" value="${with-apr-util}">
<available file="${with-apr-util}"/>
</condition>
+ <condition property="apr-util.src.dir" value="${apr-util.dir}">
+ <available file="${apr-util.dir}/${apr-util.sample.c}"/>
+ </condition>
+ <condition property="apr-util.src.dir" value="../apr-util">
+ <available file="../apr-util/${apr-util.sample.c}"/>
+ </condition>
+</target>
+
+
+<target name="find-apr-util-lib" depends="find-apr-util-src" unless="force-ant">
<available property="apr-util.lib.file"
value="${apr-util.dir}/lib${apr-util.lib.name}.la"
file="${apr-util.dir}/lib${apr-util.lib.name}.la"/>
@@ -138,61 +149,8 @@
</condition>
<fail unless="apr-util.dir">Unable to locate apr-util base directory.</fail>
- <!-- use character ref to prevent directory name from
- being changed on global search and replacements -->
- <condition property="apr.include.dir" value="${apr.dir}/include/apr-1.0">
- <available file="${apr.dir}/include/apr-1.0/${apr-util.sample.h}"/>
- </condition>
- <condition property="apr.include.dir" value="${apr.dir}/include/apr-1">
- <available file="${apr.dir}/include/apr-1/${apr-util.sample.h}"/>
- </condition>
- <condition property="apr-util.include.dir" value="${apr-util.dir}/include">
- <available file="${apr-util.dir}/include/${apr-util.sample.h}"/>
- </condition>
- <fail unless="apr-util.include.dir">Unable to locate apr-util include directory.</fail>
- <!-- Static debug libraries in Ant's typical location (ignored unless debug build) -->
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}.a">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}.a"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/static/${apr-util.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/static/${apr-util.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/static/${apr-util.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/static/${apr-util.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file.dir"
- value="${apr-util.dir}/target/debug/static">
- <isset property="apr-util.lib.file"/>
- </condition>
-
<!-- Static debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
<condition property="apr-util.lib.file"
@@ -208,46 +166,6 @@
</condition>
- <!-- Shared debug libraries in Ant's typical location (ignored unless debug build) -->
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}.la">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}.la"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/shared/${apr-util.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/shared/${apr-util.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/shared/${apr-util.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/shared/${apr-util.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="apr-util.lib.file.dir"
- value="${apr-util.dir}/target/debug/shared">
- <isset property="apr-util.lib.file"/>
- </condition>
<!-- Shared debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
@@ -265,30 +183,6 @@
- <!-- Static release libraries in Ant's typical location -->
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}.a">
- <available file="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}.a"/>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/release/static/${apr-util.lib.name}.lib">
- <available file="${apr-util.dir}/target/release/static/${apr-util.lib.name}.lib"/>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}.lib">
- <available file="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}.lib"/>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}d.lib">
- <available file="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}d.lib"/>
- </condition>
- <condition property="apr-util.lib.file.dir"
- value="${apr-util.dir}/target/release/static">
- <isset property="apr-util.lib.file"/>
- </condition>
-
-
-
<!-- Static release libraries in APR's VC6 projects typical location (ignored unless debug build) -->
<condition property="apr-util.lib.file"
value="${apr-util.dir}/LibR/${apr-util.lib.name}.lib">
@@ -300,24 +194,6 @@
</condition>
- <!-- Shared release libraries in Ant's typical location (ignored unless debug build) -->
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/release/shared/lib${apr-util.lib.name}.la">
- <available file="${apr-util.dir}/target/release/shared/lib${apr-util.lib.name}.la"/>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/release/shared/${apr-util.lib.name}.lib">
- <available file="${apr-util.dir}/target/release/shared/${apr-util.lib.name}.lib"/>
- </condition>
- <condition property="apr-util.lib.file"
- value="${apr-util.dir}/target/release/shared/lib${apr-util.lib.name}.lib">
- <available file="${apr-util.dir}/target/release/shared/lib${apr-util.lib.name}.lib"/>
- </condition>
- <condition property="apr-util.lib.file.dir"
- value="${apr-util.dir}/target/release/shared">
- <isset property="apr-util.lib.file"/>
- </condition>
-
<!-- Shared release libraries in APR's VC6 projects typical location -->
@@ -397,20 +273,29 @@
<condition property="apr-util.lib.type" value="static">
<isset property="apr-util.lib.file"/>
</condition>
+</target>
-
- <condition property="apr-util.src.dir" value="${with-apr-util}">
- <available file="${with-apr-util}/${apr-util.sample.c}"/>
+<target name="find-apr-util" depends="find-apr-util-lib">
+ <!-- use character ref to prevent directory name from
+ being changed on global search and replacements -->
+ <condition property="apr-util.include.dir" value="${apr-util.dir}/include/apr-1.0">
+ <available file="${apr-util.dir}/include/apr-1.0/${apr-util.sample.h}"/>
</condition>
-
- <condition property="apr-util.src.dir" value="${apr-util.dir}">
- <available file="${apr-util.dir}/${apr-util.sample.c}"/>
+ <condition property="apr-util.include.dir" value="${apr-util.dir}/include/apr-1">
+ <available file="${apr-util.dir}/include/apr-1/${apr-util.sample.h}"/>
</condition>
-
- <condition property="apr-util.src.dir" value="${relative-apr-util}">
- <available file="${relative-apr-util}/${apr-util.sample.c}"/>
+ <condition property="apr-util.include.dir" value="${apr-util.dir}/include">
+ <available file="${apr-util.dir}/include/${apr-util.sample.h}"/>
+ </condition>
+ <condition property="apr-util.include.dir" value="${apr-util.src.dir}/include">
+ <available file="${apr-util.src.dir}/include/${apr-util.sample.h}"/>
</condition>
+ <condition property="apr-util.dir" value="${apr-util.src.dir}">
+ <isset property="apr-util.src.dir"/>
+ </condition>
+
+
<echo>apr-util-find:
apr-util.dir=${apr-util.dir}
apr-util.include.dir=${apr-util.include.dir}
@@ -422,4 +307,4 @@
apr-util.lib.suffix=${apr-util.lib.suffix}
apr-util.lib.type=${apr-util.lib.type}
</echo>
-</target>
+</target>
\ No newline at end of file
Modified: logging/log4cxx/trunk/src/ant/find-apr.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-apr.xml?rev=616974&r1=616973&r2=616974&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-apr.xml Wed Jan 30 17:18:35 2008
@@ -15,10 +15,21 @@
limitations under the License.
-->
-<target name="find-apr" depends="init">
+
+<target name="find-apr-src" depends="init">
<condition property="apr.dir" value="${with-apr}">
<available file="${with-apr}"/>
</condition>
+ <condition property="apr.src.dir" value="${apr.dir}">
+ <available file="${apr.dir}/${apr.sample.c}"/>
+ </condition>
+ <condition property="apr.src.dir" value="../apr">
+ <available file="../apr/${apr.sample.c}"/>
+ </condition>
+</target>
+
+
+<target name="find-apr-lib" depends="find-apr-src" unless="force-ant">
<available property="apr.lib.file"
value="${apr.dir}/lib${apr.lib.name}.la"
file="${apr.dir}/lib${apr.lib.name}.la"/>
@@ -138,61 +149,8 @@
</condition>
<fail unless="apr.dir">Unable to locate apr base directory.</fail>
- <!-- use character ref to prevent directory name from
- being changed on global search and replacements -->
- <condition property="apr.include.dir" value="${apr.dir}/include/apr-1.0">
- <available file="${apr.dir}/include/apr-1.0/${apr.sample.h}"/>
- </condition>
- <condition property="apr.include.dir" value="${apr.dir}/include/apr-1">
- <available file="${apr.dir}/include/apr-1/${apr.sample.h}"/>
- </condition>
- <condition property="apr.include.dir" value="${apr.dir}/include">
- <available file="${apr.dir}/include/${apr.sample.h}"/>
- </condition>
- <fail unless="apr.include.dir">Unable to locate apr include directory.</fail>
- <!-- Static debug libraries in Ant's typical location (ignored unless debug build) -->
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/static/lib${apr.lib.name}.a">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/static/lib${apr.lib.name}.a"/>
- </and>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/static/${apr.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/static/${apr.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/static/${apr.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/static/${apr.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/static/lib${apr.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/static/lib${apr.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/static/lib${apr.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/static/lib${apr.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="apr.lib.file.dir"
- value="${apr.dir}/target/debug/static">
- <isset property="apr.lib.file"/>
- </condition>
-
<!-- Static debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
<condition property="apr.lib.file"
@@ -208,46 +166,6 @@
</condition>
- <!-- Shared debug libraries in Ant's typical location (ignored unless debug build) -->
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/shared/lib${apr.lib.name}.la">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/shared/lib${apr.lib.name}.la"/>
- </and>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/shared/${apr.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/shared/${apr.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/shared/${apr.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/shared/${apr.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/shared/lib${apr.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/shared/lib${apr.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/debug/shared/lib${apr.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${apr.dir}/target/debug/shared/lib${apr.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="apr.lib.file.dir"
- value="${apr.dir}/target/debug/shared">
- <isset property="apr.lib.file"/>
- </condition>
<!-- Shared debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
@@ -265,30 +183,6 @@
- <!-- Static release libraries in Ant's typical location -->
- <condition property="apr.lib.file"
- value="${apr.dir}/target/release/static/lib${apr.lib.name}.a">
- <available file="${apr.dir}/target/release/static/lib${apr.lib.name}.a"/>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/release/static/${apr.lib.name}.lib">
- <available file="${apr.dir}/target/release/static/${apr.lib.name}.lib"/>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/release/static/lib${apr.lib.name}.lib">
- <available file="${apr.dir}/target/release/static/lib${apr.lib.name}.lib"/>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/release/static/lib${apr.lib.name}d.lib">
- <available file="${apr.dir}/target/release/static/lib${apr.lib.name}d.lib"/>
- </condition>
- <condition property="apr.lib.file.dir"
- value="${apr.dir}/target/release/static">
- <isset property="apr.lib.file"/>
- </condition>
-
-
-
<!-- Static release libraries in APR's VC6 projects typical location (ignored unless debug build) -->
<condition property="apr.lib.file"
value="${apr.dir}/LibR/${apr.lib.name}.lib">
@@ -300,24 +194,6 @@
</condition>
- <!-- Shared release libraries in Ant's typical location (ignored unless debug build) -->
- <condition property="apr.lib.file"
- value="${apr.dir}/target/release/shared/lib${apr.lib.name}.la">
- <available file="${apr.dir}/target/release/shared/lib${apr.lib.name}.la"/>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/release/shared/${apr.lib.name}.lib">
- <available file="${apr.dir}/target/release/shared/${apr.lib.name}.lib"/>
- </condition>
- <condition property="apr.lib.file"
- value="${apr.dir}/target/release/shared/lib${apr.lib.name}.lib">
- <available file="${apr.dir}/target/release/shared/lib${apr.lib.name}.lib"/>
- </condition>
- <condition property="apr.lib.file.dir"
- value="${apr.dir}/target/release/shared">
- <isset property="apr.lib.file"/>
- </condition>
-
<!-- Shared release libraries in APR's VC6 projects typical location -->
@@ -397,20 +273,29 @@
<condition property="apr.lib.type" value="static">
<isset property="apr.lib.file"/>
</condition>
+</target>
-
- <condition property="apr.src.dir" value="${with-apr}">
- <available file="${with-apr}/${apr.sample.c}"/>
+<target name="find-apr" depends="find-apr-lib">
+ <!-- use character ref to prevent directory name from
+ being changed on global search and replacements -->
+ <condition property="apr.include.dir" value="${apr.dir}/include/apr-1.0">
+ <available file="${apr.dir}/include/apr-1.0/${apr.sample.h}"/>
</condition>
-
- <condition property="apr.src.dir" value="${apr.dir}">
- <available file="${apr.dir}/${apr.sample.c}"/>
+ <condition property="apr.include.dir" value="${apr.dir}/include/apr-1">
+ <available file="${apr.dir}/include/apr-1/${apr.sample.h}"/>
</condition>
-
- <condition property="apr.src.dir" value="${relative-apr}">
- <available file="${relative-apr}/${apr.sample.c}"/>
+ <condition property="apr.include.dir" value="${apr.dir}/include">
+ <available file="${apr.dir}/include/${apr.sample.h}"/>
+ </condition>
+ <condition property="apr.include.dir" value="${apr.src.dir}/include">
+ <available file="${apr.src.dir}/include/${apr.sample.h}"/>
</condition>
+ <condition property="apr.dir" value="${apr.src.dir}">
+ <isset property="apr.src.dir"/>
+ </condition>
+
+
<echo>apr-find:
apr.dir=${apr.dir}
apr.include.dir=${apr.include.dir}
@@ -422,4 +307,4 @@
apr.lib.suffix=${apr.lib.suffix}
apr.lib.type=${apr.lib.type}
</echo>
-</target>
+</target>
\ No newline at end of file
Modified: logging/log4cxx/trunk/src/ant/find-libesmtp.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-libesmtp.xml?rev=616974&r1=616973&r2=616974&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-libesmtp.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-libesmtp.xml Wed Jan 30 17:18:35 2008
@@ -15,10 +15,21 @@
limitations under the License.
-->
-<target name="find-esmtp" depends="init" if="has-libesmtp">
+
+<target name="find-esmtp-src" depends="init">
<condition property="esmtp.dir" value="${with-libesmtp}">
<available file="${with-libesmtp}"/>
</condition>
+ <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>
+</target>
+
+
+<target name="find-esmtp-lib" depends="find-esmtp-src" if="has-libesmtp" unless="force-ant">
<available property="esmtp.lib.file"
value="${esmtp.dir}/lib${esmtp.lib.name}.la"
file="${esmtp.dir}/lib${esmtp.lib.name}.la"/>
@@ -138,61 +149,8 @@
</condition>
<fail unless="esmtp.dir">Unable to locate esmtp base directory.</fail>
- <!-- use character ref to prevent directory name from
- being changed on global search and replacements -->
- <condition property="apr.include.dir" value="${apr.dir}/include/apr-1.0">
- <available file="${apr.dir}/include/apr-1.0/${esmtp.sample.h}"/>
- </condition>
- <condition property="apr.include.dir" value="${apr.dir}/include/apr-1">
- <available file="${apr.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>
- <fail unless="esmtp.include.dir">Unable to locate esmtp include directory.</fail>
- <!-- Static debug libraries in Ant's typical location (ignored unless debug build) -->
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}.a">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}.a"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/static/${esmtp.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/static/${esmtp.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/static/${esmtp.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/static/${esmtp.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file.dir"
- value="${esmtp.dir}/target/debug/static">
- <isset property="esmtp.lib.file"/>
- </condition>
-
<!-- Static debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
<condition property="esmtp.lib.file"
@@ -208,46 +166,6 @@
</condition>
- <!-- Shared debug libraries in Ant's typical location (ignored unless debug build) -->
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}.la">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}.la"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/shared/${esmtp.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/shared/${esmtp.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/shared/${esmtp.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/shared/${esmtp.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}.lib"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}d.lib">
- <and>
- <isset property="is-debug"/>
- <available file="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}d.lib"/>
- </and>
- </condition>
- <condition property="esmtp.lib.file.dir"
- value="${esmtp.dir}/target/debug/shared">
- <isset property="esmtp.lib.file"/>
- </condition>
<!-- Shared debug libraries in APR's VC6 projects typical location (ignored unless debug build) -->
@@ -265,30 +183,6 @@
- <!-- Static release libraries in Ant's typical location -->
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}.a">
- <available file="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}.a"/>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/release/static/${esmtp.lib.name}.lib">
- <available file="${esmtp.dir}/target/release/static/${esmtp.lib.name}.lib"/>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}.lib">
- <available file="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}.lib"/>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}d.lib">
- <available file="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}d.lib"/>
- </condition>
- <condition property="esmtp.lib.file.dir"
- value="${esmtp.dir}/target/release/static">
- <isset property="esmtp.lib.file"/>
- </condition>
-
-
-
<!-- Static release libraries in APR's VC6 projects typical location (ignored unless debug build) -->
<condition property="esmtp.lib.file"
value="${esmtp.dir}/LibR/${esmtp.lib.name}.lib">
@@ -300,24 +194,6 @@
</condition>
- <!-- Shared release libraries in Ant's typical location (ignored unless debug build) -->
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/release/shared/lib${esmtp.lib.name}.la">
- <available file="${esmtp.dir}/target/release/shared/lib${esmtp.lib.name}.la"/>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/release/shared/${esmtp.lib.name}.lib">
- <available file="${esmtp.dir}/target/release/shared/${esmtp.lib.name}.lib"/>
- </condition>
- <condition property="esmtp.lib.file"
- value="${esmtp.dir}/target/release/shared/lib${esmtp.lib.name}.lib">
- <available file="${esmtp.dir}/target/release/shared/lib${esmtp.lib.name}.lib"/>
- </condition>
- <condition property="esmtp.lib.file.dir"
- value="${esmtp.dir}/target/release/shared">
- <isset property="esmtp.lib.file"/>
- </condition>
-
<!-- Shared release libraries in APR's VC6 projects typical location -->
@@ -397,20 +273,29 @@
<condition property="esmtp.lib.type" value="static">
<isset property="esmtp.lib.file"/>
</condition>
+</target>
-
- <condition property="esmtp.src.dir" value="${with-esmtp}">
- <available file="${with-esmtp}/${esmtp.sample.c}"/>
+<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.src.dir" value="${esmtp.dir}">
- <available file="${esmtp.dir}/${esmtp.sample.c}"/>
+ <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.src.dir" value="${relative-esmtp}">
- <available file="${relative-esmtp}/${esmtp.sample.c}"/>
+ <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.src.dir}/include">
+ <available file="${esmtp.src.dir}/include/${esmtp.sample.h}"/>
</condition>
+ <condition property="esmtp.dir" value="${esmtp.src.dir}">
+ <isset property="esmtp.src.dir"/>
+ </condition>
+
+
<echo>esmtp-find:
esmtp.dir=${esmtp.dir}
esmtp.include.dir=${esmtp.include.dir}
@@ -422,4 +307,4 @@
esmtp.lib.suffix=${esmtp.lib.suffix}
esmtp.lib.type=${esmtp.lib.type}
</echo>
-</target>
+</target>
\ No newline at end of file