carnold 2005/02/16 08:31:14
Modified: . apr-build.xml apriconv-build.xml aprutil-build.xml
Log:
LOGCXX-25: Refinement of APR build.xml's
Revision Changes Path
1.7 +110 -115 logging-log4cxx/apr-build.xml
Index: apr-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apr-build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr-build.xml 10 Feb 2005 19:36:03 -0000 1.6
+++ apr-build.xml 16 Feb 2005 16:31:14 -0000 1.7
@@ -31,7 +31,7 @@
<property name="base.dir" location="."/>
<property name="include.dir" location="${base.dir}/include"/>
<property name="apr.lib.type" value="shared"/>
-<property name="project.dir" value="${build.dir}"/>
+<property name="project.dir" value="${build.dir}"/>
<taskdef resource="cpptasks.tasks"/>
<typedef resource="cpptasks.types"/>
@@ -54,7 +54,7 @@
<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"/>
+ <property name="project.type" value="msvc6"/>
</target>
<target name="unix-init" depends="os-detect" if="is-unix">
@@ -66,10 +66,11 @@
</or>
</condition>
<property name="arch" value="unix"/>
- <property name="project.type" value="cbuilderx"/>
+ <property name="project.type" value="cbuilderx"/>
</target>
<target name="init" depends="win-init, unix-init">
+ <property environment="env"/>
<condition property="is-debug" value="true">
<istrue value="${debug}"/>
</condition>
@@ -91,10 +92,10 @@
<condition property="is-bcc" value="true">
<equals arg1="${compiler}" arg2="bcc"/>
- </condition>
- <condition property="project.if" value="true">
- <istrue value="${project.if.value}"/>
- </condition>
+ </condition>
+ <condition property="project.if" value="true">
+ <istrue value="${project.if.value}"/>
+ </condition>
</target>
<target name="clean" description="Removes build product files">
@@ -130,6 +131,7 @@
multithreaded="true"
outtype="${apr.lib.type}"
objdir="${apr.lib.dir}/apr_obj"
+ outputfileproperty="apr-1.dll"
debug="${debug}">
<fileset dir="${base.dir}" includes="**/${arch}/*.c"
excludes="**/apr_app.c"/>
<fileset dir="${base.dir}/file_io/unix" includes="copy.c fileacc.c
filepath_util.c fullrw.c mktemp.c tempdir.c"/>
@@ -140,11 +142,11 @@
<fileset dir="${base.dir}/poll/unix" includes="select.c"/>
<fileset dir="${base.dir}/random/unix" includes="*.c"/>
<fileset dir="${base.dir}/strings" includes="*.c"/>
- <fileset dir="${base.dir}/tables" includes="*.c"/>
+ <fileset dir="${base.dir}/tables" includes="*.c"/>
<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="${include.dir}/arch" includes="*.h"/>
+ <fileset dir="${include.dir}/arch/${arch}" includes="*.h"/>
+ <fileset dir="${include.dir}/arch/unix" includes="*.h"/>
<includepath path="${include.dir}"/>
<includepath path="${include.dir}/arch"/>
<includepath path="${include.dir}/arch/${arch}"/>
@@ -156,7 +158,8 @@
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
- <libset libs="cw32mt" if="is-bcc"/>
+ <libset libs="pthread dl" if="is-unix"/>
+ <libset libs="cw32mt" if="is-bcc"/>
<project type="${project.type}" outfile="${project.dir}/apr"
if="project.if"/>
</cc>
</target>
@@ -175,9 +178,11 @@
<defineset if="is-windows">
<define name="WIN32" value="1"/>
</defineset>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
- <project type="${project.type}" outfile="${project.dir}/${test}"
if="project.if"/>
+ <libset libs="pthread dl" if="is-unix"/>
+ <project type="${project.type}" outfile="${project.dir}/${test}"
if="project.if"/>
</cc>
</target>
@@ -213,12 +218,6 @@
</antcall>
</target>
-<target name="run-testshmproducer" depends="build-testshmproducer">
- <antcall target="run-test">
- <param name="test" value="testshmproducer"/>
- </antcall>
-</target>
-
<target name="build-testshmconsumer" depends="build">
<antcall target="build-test">
<param name="test" value="testshmconsumer"/>
@@ -226,11 +225,6 @@
</antcall>
</target>
-<target name="run-testshmconsumer" depends="build-testshmconsumer">
- <antcall target="run-test">
- <param name="test" value="testshmconsumer"/>
- </antcall>
-</target>
<target name="build-testmutexscope" depends="build">
<antcall target="build-test">
@@ -252,24 +246,13 @@
</antcall>
</target>
-<target name="run-occhild" depends="build-occhild">
- <antcall target="run-test">
- <param name="test" value="occhild"/>
- </antcall>
-</target>
-
-<target name="build-mockchild" depends="build">
+<target name="build-sockchild" depends="build">
<antcall target="build-test">
- <param name="test" value="mockchild"/>
- <param name="testfiles" value="mockchild.c"/>
+ <param name="test" value="sockchild"/>
+ <param name="testfiles" value="sockchild.c"/>
</antcall>
</target>
-<target name="run-mockchild" depends="build-mockchild">
- <antcall target="run-test">
- <param name="test" value="mockchild"/>
- </antcall>
-</target>
<target name="build-readchild" depends="build">
<antcall target="build-test">
@@ -278,11 +261,6 @@
</antcall>
</target>
-<target name="run-readchild" depends="build-readchild">
- <antcall target="run-test">
- <param name="test" value="readchild"/>
- </antcall>
-</target>
<target name="build-globalmutexchild" depends="build">
<antcall target="build-test">
@@ -291,12 +269,6 @@
</antcall>
</target>
-<target name="run-globalmuxtexchild" depends="build-globalmutexchild">
- <antcall target="run-test">
- <param name="test" value="globalmutexchild"/>
- </antcall>
-</target>
-
<target name="build-tryread" depends="build">
<antcall target="build-test">
<param name="test" value="tryread"/>
@@ -304,24 +276,13 @@
</antcall>
</target>
-<target name="run-tryread" depends="build-tryread">
- <antcall target="run-test">
- <param name="test" value="tryread"/>
- </antcall>
-</target>
-
-<target name="build-procchild" depends="build">
+<target name="build-proc_child" depends="build">
<antcall target="build-test">
- <param name="test" value="procchild"/>
- <param name="testfiles" value="procchild.c"/>
+ <param name="test" value="proc_child"/>
+ <param name="testfiles" value="proc_child.c"/>
</antcall>
</target>
-<target name="run-procchild" depends="build-procchild">
- <antcall target="run-test">
- <param name="test" value="procchild"/>
- </antcall>
-</target>
<target name="build-sendfile" depends="build">
<antcall target="build-test">
@@ -330,6 +291,32 @@
</antcall>
</target>
+
+<target name="build-mod_test" depends="build">
+ <mkdir dir="${apr.lib.dir}/apr_obj"/>
+ <mkdir dir="${apr.lib.dir}/.libs"/>
+ <cc name="${compiler}"
+ outfile="${apr.lib.dir}/.libs/mod_test"
+ subsystem="console"
+ multithreaded="true"
+ outtype="shared"
+ objdir="${apr.lib.dir}/apr_obj"
+ outputfileproperty="libmod_test.so"
+ debug="${debug}">
+ <fileset dir="${base.dir}/test" includes="mod_test.c"/>
+ <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"/>
+ <libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
+ <libset libs="cw32mt" if="is-bcc"/>
+ <project type="${project.type}" outfile="${project.dir}/mod_test"
if="project.if"/>
+ </cc>
+ <copy file="${libmod_test.so}"
tofile="${apr.lib.dir}/.libs/mod_test.so"/>
+</target>
+
+
<target name="build-testall" depends="build">
<mkdir dir="${apr.lib.dir}/apr_obj"/>
<cc name="${compiler}"
@@ -359,74 +346,82 @@
<defineset if="is-windows">
<define name="WIN32" value="1"/>
</defineset>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
- <project type="${project.type}" outfile="${project.dir}/testall"
if="project.if"/>
+ <libset libs="pthread dl" if="is-unix"/>
+ <project type="${project.type}" outfile="${project.dir}/testall"
if="project.if"/>
</cc>
</target>
-<target name="run-testall" depends="build-testall">
- <antcall target="run-test">
- <param name="test" value="testall"/>
- </antcall>
+<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">
+ <fileset dir="${base.dir}/test/data" includes="*"/>
+ </copy>
+ <exec executable="${apr.lib.dir}/testall"
+ dir="${apr.lib.dir}"
+ failonerror="true">
+ <env key="DYLD_LIBRARY_PATH"
+
value="${apr.lib.dir}:${apr.lib.dir}/.libs:${env.DYLD_LIBRARY_PATH}"/>
+ <env key="LD_LIBRARY_PATH"
+
value="${apr.lib.dir}:${apr.lib.dir}/.libs:${env.LD_LIBRARY_PATH}"/>
+ </exec>
</target>
-<target name="build-check"
- depends="build-testlockperf,
+<target name="build-check"
+ depends="build-testlockperf,
build-testshmproducer,
build-testshmconsumer,
build-testmutexscope,
- build-testall"
+ build-testall"
description="Builds all test applications"/>
-<target name="check"
- depends="run-testlockperf,
- run-testshmproducer,
- run-testshmconsumer,
- run-testmutexscope,
- run-testall"
+<target name="check"
+ depends="run-testlockperf,
+ run-testall"
description="Runs all test applications">
</target>
-
-<target name="build-projects">
- <mkdir dir="${project.dir}"/>
- <antcall target="build">
- <param name="project.if" value="true"/>
- <param name="project.type" value="${project.type}"/>
- <param name="projects.dir" value="${project.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="projects.dir" value="${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"/>
- </antcall>
-</target>
-
-<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"/>
- </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"/>
- </antcall>
-</target>
-
+
+<target name="build-projects">
+ <mkdir dir="${project.dir}"/>
+ <antcall target="build">
+ <param name="project.if" value="true"/>
+ <param name="project.type" value="${project.type}"/>
+ <param name="projects.dir" value="${project.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="projects.dir" value="${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"/>
+ </antcall>
+</target>
+
+<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"/>
+ </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"/>
+ </antcall>
+</target>
+
</project>
1.6 +48 -48 logging-log4cxx/apriconv-build.xml
Index: apriconv-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apriconv-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apriconv-build.xml 10 Feb 2005 19:36:03 -0000 1.5
+++ apriconv-build.xml 16 Feb 2005 16:31:14 -0000 1.6
@@ -26,7 +26,7 @@
<project name="apriconv" default="check">
<property name="debug" value="true"/>
-<property name="build.dir" location="build"/>
+<property name="build.dir" location="build"/>
<property name="project.dir" value="${build.dir}"/>
<property name="version" value="1.0.1"/>
<property name="base.dir" location="."/>
@@ -62,7 +62,7 @@
<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"/>
+ <property name="project.type" value="msvc6"/>
</target>
<target name="unix-init" depends="os-detect" if="is-unix">
@@ -73,7 +73,7 @@
<equals arg1="${compiler}" arg2="g++"/>
</or>
</condition>
- <property name="arch" value="unix"/>
+ <property name="arch" value="unix"/>
<property name="project.type" value="cbuilderx"/>
</target>
@@ -81,10 +81,10 @@
<condition property="is-debug" value="true">
<istrue value="${debug}"/>
</condition>
- <condition property="apriconv.lib.dir"
value="${build.dir}/debug/${aprutil.lib.type}">
+ <condition property="apriconv.lib.dir"
value="${build.dir}/debug/${apriconv.lib.type}">
<isset property="is-debug"/>
</condition>
- <property name="apriconv.lib.dir"
location="${build.dir}/release/${aprutil.lib.type}"/>
+ <property name="apriconv.lib.dir"
location="${build.dir}/release/${apriconv.lib.type}"/>
<mkdir dir="${apriconv.lib.dir}"/>
<condition property="lib-suffix" value="d">
<isset property="is-debug"/>
@@ -100,10 +100,10 @@
<condition property="is-apriconv-shared" value="true">
<equals arg1="${apriconv.lib.type}" arg2="shared"/>
- </condition>
- <condition property="project.if" value="true">
- <istrue value="${project.if.value}"/>
- </condition>
+ </condition>
+ <condition property="project.if" value="true">
+ <istrue value="${project.if.value}"/>
+ </condition>
</target>
@@ -124,7 +124,7 @@
<target name="win-configure" depends="configure-check" if="is-windows"
unless="config-available">
- <copy tofile="${base.dir}/lib/apr_iconv_private.h"
+ <copy tofile="${base.dir}/lib/apr_iconv_private.h"
file="${base.dir}/lib/apr_iconv_private.h.in"
failonerror="false"/>
</target>
@@ -151,8 +151,8 @@
objdir="${apriconv.lib.dir}/apriconv_obj"
debug="${debug}">
<fileset dir="${base.dir}" includes="lib/*.c lib/*.h"/>
- <fileset dir="${include.dir}" includes="*.h"/>
- <includepath path="${base.dir}/lib"/>
+ <fileset dir="${include.dir}" includes="*.h"/>
+ <includepath path="${base.dir}/lib"/>
<includepath path="${include.dir}"/>
<includepath path="${base.dir}/lib"/>
<includepath path="${apr.include.dir}"/>
@@ -161,7 +161,7 @@
<defineset define="API_DECLARE_STATIC" unless="is-apriconv-shared"/>
<defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
<defineset define="WIN32" if="is-windows"/>
- <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
<project type="${project.type}" outfile="${project.dir}/apriconv"
if="project.if"/>
</cc>
</target>
@@ -188,7 +188,7 @@
<libset libs="apr-1${lib-suffix}" dir="${apr.lib.dir}"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
<libset libs="cw32mt" if="is-bcc"/>
- <project type="${project.type}" outfile="${project.dir}/${module}"
if="project.if"/>
+ <project type="${project.type}" outfile="${project.dir}/${module}"
if="project.if"/>
</cc>
</target>
@@ -232,7 +232,7 @@
<foreach target="build-module" param="module.src">
<path>
- <fileset dir="${base.dir}/ccs"
+ <fileset dir="${base.dir}/ccs"
includes="*.c"
excludes="c*.c i*.c w*.c"/>
</path>
@@ -249,38 +249,38 @@
<target name="build-check" depends="build-lib" description="Builds all
tests"/>
<target name="check" depends="build-check" description="Runs all tests"/>
-
-
-<target name="build-projects">
- <mkdir dir="${project.dir}"/>
- <antcall target="build">
- <param name="project.if" value="true"/>
- <param name="project.type" value="${project.type}"/>
- <param name="projects.dir" value="${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"/>
- </antcall>
-</target>
-
-<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"/>
- </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"/>
- </antcall>
-</target>
-
+
+
+<target name="build-projects">
+ <mkdir dir="${project.dir}"/>
+ <antcall target="build">
+ <param name="project.if" value="true"/>
+ <param name="project.type" value="${project.type}"/>
+ <param name="projects.dir" value="${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"/>
+ </antcall>
+</target>
+
+<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"/>
+ </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"/>
+ </antcall>
+</target>
+
</project>
1.7 +59 -53 logging-log4cxx/aprutil-build.xml
Index: aprutil-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/aprutil-build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aprutil-build.xml 13 Feb 2005 05:55:00 -0000 1.6
+++ aprutil-build.xml 16 Feb 2005 16:31:14 -0000 1.7
@@ -78,6 +78,7 @@
</target>
<target name="init" depends="win-init, unix-init">
+ <property environment="env"/>
<condition property="is-debug" value="true">
<istrue value="${debug}"/>
</condition>
@@ -107,9 +108,9 @@
<condition property="is-bcc" value="true">
<equals arg1="${compiler}" arg2="bcc"/>
</condition>
- <condition property="project.if" value="true">
- <istrue value="${project.if.value}"/>
- </condition>
+ <condition property="project.if" value="true">
+ <istrue value="${project.if.value}"/>
+ </condition>
</target>
@@ -136,6 +137,7 @@
<copy tofile="${include.dir}/apu.h" file="${include.dir}/apu.hw"/>
<copy tofile="${include.dir}/apu_want.h"
file="${include.dir}/apu_want.hw"/>
<copy tofile="${include.dir}/apr_ldap.h"
file="${include.dir}/apr_ldap.hw"/>
+ <replaceregex file="${include.dir}/apr_ldap.h" match="#define
APR_HAS_LDAP.*" value="#define APR_HAS_LDAP 0"/>
<copy tofile="${include.dir}/private/apu_config.h"
file="${include.dir}/private/apu_config.hw"/>
<copy tofile="${include.dir}/private/apu_select_dbm.h"
file="${include.dir}/private/apu_select_dbm.hw"/>
<copy tofile="${base.dir}/xml/expat/lib/expat.h"
file="${base.dir}/xml/expat/lib/expat.h.in"/>
@@ -169,17 +171,17 @@
subsystem="console"
multithreaded="true"
outtype="${aprutil.lib.type}"
- objdir="${aprutil.lib.dir}/aprutil_obj"
+ objdir="${aprutil.lib.dir}/aprutil_obj"
warnings="none"
debug="${debug}">
<fileset dir="${base.dir}" includes="**/*.c"
excludes="test/*.c ldap/*.c xml/expat/lib/*"/>
<fileset dir="${base.dir}/xml/expat/lib"
- includes="xmlparse.c xmlrole.c xmltok.c"/>
+ includes="xmlparse.c xmlrole.c xmltok.c"/>
<fileset dir="${include.dir}" includes="*.h"/>
- <fileset dir="${include.dir}/private" includes="*.h"/>
- <fileset dir="${base.dir}/xml/expat/lib" includes="*.h"/>
- <fileset dir="${base.dir}/xml/expat" includes="*.h"/>
+ <fileset dir="${include.dir}/private" includes="*.h"/>
+ <fileset dir="${base.dir}/xml/expat/lib" includes="*.h"/>
+ <fileset dir="${base.dir}/xml/expat" includes="*.h"/>
<includepath path="${include.dir}"/>
<includepath path="${include.dir}/private"/>
<includepath path="${apr.include.dir}"/>
@@ -195,9 +197,10 @@
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset dir="${apriconv.lib.dir}" libs="apriconv${lib-suffix}"/>
- <libset libs="cw32mt" if="is-bcc"/>
- <defineset if="is-bcc">
- <define name="EILSEQ" value="50"/>
+ <libset libs="cw32mt" if="is-bcc"/>
+ <libset libs="pthread dl crypt" if="is-unix"/>
+ <defineset if="is-bcc">
+ <define name="EILSEQ" value="50"/>
</defineset>
</cc>
</target>
@@ -215,14 +218,16 @@
<includepath path="${include.dir}"/>
<includepath path="${apr.include.dir}"/>
<defineset define="APU_DECLARE_STATIC" unless="is-aprutil-shared"/>
- <defineset define="API_DECLARE_STATIC" if="is-apriconv-shared"/>
- <defineset define="APR_DECLARE_STATIC" if="is-apr-shared"/>
+ <defineset define="API_DECLARE_STATIC" unless="is-apriconv-shared"/>
+ <defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
<defineset if="is-windows">
<define name="WIN32" value="1"/>
</defineset>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset dir="${aprutil.lib.dir}" libs="aprutil-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
+ <libset libs="pthread dl crypt" if="is-unix"/>
</cc>
</target>
@@ -372,18 +377,19 @@
<exclude name="testreslist.c"/>
<exclude name="testqueue.c"/>
<exclude name="testxlate.c"/>
- <exclude name="testldap.c"/>
</fileset>
<includepath path="${include.dir}"/>
<includepath path="${apr.include.dir}"/>
<defineset define="APU_DECLARE_STATIC" unless="is-aprutil-shared"/>
- <defineset define="API_DECLARE_STATIC" if="is-apriconv-shared"/>
- <defineset define="APR_DECLARE_STATIC" if="is-apr-shared"/>
+ <defineset define="API_DECLARE_STATIC" unless="is-apriconv-shared"/>
+ <defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
<defineset if="is-windows">
<define name="WIN32" value="1"/>
</defineset>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset dir="${aprutil.lib.dir}" libs="aprutil-1${lib-suffix}"/>
+ <libset libs="pthread dl crypt" if="is-unix"/>
<libset libs="cw32mt" if="is-bcc"/>
</cc>
</target>
@@ -396,7 +402,7 @@
-<target name="build-check"
+<target name="build-check"
depends="build-testdbm,
build-testdbd,
build-testdate,
@@ -405,10 +411,10 @@
build-testreslist,
build-testqueue,
build-testxlate,
- build-testall"
+ build-testall"
description="Builds all tests"/>
-<target name="check"
+<target name="check"
depends="build-testdbm,
build-testdbd,
run-testdate,
@@ -417,41 +423,41 @@
run-testreslist,
run-testqueue,
run-testxlate,
- run-testall"
+ run-testall"
description="Runs all tests"/>
-
-
- <target name="build-projects">
- <mkdir dir="${project.dir}"/>
- <antcall target="build">
- <param name="project.if" value="true"/>
- <param name="project.type" value="${project.type}"/>
- <param name="projects.dir" value="${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"/>
- </antcall>
- </target>
-
- <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"/>
- </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"/>
- </antcall>
- </target>
-
+
+
+ <target name="build-projects">
+ <mkdir dir="${project.dir}"/>
+ <antcall target="build">
+ <param name="project.if" value="true"/>
+ <param name="project.type" value="${project.type}"/>
+ <param name="projects.dir" value="${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"/>
+ </antcall>
+ </target>
+
+ <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"/>
+ </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"/>
+ </antcall>
+ </target>
+
</project>
