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/30 06:32:06 UTC
svn commit: r616632 [1/2] - in /logging/log4cxx/trunk: ./ src/ src/ant/
src/apr-util/ src/apr/ src/assembly/ src/changes/ src/cppunit/
src/dependencies/ src/mock/ src/performance/cpp/xml/ src/site/apt/
src/site/fml/ src/site/xdoc/ src/test/java/org/apa...
Author: carnold
Date: Tue Jan 29 21:32:03 2008
New Revision: 616632
URL: http://svn.apache.org/viewvc?rev=616632&view=rev
Log:
LOGCXX-230: Align ant options with ./configure
Added:
logging/log4cxx/trunk/KEYS
- copied, changed from r612852, logging/log4j/trunk/KEYS
logging/log4cxx/trunk/src/ant/
logging/log4cxx/trunk/src/ant/apr-build.xml
- copied, changed from r616425, logging/log4cxx/trunk/src/apr/ant/build.xml
logging/log4cxx/trunk/src/ant/apr-util-build.xml
- copied, changed from r616425, logging/log4cxx/trunk/src/apr-util/ant/build.xml
logging/log4cxx/trunk/src/ant/common.xml
logging/log4cxx/trunk/src/ant/esmtp-build.xml
- copied, changed from r616425, logging/log4cxx/trunk/src/dependencies/esmtp/build.xml
logging/log4cxx/trunk/src/assembly/source.xml
- copied, changed from r616425, logging/log4cxx/trunk/src/assembly/bin.xml
logging/log4cxx/trunk/src/changes/Makefile.am
logging/log4cxx/trunk/src/site/apt/Makefile.am
logging/log4cxx/trunk/src/site/fml/Makefile.am
logging/log4cxx/trunk/src/site/xdoc/Makefile.am
Removed:
logging/log4cxx/trunk/COPYING
logging/log4cxx/trunk/README
logging/log4cxx/trunk/src/apr/
logging/log4cxx/trunk/src/apr-util/
logging/log4cxx/trunk/src/assembly/bin.xml
logging/log4cxx/trunk/src/cppunit/
logging/log4cxx/trunk/src/dependencies/
logging/log4cxx/trunk/src/mock/
logging/log4cxx/trunk/src/test/java/org/apache/log4j/helpers/
logging/log4cxx/trunk/src/test/java/org/apache/logging/
Modified:
logging/log4cxx/trunk/INSTALL
logging/log4cxx/trunk/Makefile.am
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/pom.xml
logging/log4cxx/trunk/src/Makefile.am
logging/log4cxx/trunk/src/performance/cpp/xml/logging300.xml
Modified: logging/log4cxx/trunk/INSTALL
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/INSTALL?rev=616632&r1=616631&r2=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/INSTALL (original)
+++ logging/log4cxx/trunk/INSTALL Tue Jan 29 21:32:03 2008
@@ -12,6 +12,11 @@
See the License for the specific language governing permissions and
limitations under the License.
+Introduction
+============
+Apache log4cxx is a C++ transliteration of Apache log4j.
+
+
Maven 2:
==================
Copied: logging/log4cxx/trunk/KEYS (from r612852, logging/log4j/trunk/KEYS)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/KEYS?p2=logging/log4cxx/trunk/KEYS&p1=logging/log4j/trunk/KEYS&r1=612852&r2=616632&rev=616632&view=diff
==============================================================================
--- logging/log4j/trunk/KEYS (original)
+++ logging/log4cxx/trunk/KEYS Tue Jan 29 21:32:03 2008
@@ -13,47 +13,6 @@
PGP keyservers (such as pgpkeys.mit.edu).
-Type bits /keyID Date User ID
-pub 1024D/0C7C4F05 2005/06/10 Mark Dwayne Womack <mw...@apache.org>
- Mark Dwayne Womack <ma...@womacknet.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: PGP Key Server 0.9.6
-
-mQGiBEKqEj8RBADR8e9Xl0kFJqv8SspvDP8kUsivBxWVZz+HVKf0pL2wOie0LfsF
-E0Y3dI7k0k8i8KXtWYmHY3dpJGLUaruqIRxPFen/No56Q7udlK5hj7vKEUb46krx
-sLgik1s+WX8+61Yu5cLuGdqnfwRGuNV7uf3JF1Q78VXIyUlS4BFMXGtqjwCg//s6
-1m7N3p8AtIgma+U13rEkq9cEAJ6l9eEPgOdRx53nKkCgkVpDxxhpbg90STQ1s94f
-rZIc+y5LN7FEERiQSiXvuzCwxiritiv+03sqdjYicxYZux+aladi0mHDIdgZkrAP
-MrRJ+8AKs7jv+WXcyaJcja8h3IZLShszgUM6uCW4Wr8mzZ+ns/65ihe4A/jS/Gu+
-cD44A/9doNrvOnNXPD+N/R9ME3zS6FY8d5F6f8oxZOEsMll/AG1HhOR4yxOmZMOl
-+ZTg9AacHWMtTkjbs6JkT6uA8+tU+txoYjofkaGcJgq/SQYen89ifXZXVkUMWjqL
-ioUUKCsu4OQPnH5k3jCQp7DrkpDAgIBGZ5F3QGaYsrkVjxNoE7QnTWFyayBEd2F5
-bmUgV29tYWNrIDxtd29tYWNrQGFwYWNoZS5vcmc+iEYEEBECAAYFAkKwy1kACgkQ
-vhbJXS4RQyKOYQCfddSBIMCd3kaFPvL90/piH/QIdIgAnRwG83V+KMRltnPRclDH
-IcTI5unMiQBOBBARAgAOBQJCqhI/BAsDAgECGQEACgkQErKHWAx8TwWGeACgnN9d
-jKDT2mjBKnApaDkMzmAaMvMAoKEcdBBCx62RPNIEBnxZ6zAxH244tC1NYXJrIER3
-YXluZSBXb21hY2sgPG1hcmt3b21hY2tAd29tYWNrbmV0LmNvbT6IRgQQEQIABgUC
-QrDLXgAKCRC+FsldLhFDIgvLAJ9VsCFN6uBcObkb+UCN70ukHH5VWQCdEjPNvKCs
-c4+FGbTTsEoabhoNhsuJAEsEEBECAAsFAkKqFqUECwMCAQAKCRASsodYDHxPBeU1
-AKDUIGqVzFZDXgK8PcLW8OlL2dXRmgCgwwxRkgpzuKNMnkphSZNend3VdJa5Ag0E
-QqoSPxAIAPZCV7cIfwgXcqK61qlC8wXo+VMROU+28W65Szgg2gGnVqMU6Y9AVfPQ
-B8bLQ6mUrfdMZIZJ+AyDvWXpF9Sh01D49Vlf3HZSTz09jdvOmeFXklnN/biudE/F
-/Ha8g8VHMGHOfMlm/xX5u/2RXscBqtNbno2gpXI61Brwv0YAWCvl9Ij9WE5J280g
-tJ3kkQc2azNsOA1FHQ98iLMcfFstjvbzySPAQ/ClWxiNjrtVjLhdONM0/XwXV0Oj
-HRhs3jMhLLUq/zzhsSlAGBGNfISnCnLWhsQDGcgHKXrKlQzZlp+r0ApQmwJG0wg9
-ZqRdQZ+cfL2JSyIZJrqrol7DVekyCzsAAgIH/2A8l4YFI5dYs5ZV3OgspEh0Qa/N
-qd/JiVWBdygI77zp9TEgUtFBPDItEjmJq8sgnao0Cd5d68l9c+PQJ1xr4fOpdug0
-YmYUgIaKutha3SSNRbD+T0WYmtTO5A4wxbsF3hYU7fvBJrt8gnO4tx6KAn/O2rRk
-wPfNTZ1EdnKttZDM2Mz4OiK0SsQ9mS7zP+HPx3kzdl1Oj0Vk2tUElD1R1hVjLa/o
-v5YgJCrwSD7RfCZAOEoPxXXN6StCqW1zT6HgcSR0clM5BC+ZyBJzczzD9I5+TrlH
-d3ISaCOuP5NeYQdTsQ446bjiNk7LT25gNHF6U6WjmLQ3lXCz4kNoBG6fiOKIRgQY
-EQIABgUCQqoSPwAKCRASsodYDHxPBQ7wAKD4DO0Se4+SvSqUKDfxhI0lJTgK0gCg
-0lICv0KXT6PKyTndK+lr6K2AL4o=
-=GKga
------END PGP PUBLIC KEY BLOCK-----
-
-
pub 1024D/2E114322 2005-06-11 [expires: 2010-06-10]
Key fingerprint = A1A2 B554 6D43 31B2 A41E 1C07 BE16 C95D 2E11 4322
uid Curt Arnold <ca...@apache.org>
Modified: logging/log4cxx/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/Makefile.am?rev=616632&r1=616631&r2=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/Makefile.am (original)
+++ logging/log4cxx/trunk/Makefile.am Tue Jan 29 21:32:03 2008
@@ -17,7 +17,7 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src
-EXTRA_DIST = autogen.sh aclocal.m4 find_apr.m4 find_apu.m4 build.xml pom.xml NOTICE LICENSE
+EXTRA_DIST = autogen.sh aclocal.m4 find_apr.m4 find_apu.m4 build.xml pom.xml NOTICE LICENSE INSTALL pom.xml KEYS
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = liblog4cxx.pc
Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=616632&r1=616631&r2=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Jan 29 21:32:03 2008
@@ -1,17 +1,23 @@
<?xml version="1.0"?>
<!DOCTYPE project [
<!ENTITY libsets '
- <libset libs="${aprutil.lib.name}${lib-suffix}" dir="${aprutil.lib.dir}" if="aprutil.lib.dir"/>
- <libset libs="${aprutil.lib.name}${lib-suffix}" unless="aprutil.lib.dir"/>
+ <libset libs="${apr-util.lib.name}${lib-suffix}" dir="${apr-util.lib.dir}" if="apr-util.lib.dir"/>
+ <libset libs="${apr-util.lib.name}${lib-suffix}" unless="apr-util.lib.dir"/>
<libset libs="${apr.lib.name}${lib-suffix}" dir="${apr.lib.dir}" if="apr.lib.dir"/>
<libset libs="${apr.lib.name}${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="pthread" if="is-unix"/>
<libset libs="expat" if="has-expat"/>
- <syslibset libs="advapi32 odbc32 ws2_32 mswsock" if="is-windows"/>
+ <syslibset libs="advapi32 ws2_32 mswsock" if="is-windows"/>
<syslibset libs="stdc++" if="is-gcc"/>
<syslibset libs="cw32mt" if="is-bcc"/>
-'>]>
+'>
+<!ENTITY common SYSTEM 'src/ant/common.xml'>
+]>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -38,16 +44,14 @@
-->
<project name="log4cxx" default="check">
-<property environment="env"/>
-<!-- The build.properties file defines the parth to local jar files -->
-<property file="build.properties"/>
+&common;
-<property name="debug" value="true"/>
<property name="base.dir" location="."/>
<property name="src.dir" location="${base.dir}/src/main/cpp"/>
<property name="include.dir" location="${base.dir}/src/main/include"/>
-<property name="build.dir" location="${base.dir}/target"/>
-<property name="lib.dir" location="${build.dir}/lib"/>
+<property name="target.dir" location="${base.dir}/target"/>
+<property name="projects.dir" location="${target.dir}"/>
+<property name="lib.dir" location="${target.dir}/lib"/>
<property name="examples.dir" location="${base.dir}/src/examples/cpp"/>
<property name="tests.dir" location="${base.dir}/src/test"/>
<property name="tests.cpp.dir" location="${tests.dir}/cpp"/>
@@ -60,17 +64,23 @@
<property name="log4j.version" value="1.2.15"/>
<property name="log4j.jar"
location="${m2_repo}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar"/>
+<property name="apr.lib.type" value="static"/>
+<property name="apr-util.lib.type" value="static"/>
+<property name="libesmtp.lib.type" value="static"/>
<property name="doxygen.exe" value="doxygen"/>
<property name="enable_dot" value="YES"/>
<property name="version" value="0.10.0"/>
-<property name="rtti" value="false"/>
-<property name="optimize" value="none"/>
-<property name="lib.type" value="shared"/>
-<property name="has.wchar_t" value="1"/>
-<property name="has.wcout" value="1"/>
+<property name="enable-char" value="1"/>
+<property name="enable-wchar_t" value="1"/>
+<property name="enable-unichar" value="0"/>
+<property name="enable-cfstring" value="0"/>
+<property name="with-charset" value="auto"/>
+<property name="with-SMTP" value="no"/>
+<property name="with-ODBC" value="no"/>
+
<property name="apache.mirror" value="http://archive.apache.org/dist"/>
@@ -79,23 +89,6 @@
<property name="apache.doc_dest" value="/home/${apache.user}/public_html/test"/>
-<property name="apr.version" value="1.2.9"/>
-<property name="apr.lib.name" value="apr-1"/>
-<property name="apr.lib.type" value="static"/>
-
-<property name="aprutil.version" value="1.2.8"/>
-<property name="aprutil.lib.name" value="aprutil-1"/>
-<property name="aprutil.lib.type" value="static"/>
-
-
-<property name="svnrepo.url" value="https://svn.apache.org/repos/asf"/>
-<property name="svnsite.url" value="${svnrepo.url}/logging/site/trunk/docs/log4cxx"/>
-<available property="svn-available" file="target/site-deploy/.svn"/>
-
-
-<taskdef resource="cpptasks.tasks"/>
-<typedef resource="cpptasks.types"/>
-
<target name="usage" description="Describes usage of the build script">
@@ -106,10 +99,13 @@
> ant
+will attempt to locate APR and APR-util in /usr, /usr/local/apr and ..
+
Builds and tests log4cxx.
-> ant -Dapr.dir=/usr/local/lib
-Builds and tests log4cxx using installed APR
+> ant -Dwith-apr=APRPATH -Dwith-apr-util=APUPATH
+
+Builds and tests log4cxx using APR and APR-Util at specified location
> ant -p
@@ -117,393 +113,292 @@
> ant build-projects-vc6
-Builds Microsoft Visual Studio projects.
--xcode and -cbx for Apple Xcode and Borland CBuilderX for Linux
+Builds Microsoft Visual Studio 6 projects.
+-vc8 and -xcode for Visual Studio 8 and Apple Xcode 2 and later.
respectively.
-Common command line options:
+Command line options:
-Ddebug=[true|false]
-Doptimize=[speed|size|none]
-Dversion=n.n.n
--Dlib.type=[shared|static]
--Dapr.dir=PATH
--Daprutil.dir=PATH
--Dhas.wchar_t=[0|1] (default=1)
--Dhas.wcout=[0|1] (default=1)
--Dlogchar=[utf-8|wchar_t|unichar] (default=utf-8 on Unix, wchar_t on Windows)
+-Denable-shared=[yes|no] (default yes)
+-Denable-static=[yes|no] (default yes)
+-Denable-char=[0, 1] (expose char* API, default 1)
+-Denable-wchar_t=[0, 1] (expose wchar_t* API, default 1)
+-Denable-unichar=[0, 1] (expose UniChar API, default 0)
+-Denable-cfstring[0, 1] (expose CFString API, default 0)
+-Dwith-charset=[auto|utf-8|iso-8859-1|usascii|ebcdic] (default auto)
+-Dwith-logchar=[utf-8|wchar_t|unichar] (default=utf-8 on Unix, wchar_t on Windows)
+-Dwith-apr=APRPATH
+-Dwith-apr-util=PATH
+-Dwith-SMTP=[libesmtp, no] (default no)
+-Dwith-ODBC=[unixODBC, iODBC, Microsoft, no] (default no)
</echo>
</target>
-<target name="os-detect">
- <condition property="is-mac" value="true">
- <and>
- <os family="mac"/>
- <not><isset property="is-windows"/></not>
- </and>
- </condition>
- <condition property="is-unix" value="true">
- <or>
- <isset property="is-mac"/>
- <equals arg1="${os.family}" arg2="cygwin"/>
- <and>
- <os family="unix"/>
- <not><isset property="is-windows"/></not>
- </and>
- </or>
- </condition>
- <condition property="is-windows" value="true">
- <and>
- <os family="windows"/>
- <not><isset property="is-unix"/></not>
- </and>
- </condition>
- <condition property="os.family" value="windows">
- <isset property="is-windows"/>
- </condition>
- <condition property="os.family" value="unix">
- <isset property="is-unix"/>
- </condition>
-
-
-</target>
-
-
-<target name="win-init" depends="os-detect" if="is-windows">
- <property name="lib.prefix" value=""/>
- <property name="lib.extension" value=".lib"/>
- <property name="project.type" value="msvc6"/>
- <property name="project.dir" value="msvc"/>
- <property name="compiler" value="msvc"/>
-
- <!-- Default value for logchar on windows -->
- <property name="logchar" value="wchar_t"/>
-
- <condition property="is-bcc" value="true">
- <or>
- <equals arg1="${compiler}" arg2="bcc"/>
- </or>
- </condition>
-
- <condition property="is-mingw" value="true">
- <isset property="is-gcc"/>
- </condition>
-</target>
-
-<target name="mac-init" depends="os-detect" if="is-mac">
- <property name="project.type" value="xcode"/>
- <property name="project.dir" value="xcode"/>
- <property name="has-iconv" value="true"/>
-
- <!-- Default value for logchar on mac -->
- <property name="logchar" value="wchar_t"/>
-
- <condition property="mac_osx_wchar_not_supported_yet" value="true">
- <equals arg1="${has.wchar_t}" arg2="1"/>
- </condition>
-</target>
-
-
-<target name="unix-init" depends="mac-init" if="is-unix">
-
- <property name="compiler" value="gcc"/>
-
- <property name="lib.prefix" value="lib"/>
- <property name="lib.extension" value=".a"/>
- <property name="project.type" value="cbuilderx"/>
- <property name="project.dir" value="cbx"/>
- <property name="compiler" value="g++"/>
- <property name="lib-suffix" value=""/>
-
- <!-- Default value for logchar on Unix -->
- <property name="logchar" value="utf-8"/>
-
- <condition property="has-expat" value="true">
- <not><isset property="is-mac"/></not>
- </condition>
- <condition property="is-cygwin" value="true">
- <os family="windows"/>
- </condition>
-</target>
-
-
-
-<target name="init" depends="win-init, unix-init">
- <available classname="net.sf.antcontrib.cpptasks.CCTask" property="cctask-available"/>
- <fail unless="cctask-available">cpptasks required
+<target name="init" depends="common-init">
-Use CVS HEAD or Feb 2005 or later release from
-http://ant-contrib.sourceforge.net.
-</fail>
-
- <available classname="net.sf.antcontrib.cpptasks.ide.ProjectDef"
- property="cctask-project-available"/>
- <!-- fail unless="cctask-project-available">later version of cpptasks required
-
-Required features not present in cpptasks releases prior to Feb 2005</fail -->
-
- <mkdir dir="${build.dir}"/>
-
- <condition property="is-gcc" value="true">
- <or>
- <equals arg1="${compiler}" arg2="gcc"/>
- <equals arg1="${compiler}" arg2="g++"/>
- </or>
- </condition>
-
- <condition property="pic-option" value="-fPIC">
- <and>
- <isset property="is-gcc"/>
- <istrue value="${use-pic}"/>
- </and>
- </condition>
-
-
- <condition property="is-debug" value="true">
- <istrue value="${debug}"/>
- </condition>
-
- <condition property="logchar_type" value="utf-8">
- <not><equals arg1="${has.wchar_t}" arg2="1"/></not>
- </condition>
-
- <condition property="logchar_type" value="${logchar}">
- <equals arg1="${has.wchar_t}" arg2="1"/>
- </condition>
-
- <condition property="debug.release" value="debug">
- <isset property="is-debug"/>
- </condition>
- <property name="debug.release" value="release"/>
+ <property name="log4cxx.lib.dir" value="${executable.dir}/${lib.type}"/>
+ <mkdir dir="${log4cxx.lib.dir}"/>
- <condition property="apr.include.dir" value="${apr.dir}/include/apr-1">
- <isset property="apr.dir"/>
+ <condition property="with-logchar" value="wchar_t">
+ <isset property="is-windows"/>
</condition>
- <condition property="apr.lib.dir" value="${apr.dir}/lib">
- <isset property="apr.dir"/>
+ <property name="with-logchar" value="utf-8"/>
+
+ <condition property="has-libesmtp" value="1">
+ <equals arg1="${with-SMTP}" arg2="libesmtp"/>
</condition>
- <condition property="aprutil.dir" value="${apr.dir}">
- <isset property="apr.dir"/>
- </condition>
- <condition property="aprutil.include.dir" value="${aprutil.dir}/include/apr-1">
- <isset property="aprutil.dir"/>
- </condition>
- <condition property="aprutil.lib.dir" value="${aprutil.dir}/lib">
- <isset property="aprutil.dir"/>
+ <condition property="has-unixODBC" value="1">
+ <equals arg1="${with-ODBC}" arg2="unixODBC"/>
</condition>
- <condition property="lib-suffix" value="d">
- <isset property="is-debug"/>
+ <condition property="has-iODBC" value="1">
+ <equals arg1="${with-ODBC}" arg2="iODBC"/>
</condition>
- <property name="lib-suffix" value=""/>
-
- <available property="apr-available"
- file="${apr.lib.dir}/${lib.prefix}apr-1${lib-suffix}${lib.extension}"/>
- <available property="aprutil-available"
- file="${aprutil.lib.dir}/${lib.prefix}aprutil-1${lib-suffix}${lib.extension}"/>
-
- <available property="apr-src-expanded" file="${lib.dir}/apr-${apr.version}"/>
- <available property="aprutil-src-expanded" file="${lib.dir}/apr-util-${aprutil.version}"/>
-
- <condition property="is-static" value="true">
- <equals arg1="${lib.type}" arg2="static"/>
+ <condition property="has-MSODBC" value="1">
+ <equals arg1="${with-ODBC}" arg2="Microsoft"/>
</condition>
-
- <condition property="apr-static" value="true">
- <equals arg1="${apr.lib.type}" arg2="static"/>
- </condition>
-
- <condition property="aprutil-static" value="true">
- <equals arg1="${aprutil.lib.type}" arg2="static"/>
- </condition>
-
- <condition property="executable.dir" value="${build.dir}/debug">
- <isset property="is-debug"/>
+
+ <condition property="has-ODBC" value="1">
+ <or>
+ <isset property="has-unixODBC"/>
+ <isset property="has-iODBC"/>
+ <isset property="has-MSODBC"/>
+ </or>
</condition>
- <property name="executable.dir" value="${build.dir}/release"/>
-
- <property name="log4cxx.lib.dir" value="${executable.dir}/${lib.type}"/>
- <mkdir dir="${log4cxx.lib.dir}"/>
-
-
- <property name="projectsOnly" value="false"/>
+ <property name="has-ODBC" value="0"/>
</target>
<target name="clean" depends="init" description="Removes built files">
- <delete dir="${build.dir}"/>
+ <delete dir="${target.dir}"/>
<delete>
<fileset dir="${include.dir}/log4cxx" includes="**/log4cxx.h"/>
</delete>
</target>
-<target name="config-check" depends="os-detect">
- <condition property="config-available" value="true">
- <and>
- <available file="${include.dir}/log4cxx/log4cxx.h"/>
- <available file="${include.dir}/log4cxx/private/log4cxx_private.h"/>
- </and>
- </condition>
+<target name="unix-configure" if="is-unix">
+ <copy tofile="${include.dir}/log4cxx/log4cxx.tmp"
+ file="${include.dir}/log4cxx/log4cxx.h.in" overwrite="true"/>
+ <copy tofile="${include.dir}/log4cxx/private/log4cxx_private.tmp"
+ file="${include.dir}/log4cxx/private/log4cxx_private.h.in" overwrite="true"/>
</target>
-
-<target name="unix-configure"
- depends="config-check"
- if="is-unix"
- unless="config-available">
-
- <copy tofile="${include.dir}/log4cxx/log4cxx.h"
- file="${include.dir}/log4cxx/log4cxx.h.in"/>
- <copy tofile="${include.dir}/log4cxx/private/log4cxx_private.h"
- file="${include.dir}/log4cxx/private/log4cxx_private.h.in"/>
-</target>
-
-<target name="win-configure"
- depends="config-check"
- if="is-windows"
- unless="config-available">
- <copy tofile="${include.dir}/log4cxx/log4cxx.h"
- file="${include.dir}/log4cxx/log4cxx.hw"/>
- <copy tofile="${include.dir}/log4cxx/private/log4cxx_private.h"
- file="${include.dir}/log4cxx/private/log4cxx_private.hw"/>
+<target name="win-configure" if="is-windows">
+ <copy tofile="${include.dir}/log4cxx/log4cxx.tmp"
+ 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"/>
</target>
<target name="configure" depends="init,
unix-configure,
win-configure">
- <echo message="Configuring with has.wchar_t=${has.wchar_t}"/>
- <echo message="Configuring with has.wcout=${has.wcout}"/>
- <echo message="Configuring with logchar_type=${logchar_type}" />
+ <echo message="Configuring with-logchar=${with-logchar}" />
+ <echo message="Configuring with-charset=${with-charset}" />
+ <echo message="Configuring with-SMTP=${with-SMTP}" />
+ <echo message="Configuring with-ODBC=${with-ODBC}" />
+ <echo message="Configuring enable-char=${enable-char}"/>
+ <echo message="Configuring enable-wchar_t=${enable-wchar_t}"/>
+ <echo message="Configuring enable-unichar=${enable-unichar}"/>
+ <echo message="Configuring enable-cfstring=${enable-cfstring}"/>
<condition property="logchar_is_utf8" value="1">
- <equals arg1="${logchar_type}" arg2="utf-8"/>
+ <equals arg1="${with-logchar}" arg2="utf-8"/>
</condition>
<property name="logchar_is_utf8" value="0"/>
<condition property="logchar_is_unichar" value="1">
- <equals arg1="${logchar_type}" arg2="unichar"/>
+ <equals arg1="${with-logchar}" arg2="unichar"/>
</condition>
<property name="logchar_is_unichar" value="0"/>
<condition property="logchar_is_wchar" value="1">
- <equals arg1="${logchar_type}" arg2="wchar_t"/>
+ <equals arg1="${with-logchar}" arg2="wchar_t"/>
</condition>
<property name="logchar_is_wchar" value="0"/>
- <replaceregexp file="${include.dir}/log4cxx/log4cxx.h"
+ <replaceregexp file="${include.dir}/log4cxx/log4cxx.tmp"
match="@LOGCHAR_IS_UNICHAR@"
replace="${logchar_is_unichar}"/>
- <replaceregexp file="${include.dir}/log4cxx/log4cxx.h"
+ <replaceregexp file="${include.dir}/log4cxx/log4cxx.tmp"
match="@LOGCHAR_IS_UTF8@"
replace="${logchar_is_utf8}"/>
- <replaceregexp file="${include.dir}/log4cxx/log4cxx.h"
+ <replaceregexp file="${include.dir}/log4cxx/log4cxx.tmp"
match="@LOGCHAR_IS_WCHAR@"
replace="${logchar_is_wchar}"/>
- <replaceregexp file="${include.dir}/log4cxx/log4cxx.h"
+ <condition property="charset_is_utf8" value="1">
+ <equals arg1="${with-charset}" arg2="utf-8"/>
+ </condition>
+ <property name="charset_is_utf8" value="0"/>
+
+ <condition property="charset_is_iso-8859-1" value="1">
+ <equals arg1="${with-charset}" arg2="iso-8859-1"/>
+ </condition>
+ <property name="charset_is_iso-8859-1" value="0"/>
+
+ <condition property="charset_is_usascii" value="1">
+ <equals arg1="${with-charset}" arg2="usascii"/>
+ </condition>
+ <property name="charset_is_usascii" value="0"/>
+
+ <condition property="charset_is_ebcdic" value="1">
+ <equals arg1="${with-charset}" arg2="ebcdic"/>
+ </condition>
+ <property name="charset_is_ebcdic" value="0"/>
+
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
+ match="@CHARSET_UTF8@"
+ replace="${charset_is_utf8}"/>
+
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
+ match="@CHARSET_ISO88591@"
+ replace="${charset_is_iso-8859-1}"/>
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
+ match="@CHARSET_USASCII@"
+ replace="${charset_is_usascii}"/>
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
+ match="@CHARSET_EBCDIC@"
+ replace="${charset_is_ebcdic}"/>
+
+ <replaceregexp file="${include.dir}/log4cxx/log4cxx.tmp"
+ match="@CHAR_API@"
+ replace="${enable-char}"/>
+
+ <replaceregexp file="${include.dir}/log4cxx/log4cxx.tmp"
match="@WCHAR_T_API@"
- replace="${has.wchar_t}"/>
+ replace="${enable-wchar_t}"/>
- <replaceregexp file="${include.dir}/log4cxx/log4cxx.h"
+ <replaceregexp file="${include.dir}/log4cxx/log4cxx.tmp"
match="@UNICHAR_API@"
- replace="0"/>
+ replace="${enable-unichar}"/>
- <replaceregexp file="${include.dir}/log4cxx/log4cxx.h"
+ <replaceregexp file="${include.dir}/log4cxx/log4cxx.tmp"
match="@CFSTRING_API@"
- replace="0"/>
+ replace="${enable-cfstring}"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
match="@HAS_SYSLOG@"
replace="1"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
match="@HAS_STD_LOCALE@"
replace="1"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
match="@HAS_MBSRTOWCS@"
replace="1"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
match="@HAS_WCSTOMBS@"
replace="1"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
- match="@CHARSET_UTF8@"
- replace="0"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
- match="@CHARSET_ISO88591@"
- replace="0"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
- match="@CHARSET_USASCII@"
- replace="0"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
- match="@CHARSET_EBCDIC@"
- replace="0"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
+
+ <condition property="has-libesmtp-value" value="1">
+ <isset property="has-libesmtp"/>
+ </condition>
+ <property name="has-libesmtp-value" value="0"/>
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
match="@HAS_LIBESMTP@"
- replace="0"/>
- <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.h"
+ replace="${has-libesmtp-value}"/>
+
+ <replaceregexp file="${include.dir}/log4cxx/private/log4cxx_private.tmp"
match="@HAS_ODBC@"
- replace="0"/>
+ replace="${has-ODBC}"/>
+
+ <antcall target="copy-if-changed">
+ <param name="tofile" value="${include.dir}/log4cxx/log4cxx.h"/>
+ <param name="file" value="${include.dir}/log4cxx/log4cxx.tmp"/>
+ </antcall>
+ <delete file="${include.dir}/log4cxx/log4cxx.tmp"/>
+ <antcall target="copy-if-changed">
+ <param name="tofile" value="${include.dir}/log4cxx/private/log4cxx_private.h"/>
+ <param name="file" value="${include.dir}/log4cxx/private/log4cxx_private.tmp"/>
+ </antcall>
+ <delete file="${include.dir}/log4cxx/private/log4cxx_private.tmp"/>
</target>
-<target name="build-apr" depends="init" unless="apr-available">
- <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}"/>
- <ant antfile="src/apr/ant/build.xml" target="build" inheritAll="false">
- <property name="version" value="${apr.version}"/>
+<target name="build-apr" depends="find-apr" unless="apr-available">
+ <fail unless="apr.src.dir">Could not locate apr library or source.</fail>
+
+ <ant antfile="src/ant/apr-build.xml" target="build" inheritAll="false">
+ <property name="basedir" value="${apr.src.dir}"/>
+ <property name="target.dir" value="${target.dir}"/>
<property name="debug" value="${debug}"/>
<property name="lib-suffix" value="${lib-suffix}"/>
<property name="compiler" value="${compiler}"/>
- <property name="apr.dir" value="${apr.dir}"/>
- <property name="apr.lib.dir" value="${apr.lib.dir}"/>
- <property name="apr.lib.type" value="${apr.lib.type}"/>
+ <property name="lib.type" value="${apr.lib.type}"/>
<property name="project.type" value="${project.type}"/>
- <property name="project.dir" value="${project.dir}"/>
+ <property name="projects.dir" value="${projects.dir}"/>
<property name="project.if.value" value="${project.if}"/>
<property name="use-pic" value="${use-pic}"/>
<property name="os.family" value="${os.family}"/>
</ant>
-
- <!-- configure can't handle a Windows path -->
- <condition property="with-apr" value="../apr-${apr.version}/apr-1-config">
- <isset property="is-cygwin"/>
+ <condition property="apr.lib.dir" value="${target.dir}/${debug.release}/shared">
+ <equals arg1="${apr.lib.type}" arg2="shared"/>
</condition>
- <property name="with-apr" location="${apr.dir}"/>
+ <property name="apr.lib.dir" location="${target.dir}/${debug.release}/static"/>
+ <property name="apr.project.file" location="${projects.dir}/apr"/>
</target>
-<target name="build-aprutil" depends="build-apr" unless="aprutil-available">
-
- <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}"/>
+<target name="build-apr-util" depends="build-apr, find-apr-util" unless="apr-util.lib.dir">
+ <fail unless="apr-util.src.dir">Could not locate apr-util library or source.</fail>
- <ant antfile="src/apr-util/ant/build.xml" target="build" inheritAll="false">
- <property name="version" value="${aprutil.version}"/>
- <property name="aprutil.dir" value="${aprutil.dir}"/>
+ <ant antfile="src/ant/apr-util-build.xml" target="build" inheritAll="false">
+ <property name="target.dir" value="${target.dir}"/>
+ <property name="basedir" value="${apr-util.src.dir}"/>
<property name="debug" value="${debug}"/>
<property name="lib-suffix" value="${lib-suffix}"/>
<property name="compiler" value="${compiler}"/>
<property name="apr.include.dir" value="${apr.include.dir}"/>
<property name="apr.lib.dir" value="${apr.lib.dir}"/>
- <property name="aprutil.lib.dir" value="${aprutil.lib.dir}"/>
<property name="apr.lib.type" value="${apr.lib.type}"/>
- <property name="aprutil.lib.type" value="${aprutil.lib.type}"/>
- <property name="with-apr" value="${with-apr}"/>
+ <property name="lib.type" value="${apr-util.lib.type}"/>
+ <property name="project.type" value="${project.type}"/>
+ <property name="projects.dir" value="${projects.dir}"/>
+ <property name="project.if.value" value="${project.if}"/>
+ <property name="use-pic" value="${use-pic}"/>
+ <property name="os.family" value="${os.family}"/>
+ </ant>
+
+ <condition property="apr-util.lib.dir" value="${target.dir}/${debug.release}/shared">
+ <equals arg1="${apr-util.lib.type}" arg2="shared"/>
+ </condition>
+ <property name="apr-util.lib.dir" location="${target.dir}/${debug.release}/static"/>
+ <property name="apr-util.project.file" location="${projects.dir}/apr-util"/>
+</target>
+
+<target name="build-libesmtp" depends="find-libesmtp" if="has-libesmtp" unless="libesmtp.lib.dir">
+ <fail unless="libesmtp.src.dir">Could not locate libesmtp library or source.</fail>
+
+ <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="debug" value="${debug}"/>
+ <property name="lib-suffix" value="${lib-suffix}"/>
+ <property name="compiler" value="${compiler}"/>
+ <property name="lib.type" value="${libesmtp.lib.type}"/>
<property name="project.type" value="${project.type}"/>
- <property name="project.dir" value="${project.dir}"/>
+ <property name="projects.dir" value="${projects.dir}"/>
<property name="project.if.value" value="${project.if}"/>
<property name="use-pic" value="${use-pic}"/>
<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 name="libesmtp.lib.dir" location="${target.dir}/${debug.release}/static"/>
+ <property name="libesmtp.project.file" location="${projects.dir}/libesmtp"/>
</target>
@@ -515,13 +410,13 @@
</target>
-<target name="header-check" depends="build-aprutil, configure"
+<target name="header-check" depends="build-apr-util, configure"
description="Checks headers against Effective C++ guidelines">
<fail unless="is-gcc">Requires GCC compiler</fail>
<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
- <delete dir="${build.dir}/header-check"/>
- <mkdir dir="${build.dir}/header-check"/>
- <copy todir="${build.dir}/header-check" overwrite="true">
+ <delete dir="${target.dir}/header-check"/>
+ <mkdir dir="${target.dir}/header-check"/>
+ <copy todir="${target.dir}/header-check" overwrite="true">
<fileset dir="${include.dir}" includes="**/*.h">
<!-- obsolete header with #error directive to eliminate its use -->
<exclude name="**/tchar.h"/>
@@ -530,9 +425,9 @@
</fileset>
</copy>
<foreach target="make-header-check" param="header">
- <path><fileset dir="${build.dir}/header-check" includes="**/*.h"/></path>
+ <path><fileset dir="${target.dir}/header-check" includes="**/*.h"/></path>
</foreach>
- <cc objdir="${build.dir}/header-check"
+ <cc objdir="${target.dir}/header-check"
name="gcc"
exceptions="true"
subsystem="gui"
@@ -544,21 +439,16 @@
<compilerarg value="-Weffc++"/>
<compilerarg value="-Wall"/>
<compilerarg value="${pic-option}" if="pic-option"/>
- <fileset dir="${build.dir}/header-check"
+ <fileset dir="${target.dir}/header-check"
includes="**/*.cpp"
excludes="log4cxx/private/*.cpp **/aprinitializer.h.cpp"/>
<includepath path="${include.dir}"/>
- <project outfile="${project.dir}/header-check"
+ <project outfile="${projects.dir}/header-check"
type="${project.type}" if="project.if"/>
</cc>
</target>
-<target name="mkdir-project" if="project.if">
- <mkdir dir="${project.dir}"/>
-</target>
-
-
-<target name="build" depends="build-aprutil, configure" description="Build log4cxx library">
+<target name="build" depends="build-apr-util, configure" description="Build log4cxx library">
<mkdir dir="${log4cxx.lib.dir}/log4cxx_obj"/>
<property name="project.compiler" value="${compiler}"/>
@@ -571,20 +461,20 @@
objdir="${log4cxx.lib.dir}/log4cxx_obj"
debug="${debug}"
projectsOnly="${projectsOnly}">
- <fileset dir="${src.dir}" includes="*.cpp" excludes="**/iconv_module.cpp"/>
+ <fileset dir="${src.dir}" includes="*.cpp"/>
<fileset dir="${include.dir}" includes="**/*.h"/>
<includepath path="${include.dir}"/>
<includepath path="${apr.include.dir}"/>
- <includepath path="${aprutil.include.dir}"/>
+ <includepath path="${apr-util.include.dir}"/>
<defineset define="_USRDLL DLL_EXPORTS" if="is-windows"/>
<defineset define="LOG4CXX"/>
<defineset define="LOG4CXX_STATIC" if="is-static"/>
<defineset define="APR_DECLARE_STATIC" if="apr-static"/>
- <defineset define="APU_DECLARE_STATIC" if="aprutil-static"/>
+ <defineset define="APU_DECLARE_STATIC" if="apr-util-static"/>
<defineset define="WIN32" if="is-windows"/>
<compilerarg value="${pic-option}" if="pic-option"/>
&libsets;
- <project type="${project.type}" outfile="${project.dir}/log4cxx" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/log4cxx" if="project.if"/>
</cc>
</target>
@@ -610,14 +500,13 @@
<defineset define="WIN32" if="is-windows"/>
<defineset define="LOG4CXX_STATIC" if="is-static"/>
<defineset define="APR_DECLARE_STATIC" if="apr-static"/>
- <defineset define="APU_DECLARE_STATIC" if="aprutil-static"/>
<compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="log4cxx${lib-suffix}" dir="${log4cxx.lib.dir}"/>
&libsets;
- <project outfile="${project.dir}/${example.name}" type="${project.type}" if="project.if"/>
+ <project outfile="${projects.dir}/${example.name}" type="${project.type}" if="project.if"/>
</cc>
</target>
@@ -630,9 +519,9 @@
dir="${log4cxx.lib.dir}"
failonerror="true">
<env key="DYLD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="Path" value="${env.Path}"/>
</exec>
</target>
@@ -702,10 +591,10 @@
<fileset dir="${tests.cpp.dir}" includes="**/*.cpp **/*.c **/*.h"/>
<includepath path="${include.dir}"/>
<includepath path="${apr.include.dir}"/>
- <includepath path="${aprutil.include.dir}"/>
+ <includepath path="${apr-util.include.dir}"/>
<defineset define="LOG4CXX_STATIC" if="is-static"/>
<defineset define="APR_DECLARE_STATIC" if="apr-static"/>
- <defineset define="APU_DECLARE_STATIC" if="aprutil-static"/>
+ <defineset define="APU_DECLARE_STATIC" if="apr-util-static"/>
<defineset define="WIN32" if="is-windows"/>
<compilerarg value="${pic-option}" if="pic-option"/>
@@ -713,7 +602,7 @@
<libset libs="dl" if="is-unix"/>
&libsets;
- <project outfile="${project.dir}/testsuite" type="${project.type}" if="project.if"/>
+ <project outfile="${projects.dir}/testsuite" type="${project.type}" if="project.if"/>
</cc>
</target>
@@ -739,10 +628,10 @@
<fileset dir="${tests.cpp.dir}" includes="**/*.cpp **/*.c **/*.h"/>
<includepath path="${include.dir}"/>
<includepath path="${apr.include.dir}"/>
- <includepath path="${aprutil.include.dir}"/>
+ <includepath path="${apr-util.include.dir}"/>
<defineset define="LOG4CXX"/>
<defineset define="APR_DECLARE_STATIC" if="apr-static"/>
- <defineset define="APU_DECLARE_STATIC" if="aprutil-static"/>
+ <defineset define="APU_DECLARE_STATIC" if="apr-util-static"/>
<defineset define="WIN32" if="is-windows"/>
<compilerarg value="${pic-option}" if="pic-option"/>
@@ -791,9 +680,9 @@
<arg value="-v"/>
<arg value="testcase1"/>
<env key="DYLD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.LD_LIBRARY_PATH}"/>
</exec>
<copy tofile="${log4cxx.lib.dir}/${config}.xml"
@@ -803,9 +692,9 @@
<arg value="-v"/>
<arg value="testcase2"/>
<env key="DYLD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.LD_LIBRARY_PATH}"/>
</exec>
<delete>
<fileset dir="${log4cxx.lib.dir}" includes="*.properties *.xml"/>
@@ -819,9 +708,9 @@
<arg value="-v"/>
<arg value="testcase3"/>
<env key="DYLD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.LD_LIBRARY_PATH}"/>
</exec>
<delete>
<fileset dir="${log4cxx.lib.dir}" includes="*.properties *.xml"/>
@@ -835,9 +724,9 @@
<arg value="-v"/>
<arg value="testcase4"/>
<env key="LD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="DYLD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
</exec>
<delete>
<fileset dir="${log4cxx.lib.dir}" includes="*.properties *.xml"/>
@@ -860,9 +749,9 @@
<env key="key1" value="value1"/>
<env key="key2" value="value2"/>
<env key="LD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="DYLD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="Path"
value="${log4cxx.lib.dir};${env.Path}"/>
</exec>
@@ -884,9 +773,9 @@
<env key="key1" value="value1"/>
<env key="key2" value="value2"/>
<env key="DYLD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="Path"
value="${log4cxx.lib.dir};${env.Path}"/>
</exec>
@@ -917,9 +806,9 @@
<arg value="-v"/>
<arg value="socketservertestcase"/>
<env key="LD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="DYLD_LIBRARY_PATH"
- value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${apr-util.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="Path"
value="${log4cxx.lib.dir};${env.Path}"/>
</exec>
@@ -934,59 +823,43 @@
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
- <param name="projects.dir" location="${project.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
<antcall target="build-unittest">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
- <param name="projects.dir" location="${project.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
<antcall target="build-standalone-unittest">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
- <param name="projects.dir" location="${project.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
<antcall target="build-examples">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
- <param name="projects.dir" location="${project.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
<antcall target="build-performance">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
- <param name="projects.dir" location="${project.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
</target>
<target name="build-projects-vc6" description="Builds project files for Microsoft Visual C++ 6">
<antcall target="build-projects">
- <param name="project.dir" value="msvc"/>
<param name="project.type" value="msvc6"/>
<param name="project.compiler" value="msvc"/>
</antcall>
- <echo file="msvc/configure.bat">
-copy ..\lib\apr-${apr.version}\include\apr.hw ..\lib\apr-${apr.version}\include\apr.h
-copy ..\lib\apr-util-${aprutil.version}\include\apu.hw ..\lib\apr-util-${aprutil.version}\include\apu.h
-copy ..\lib\apr-util-${aprutil.version}\include\aprldap.hw ..\lib\apr-util-${aprutil.version}\include\aprldap.h
-copy ..\lib\apr-util-${aprutil.version}\include\apuwant.hw ..\lib\apr-util-${aprutil.version}\include\apuwant.h
-copy ..\include\log4cxx\log4cxx.hw ..\include\log4cxx.h
-copy ..\include\log4cxx\private\log4cxx_private.hw ..\include\private\log4cxx_private.h
- </echo>
- <chmod file="msvc/configure.bat" perm="ugo+rwx"/>
</target>
<target name="build-projects-vc8" description="Builds project files for Microsoft Visual C++ 2005">
<antcall target="build-projects">
- <param name="project.dir" location="msvc8"/>
<param name="project.type" value="msvc8"/>
<param name="project.compiler" value="msvc"/>
</antcall>
@@ -994,19 +867,11 @@
<target name="build-projects-xcode" description="Builds project files for Apple Xcode">
<antcall target="build-projects">
- <param name="project.dir" location="xcode"/>
<param name="project.type" value="xcode"/>
- <param name="project.compiler" value="${compiler}"/>
+ <param name="project.compiler" value="g++"/>
</antcall>
</target>
-<target name="build-projects-cbx" description="Builds project files for Borland CBuilderX">
- <antcall target="build-projects">
- <param name="project.dir" location="cbx"/>
- <param name="project.type" value="cbuilderx"/>
- <param name="project.compiler" value="${compiler}"/>
- </antcall>
-</target>
<target name="test-compile" depends="build-unittest, build-examples, build-performance"/>
@@ -1023,16 +888,16 @@
<target name="apidocs" depends="init" description="Build log4cxx manual">
- <copy file="src/site/doxy/Doxyfile.in" tofile="${build.dir}/Doxyfile"
+ <copy file="src/site/doxy/Doxyfile.in" tofile="${target.dir}/Doxyfile"
overwrite="true"/>
- <replace file="${build.dir}/Doxyfile">
+ <replace file="${target.dir}/Doxyfile">
<replacefilter token="@VERSION@" value="${version}"/>
<replacefilter token="@base_dir@" value="${base.dir}"/>
<replacefilter token="@enable_dot@" value="${enable_dot}"/>
<replacefilter token="@manual_dest@" value="${base.dir}/target/site/apidocs"/>
</replace>
<mkdir dir="target/site/apidocs"/>
- <exec executable="${doxygen.exe}" dir="${build.dir}"/>
+ <exec executable="${doxygen.exe}" dir="${target.dir}"/>
</target>
<target name="gump" depends="check, header-check"/>
@@ -1106,5 +971,82 @@
<arg value="commit"/>
</exec>
</target>
+
+
+<target name="find-libesmtp" depends="init" if="has-libesmtp">
+ <property name="libesmtp.lib.name" value="esmtp"/>
+ <condition property="libesmtp.dir" value="/usr">
+ <or>
+ <available file="/usr/lib/lib${libesmtp.lib.name}.a"/>
+ <available file="/usr/lib/lib${libesmtp.lib.name}.la"/>
+ </or>
+ </condition>
+ <condition property="libesmtp.dir" value="/usr/local">
+ <or>
+ <available file="/usr/local/lib/lib${libesmtp.lib.name}.a"/>
+ <available file="/usr/local/lib/lib${libesmtp.lib.name}.la"/>
+ </or>
+ </condition>
+ <property name="relative-libesmtp" location="../libesmtp"/>
+ <condition property="libesmtp.dir" value="${relative-libesmtp}">
+ <available file="${relative-libesmtp}"/>
+ </condition>
+ <fail unless="libesmtp.dir">Unable to locate libesmtp base directory.</fail>
+
+ <condition property="libesmtp.include.dir" value="${libesmtp.dir}/include">
+ <available file="${libesmtp.dir}/include/libesmtp.h"/>
+ </condition>
+ <condition property="libesmtp.include.dir" value="${libesmtp.dir}">
+ <available file="${libesmtp.dir}/libesmtp.h"/>
+ </condition>
+ <fail unless="libesmtp.include.dir">Unable to locate libesmtp include directory.</fail>
+
+ <condition property="libesmtp.lib.dir" value="${libesmtp.dir}/lib">
+ <and>
+ <not><equals arg1="${libesmtp.dir}" arg2="/usr"/></not>
+ <or>
+ <available file="${libesmtp.dir}/lib/lib${libesmtp.lib.name}.a"/>
+ <available file="${libesmtp.dir}/lib/lib${libesmtp.lib.name}.la"/>
+ <available file="${libesmtp.dir}/lib/${libesmtp.lib.name}.lib"/>
+ <available file="${libesmtp.dir}/lib/${libesmtp.lib.name}d.lib"/>
+ </or>
+ </and>
+ </condition>
+ <condition property="libesmtp.lib.dir" value="${libesmtp.dir}/.libs">
+ <or>
+ <available file="${libesmtp.dir}/.libs/lib${libesmtp.lib.name}.a"/>
+ <available file="${libesmtp.dir}/.libs/lib${libesmtp.lib.name}.la"/>
+ <available file="${libesmtp.dir}/.libs/${libesmtp.lib.name}.lib"/>
+ <available file="${libesmtp.dir}/.libs/${libesmtp.lib.name}d.lib"/>
+ </or>
+ </condition>
+ <condition property="libesmtp.lib.dir" value="${libesmtp.dir}/target/${debug.release}/static">
+ <or>
+ <available file="${libesmtp.dir}/target/${debug.release}/static/lib${libesmtp.lib.name}${lib-suffix}.a"/>
+ <available file="${libesmtp.dir}/target/${debug.release}/static/lib${libesmtp.lib.name}${lib-suffix}.la"/>
+ <available file="${libesmtp.dir}/target/${debug.release}/static/${libesmtp.lib.name}${lib-suffix}.lib"/>
+ </or>
+ </condition>
+ <condition property="libesmtp.lib.dir" value="${libesmtp.dir}/target/${debug.release}/shared">
+ <or>
+ <available file="${libesmtp.dir}/target/${debug.release}/shared/lib${libesmtp.lib.name}${lib-suffix}.a"/>
+ <available file="${libesmtp.dir}/target/${debug.release}/shared/lib${libesmtp.lib.name}${lib-suffix}.la"/>
+ <available file="${libesmtp.dir}/target/${debug.release}/shared/${libesmtp.lib.name}${lib-suffix}.lib"/>
+ </or>
+ </condition>
+
+
+ <condition property="libesmtp-available" value="1">
+ <or>
+ <equals arg1="${libesmtp.dir}" arg2="/usr"/>
+ <isset property="libesmtp.lib.dir"/>
+ </or>
+ </condition>
+
+ <condition property="libesmtp.src.dir" value="${libesmtp-util}">
+ <available file="${relative-libesmtp}/smtpauth.c"/>
+ </condition>
+</target>
+
</project>
Modified: logging/log4cxx/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/pom.xml?rev=616632&r1=616631&r2=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/pom.xml (original)
+++ logging/log4cxx/trunk/pom.xml Tue Jan 29 21:32:03 2008
@@ -36,7 +36,8 @@
<post>log4cxx-user@logging.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/logging-log4cxx-user/</archive>
<otherArchives>
- <otherArchive>http://marc.info/?l=log4cxx-user</otherArchive>
+ <otherArchive>http://markmail.org/search/list:org.apache.logging.log4cxx-user</otherArchive>
+ <otherArchive>http://marc.info/?l=log4cxx-user</otherArchive>
<otherArchive>http://dir.gmane.org/gmane.comp.apache.logging.log4cxx.user</otherArchive>
</otherArchives>
</mailingList>
@@ -47,6 +48,7 @@
<post>log4cxx-dev@logging.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/logging-log4cxx-dev/</archive>
<otherArchives>
+ <otherArchive>http://markmail.org/search/list:org.apache.logging.log4cxx-dev</otherArchive>
<otherArchive>http://marc.info/?l=log4cxx-dev</otherArchive>
<otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive>
</otherArchives>
@@ -173,7 +175,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/source.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
@@ -185,6 +187,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: logging/log4cxx/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/Makefile.am?rev=616632&r1=616631&r2=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/Makefile.am (original)
+++ logging/log4cxx/trunk/src/Makefile.am Tue Jan 29 21:32:03 2008
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-SUBDIRS = main test examples performance site
+SUBDIRS = examples main performance site test
Copied: logging/log4cxx/trunk/src/ant/apr-build.xml (from r616425, logging/log4cxx/trunk/src/apr/ant/build.xml)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-build.xml?p2=logging/log4cxx/trunk/src/ant/apr-build.xml&p1=logging/log4cxx/trunk/src/apr/ant/build.xml&r1=616425&r2=616632&rev=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/apr/ant/build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-build.xml Tue Jan 29 21:32:03 2008
@@ -16,7 +16,9 @@
limitations under the License.
-->
-
+<!DOCTYPE project [
+<!ENTITY common SYSTEM 'common.xml'>
+]>
<!--
This file builds APR using Apache Ant (http://ant.apache.org)
@@ -26,148 +28,68 @@
-->
<project name="apr" default="check">
-<property name="debug" value="true"/>
-<property name="version" value="1.2.2"/>
-<property name="apr.dir" location="."/>
-<property name="apr.include.dir" location="${apr.dir}/include"/>
-<property name="build.dir" location="${apr.dir}/build"/>
-<property name="src.dir" location="${apr.dir}"/>
-<property name="test.dir" location="${apr.dir}/test"/>
-<property name="apr.lib.type" value="shared"/>
-<property name="project.dir" location="${build.dir}"/>
+&common;
-<taskdef resource="cpptasks.tasks"/>
-<typedef resource="cpptasks.types"/>
+<property name="src.dir" location="${basedir}"/>
+<property name="include.dir" location="${src.dir}/include"/>
+<property name="test.dir" location="${src.dir}/test"/>
+<property name="target.dir" location="${basedir}/target"/>
+<property name="lib.type" value="shared"/>
+<property name="projects.dir" location="${target.dir}"/>
<target name="usage" description="Displays usage notes on build">
<echo>
</echo>
</target>
-<target name="os-detect">
- <condition property="is-mac" value="true">
- <and>
- <os family="mac"/>
- <not><isset property="is-windows"/></not>
- </and>
- </condition>
- <condition property="is-unix" value="true">
- <and>
- <not>
- <or>
- <isset property="is-windows"/>
- <equals arg1="${os.family}" arg2="windows"/>
- </or>
- </not>
- <or>
- <os family="unix"/>
- <equals arg1="${os.family}" arg2="cygwin"/>
- <equals arg1="${os.family}" arg2="unix"/>
- </or>
- </and>
- </condition>
- <condition property="is-windows" value="true">
- <and>
- <not><isset property="is-unix"/></not>
- <or>
- <os family="windows"/>
- <equals arg1="${os.family}" arg2="windows"/>
- </or>
- </and>
- </condition>
-</target>
-
-
-<target name="win-init" depends="os-detect" if="is-windows">
- <property name="compiler" value="msvc"/>
- <property name="arch" value="win32"/>
- <property name="project.type" value="msvc6"/>
-</target>
-
-<target name="unix-init" depends="os-detect" if="is-unix">
- <property name="compiler" value="gcc"/>
- <condition property="is-gcc" value="true">
- <or>
- <equals arg1="${compiler}" arg2="gcc"/>
- <equals arg1="${compiler}" arg2="g++"/>
- </or>
- </condition>
- <property name="arch" value="unix"/>
- <property name="project.type" value="cbuilderx"/>
-</target>
-
-<target name="init" depends="win-init, unix-init">
- <property environment="env"/>
- <condition property="pic-option" value="-fPIC">
- <and>
- <isset property="is-gcc"/>
- <istrue value="${use-pic}"/>
- </and>
- </condition>
-
- <condition property="is-debug" value="true">
- <istrue value="${debug}"/>
- </condition>
-
- <condition property="apr.lib.dir" value="${build.dir}/debug/${apr.lib.type}">
- <isset property="is-debug"/>
- </condition>
- <property name="apr.lib.dir" location="${build.dir}/release/${apr.lib.type}"/>
- <mkdir dir="${apr.lib.dir}"/>
-
- <condition property="lib-suffix" value="d">
- <isset property="is-debug"/>
- </condition>
- <property name="lib-suffix" value=""/>
-
- <condition property="is-apr-shared" value="true">
- <equals arg1="${apr.lib.type}" arg2="shared"/>
- </condition>
-
- <condition property="is-bcc" value="true">
- <equals arg1="${compiler}" arg2="bcc"/>
- </condition>
- <condition property="project.if" value="true">
- <istrue value="${project.if.value}"/>
- </condition>
-</target>
-
<target name="clean" description="Removes build product files">
- <delete dir="${build.dir}"/>
+ <delete dir="${target.dir}"/>
</target>
-
-<target name="configure-check" depends="init">
- <condition property="apr-configure-available" value="true">
- <available file="${apr.include.dir}/apr.h"/>
- </condition>
+<target name="win-configure" if="is-windows">
+ <antcall target="copy-if-changed">
+ <param name="file" value="${include.dir}/apr.hw"/>
+ <param name="tofile" value="${include.dir}/apr.h"/>
+ </antcall>
</target>
-
-<target name="win-configure" depends="configure-check" if="is-windows" unless="apr-configure-available">
- <copy tofile="${apr.include.dir}/apr.h" file="${apr.include.dir}/apr.hw"/>
+<target name="check-configure" if="is-unix">
+ <condition property="force-configure" value="1">
+ <not><available file="${include.dir}/apr.h"/></not>
+ </condition>
</target>
-<target name="unix-configure" depends="configure-check" if="is-unix" unless="apr-configure-available">
+<target name="unix-configure" depends="check-configure" if="force-configure">
<!-- shelling to configure allows cygwin to work -->
- <exec executable="sh" dir="${apr.dir}">
+ <exec executable="sh" dir="${src.dir}">
<arg value="./configure"/>
</exec>
</target>
-<target name="configure" depends="unix-configure, win-configure"/>
+<target name="init" depends="common-init">
+ <condition property="arch" value="unix">
+ <isset property="is-unix"/>
+ </condition>
+ <condition property="arch" value="win32">
+ <isset property="is-windows"/>
+ </condition>
+
+</target>
+
+<target name="configure" depends="init, unix-configure, win-configure"/>
+
<target name="build" depends="configure" description="Build library">
- <mkdir dir="${apr.lib.dir}/apr_obj"/>
+ <mkdir dir="${executable.dir}/apr-ofiles"/>
<property name="project.compiler" value="${compiler}"/>
<cc name="${project.compiler}"
- outfile="${apr.lib.dir}/apr-1${lib-suffix}"
+ outfile="${executable.dir}/apr-1${lib-suffix}"
subsystem="console"
multithreaded="true"
- outtype="${apr.lib.type}"
- objdir="${apr.lib.dir}/apr_obj"
+ outtype="${lib.type}"
+ objdir="${executable.dir}/apr-ofiles"
outputfileproperty="apr-1.dll"
debug="${debug}"
projectsOnly="${projectsOnly}">
@@ -185,17 +107,17 @@
<fileset dir="${src.dir}/random/unix" includes="*.c"/>
<fileset dir="${src.dir}/strings" includes="*.c"/>
<fileset dir="${src.dir}/tables" includes="*.c"/>
- <fileset dir="${apr.include.dir}" includes="*.h"/>
- <fileset dir="${apr.include.dir}/arch" includes="*.h"/>
- <fileset dir="${apr.include.dir}/arch/${arch}" includes="*.h"/>
- <fileset dir="${apr.include.dir}/arch/unix" includes="*.h"/>
+ <fileset dir="${include.dir}" includes="*.h"/>
+ <fileset dir="${include.dir}/arch" includes="*.h"/>
+ <fileset dir="${include.dir}/arch/${arch}" includes="*.h"/>
+ <fileset dir="${include.dir}/arch/unix" includes="*.h"/>
<fileset dir="${src.dir}/support/unix" includes="waitio.c"/>
- <includepath path="${apr.include.dir}"/>
- <includepath path="${apr.include.dir}/arch"/>
- <includepath path="${apr.include.dir}/arch/${arch}"/>
- <includepath path="${apr.include.dir}/arch/unix"/>
- <defineset define="APR_DECLARE_EXPORT" if="is-apr-shared"/>
- <defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
+ <includepath path="${include.dir}"/>
+ <includepath path="${include.dir}/arch"/>
+ <includepath path="${include.dir}/arch/${arch}"/>
+ <includepath path="${include.dir}/arch/unix"/>
+ <defineset define="APR_DECLARE_EXPORT" if="is-shared"/>
+ <defineset define="APR_DECLARE_STATIC" unless="is-shared"/>
<defineset if="is-windows">
<define name="WIN32" value="1"/>
</defineset>
@@ -205,28 +127,29 @@
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
<libset libs="pthread dl" if="is-unix"/>
<libset libs="cw32mt" if="is-bcc"/>
- <project type="${project.type}" outfile="${project.dir}/apr" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/apr" if="project.if"/>
</cc>
+ <property name="apr.lib.dir" location="${executable.dir}"/>
</target>
<target name="build-test">
- <mkdir dir="${apr.lib.dir}/apr_obj"/>
+ <mkdir dir="${executable.dir}/apr-test-ofiles"/>
<property name="project.compiler" value="${compiler}"/>
<cc name="${project.compiler}"
- outfile="${apr.lib.dir}/${test}"
+ outfile="${executable.dir}/${test}"
subsystem="console"
multithreaded="true"
outtype="executable"
- objdir="${apr.lib.dir}/apr_obj"
+ objdir="${executable.dir}/apr-test-ofiles"
debug="${debug}"
projectsOnly="${projectsOnly}">
<fileset dir="${test.dir}" includes="${testfiles}"/>
- <includepath path="${apr.include.dir}"/>
+ <includepath path="${include.dir}"/>
<defineset if="is-windows">
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
- <defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
+ <defineset define="APR_DECLARE_STATIC" unless="is-shared"/>
<defineset define="HAVE_CONFIG_H DARWIN SIGPROCMASK_SETS_THREAD_MASK" if="is-mac"/>
<compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
@@ -344,45 +267,45 @@
<target name="build-mod_test" depends="build">
- <mkdir dir="${apr.lib.dir}/apr_obj"/>
- <mkdir dir="${apr.lib.dir}/.libs"/>
+ <mkdir dir="${executable.dir}/test-ofiles"/>
+ <mkdir dir="${executable.dir}/.libs"/>
<property name="project.compiler" value="${compiler}"/>
<cc name="${project.compiler}"
- outfile="${apr.lib.dir}/.libs/mod_test"
+ outfile="${executable.dir}/.libs/mod_test"
subsystem="console"
multithreaded="true"
outtype="shared"
- objdir="${apr.lib.dir}/apr_obj"
+ objdir="${executable.dir}/test-ofiles"
outputfileproperty="libmod_test.so"
debug="${debug}"
projectsOnly="${projectsOnly}">
<fileset dir="${test.dir}" includes="mod_test.c"/>
- <includepath path="${apr.include.dir}"/>
+ <includepath path="${include.dir}"/>
<defineset if="is-windows">
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
- <defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
+ <defineset define="APR_DECLARE_STATIC" unless="is-shared"/>
<defineset define="HAVE_CONFIG_H DARWIN SIGPROCMASK_SETS_THREAD_MASK" if="is-mac"/>
<compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
- <project type="${project.type}" outfile="${project.dir}/mod_test" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/mod_test" if="project.if"/>
</cc>
- <copy file="${libmod_test.so}" tofile="${apr.lib.dir}/.libs/mod_test.so"/>
+ <copy file="${libmod_test.so}" tofile="${executable.dir}/.libs/mod_test.so"/>
</target>
<target name="build-testall" depends="build">
- <mkdir dir="${apr.lib.dir}/apr_obj"/>
+ <mkdir dir="${executable.dir}/test-ofiles"/>
<property name="project.compiler" value="${compiler}"/>
<cc name="${project.compiler}"
- outfile="${apr.lib.dir}/testall"
+ outfile="${executable.dir}/testall"
subsystem="console"
multithreaded="true"
outtype="executable"
- objdir="${apr.lib.dir}/apr_obj"
+ objdir="${executable.dir}/test-ofiles"
debug="${debug}"
projectsOnly="${projectsOnly}">
<fileset dir="${test.dir}" includes="*.c">
@@ -403,34 +326,34 @@
<exclude name="testmutexscope.c"/>
<exclude name="testapp.c"/>
</fileset>
- <includepath path="${apr.include.dir}"/>
+ <includepath path="${include.dir}"/>
<defineset if="is-windows">
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
- <defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
+ <defineset define="APR_DECLARE_STATIC" unless="is-shared"/>
<defineset define="HAVE_CONFIG_H DARWIN SIGPROCMASK_SETS_THREAD_MASK" if="is-mac"/>
<compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="pthread dl" if="is-unix"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
- <project type="${project.type}" outfile="${project.dir}/testall" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/testall" if="project.if"/>
</cc>
</target>
<target name="run-testall" depends="build-testall, build-mod_test, build-tryread, build-readchild, build-globalmutexchild, build-occhild, build-proc_child, build-testshmconsumer, build-testshmproducer, build-sockchild">
- <mkdir dir="${apr.lib.dir}/data"/>
- <copy todir="${apr.lib.dir}/data">
+ <mkdir dir="${executable.dir}/data"/>
+ <copy todir="${executable.dir}/data">
<fileset dir="${test.dir}/data" includes="*"/>
</copy>
- <exec executable="${apr.lib.dir}/testall"
- dir="${apr.lib.dir}"
+ <exec executable="${executable.dir}/testall"
+ dir="${executable.dir}"
failonerror="true">
<env key="DYLD_LIBRARY_PATH"
- value="${apr.lib.dir}:${apr.lib.dir}/.libs:${env.DYLD_LIBRARY_PATH}"/>
+ value="${apr.lib.dir}:${executable.dir}/.libs:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
- value="${apr.lib.dir}:${apr.lib.dir}/.libs:${env.LD_LIBRARY_PATH}"/>
+ value="${apr.lib.dir}:${executable.dir}/.libs:${env.LD_LIBRARY_PATH}"/>
</exec>
</target>
@@ -451,26 +374,25 @@
</target>
<target name="build-projects">
- <mkdir dir="${project.dir}"/>
+ <mkdir dir="${projects.dir}"/>
<antcall target="build">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
- <param name="projects.dir" value="${project.dir}"/>
+ <param name="projects.dir" value="${projects.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
<antcall target="build-check">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
- <param name="projects.dir" value="${project.dir}"/>
+ <param name="projects.dir" value="${projects.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
</target>
<target name="build-projects-vc6" description="Builds project files for Microsoft Visual C++ 6">
<antcall target="build-projects">
- <param name="project.dir" value="msvc"/>
<param name="project.type" value="msvc6"/>
<param name="project.compiler" value="msvc"/>
</antcall>
@@ -478,7 +400,6 @@
<target name="build-projects-vc8" description="Builds project files for Microsoft Visual C++ 2005">
<antcall target="build-projects">
- <param name="project.dir" value="msvc"/>
<param name="project.type" value="msvc8"/>
<param name="project.compiler" value="msvc"/>
</antcall>
@@ -486,16 +407,7 @@
<target name="build-projects-xcode" description="Builds project files for Apple Xcode">
<antcall target="build-projects">
- <param name="project.dir" value="xcode"/>
<param name="project.type" value="xcode"/>
- <param name="project.compiler" value="${compiler}"/>
- </antcall>
-</target>
-
-<target name="build-projects-cbx" description="Builds project files for Borland CBuilderX">
- <antcall target="build-projects">
- <param name="project.dir" value="cbx"/>
- <param name="project.type" value="cbuilderx"/>
<param name="project.compiler" value="${compiler}"/>
</antcall>
</target>