carnold 2005/02/09 14:52:01
Modified: . apr-build.xml apriconv-build.xml aprutil-build.xml
build.xml
Log:
Updated APR build scripts
Revision Changes Path
1.5 +379 -168 logging-log4cxx/apr-build.xml
Index: apr-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apr-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apr-build.xml 6 Feb 2005 05:21:22 -0000 1.4
+++ apr-build.xml 9 Feb 2005 22:52:00 -0000 1.5
@@ -1,168 +1,379 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2004-2005 The Apache Software Foundation.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-<!--
-
-This file builds APR using Apache Ant (http://ant.apache.org)
-and the C++ compilation tasks from http://ant-contrib.sourceforge.net.
-
-
--->
-<project name="apr" default="check">
-
-<property name="debug" value="true"/>
-<property name="build.dir" location="build"/>
-<property name="version" value="1.1.0"/>
-<property name="base.dir" location="."/>
-<property name="include.dir" location="${base.dir}/include"/>
-<property name="lib.type" value="shared"/>
-
-<taskdef resource="cpptasks.tasks"/>
-<typedef resource="cpptasks.types"/>
-
-<target name="usage">
- <echo>
- </echo>
-</target>
-
-<target name="os-detect">
- <condition property="is-unix" value="true">
- <os family="unix"/>
- </condition>
- <condition property="is-windows" value="true">
- <os family="windows"/>
- </condition>
-</target>
-
-
-<target name="win-init" depends="os-detect" if="is-windows">
- <property name="compiler" value="msvc"/>
- <property name="arch" value="win32"/>
-</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"/>
-</target>
-
-<target name="init" depends="win-init, unix-init">
- <condition property="is-debug" value="true">
- <istrue value="${debug}"/>
- </condition>
- <condition property="executable.dir" value="${build.dir}/debug">
- <isset property="is-debug"/>
- </condition>
- <property name="executable.dir" location="${build.dir}/release"/>
- <mkdir dir="${executable.dir}"/>
- <condition property="lib-suffix" value="d">
- <isset property="is-debug"/>
- </condition>
- <property name="lib-suffix" value=""/>
-
- <condition property="is-shared" value="true">
- <equals arg1="${lib.type}" arg2="shared"/>
- </condition>
-</target>
-
-<target name="clean">
- <delete dir="${build.dir}"/>
-</target>
-
-
-<target name="configure-check" depends="init">
- <condition property="configure-available" value="true">
- <available file="${include.dir}/apr.h"/>
- </condition>
-</target>
-
-
-<target name="win-configure" depends="configure-check" if="is-windows"
unless="configure-available">
- <copy tofile="${include.dir}/apr.h" file="${include.dir}/apr.hw"/>
-</target>
-
-<target name="unix-configure" depends="configure-check" if="is-unix"
unless="configure-available">
- <echo>base.dir = ${base.dir}</echo>
- <exec executable="${base.dir}/configure" dir="${base.dir}"/>
-</target>
-
-
-<target name="configure" depends="unix-configure, win-configure"/>
-
-
-<target name="build" depends="configure" description="Build library">
- <mkdir dir="${executable.dir}/${lib.type}/apr_obj"/>
- <cc name="${compiler}"
- outfile="${executable.dir}/${lib.type}/apr-1${lib-suffix}"
- subsystem="console"
- multithreaded="true"
- outtype="${lib.type}"
- objdir="${executable.dir}/${lib.type}/apr_obj"
- 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"/>
- <fileset dir="${base.dir}/memory/unix" includes="*.c"/>
- <fileset dir="${base.dir}/misc/unix" includes="errorcodes.c getopt.c
otherchild.c version.c"/>
- <fileset dir="${base.dir}/mmap/unix" includes="common.c"/>
- <fileset dir="${base.dir}/network_io/unix" includes="inet_ntop.c
inet_pton.c sockaddr.c"/>
- <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"/>
- <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 define="WIN32" if="is-windows"/>
- <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
- <libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
- </cc>
-</target>
-
-<target name="build-check" depends="init">
- <mkdir dir="${executable.dir}/${lib.type}/apr_obj"/>
- <cc name="${compiler}"
- outfile="${executable.dir}/${lib.type}/aprtest"
- subsystem="console"
- multithreaded="true"
- outtype="executable"
- objdir="${executable.dir}/${lib.type}/apr_obj"
- debug="${debug}">
- <fileset dir="${base.dir}/test" includes="**/*.c">
- <exclude name="nw_misc.c"/>
- <exclude name="internal/testregex.c"/>
- </fileset>
- <includepath path="${include.dir}"/>
- <defineset define="WIN32" if="is-windows"/>
- <libset dir="${executable.dir}/${lib.type}"
libs="apr-1${lib-suffix}"/>
- </cc>
-</target>
-
-
-<target name="check" depends="build-check">
-</target>
-
-
-</project>
+<?xml version="1.0"?>
+<!--
+ Copyright 2004-2005 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<!--
+
+This file builds APR using Apache Ant (http://ant.apache.org)
+and the C++ compilation tasks from http://ant-contrib.sourceforge.net.
+
+
+-->
+<project name="apr" default="check">
+
+<property name="debug" value="true"/>
+<property name="build.dir" location="build"/>
+<property name="version" value="1.1.0"/>
+<property name="base.dir" location="."/>
+<property name="include.dir" location="${base.dir}/include"/>
+<property name="apr.lib.type" value="shared"/>
+
+<taskdef resource="cpptasks.tasks"/>
+<typedef resource="cpptasks.types"/>
+
+<target name="usage">
+ <echo>
+ </echo>
+</target>
+
+<target name="os-detect">
+ <condition property="is-unix" value="true">
+ <os family="unix"/>
+ </condition>
+ <condition property="is-windows" value="true">
+ <os family="windows"/>
+ </condition>
+</target>
+
+
+<target name="win-init" depends="os-detect" if="is-windows">
+ <property name="compiler" value="msvc"/>
+ <property name="arch" value="win32"/>
+</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"/>
+</target>
+
+<target name="init" depends="win-init, unix-init">
+ <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>
+</target>
+
+<target name="clean">
+ <delete dir="${build.dir}"/>
+</target>
+
+
+<target name="configure-check" depends="init">
+ <condition property="configure-available" value="true">
+ <available file="${include.dir}/apr.h"/>
+ </condition>
+</target>
+
+
+<target name="win-configure" depends="configure-check" if="is-windows"
unless="configure-available">
+ <copy tofile="${include.dir}/apr.h" file="${include.dir}/apr.hw"/>
+</target>
+
+<target name="unix-configure" depends="configure-check" if="is-unix"
unless="configure-available">
+ <echo>base.dir = ${base.dir}</echo>
+ <exec executable="${base.dir}/configure" dir="${base.dir}"/>
+</target>
+
+
+<target name="configure" depends="unix-configure, win-configure"/>
+
+
+<target name="build" depends="configure" description="Build library">
+ <mkdir dir="${apr.lib.dir}/apr_obj"/>
+ <cc name="${compiler}"
+ outfile="${apr.lib.dir}/apr-1${lib-suffix}"
+ subsystem="console"
+ multithreaded="true"
+ outtype="${apr.lib.type}"
+ objdir="${apr.lib.dir}/apr_obj"
+ 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"/>
+ <fileset dir="${base.dir}/memory/unix" includes="*.c"/>
+ <fileset dir="${base.dir}/misc/unix" includes="errorcodes.c getopt.c
otherchild.c version.c"/>
+ <fileset dir="${base.dir}/mmap/unix" includes="common.c"/>
+ <fileset dir="${base.dir}/network_io/unix" includes="inet_ntop.c
inet_pton.c sockaddr.c"/>
+ <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"/>
+ <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-apr-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 libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
+ <libset libs="cw32mt" if="is-bcc"/>
+ </cc>
+</target>
+
+<target name="build-test">
+ <mkdir dir="${apr.lib.dir}/apr_obj"/>
+ <cc name="${compiler}"
+ outfile="${apr.lib.dir}/${test}"
+ subsystem="console"
+ multithreaded="true"
+ outtype="executable"
+ objdir="${apr.lib.dir}/apr_obj"
+ debug="${debug}">
+ <fileset dir="${base.dir}/test" includes="${testfiles}"/>
+ <includepath path="${include.dir}"/>
+ <defineset if="is-windows">
+ <define name="WIN32" value="1"/>
+ </defineset>
+ <libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
+ <libset libs="cw32mt" if="is-bcc"/>
+ </cc>
+</target>
+
+<target name="run-test">
+ <exec executable="${apr.lib.dir}/${test}"
+ dir="${apr.lib.dir}"
+ failonerror="true">
+ <env key="DYLD_LIBRARY_PATH"
+ value="${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ <env key="LD_LIBRARY_PATH"
+ value="${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ </exec>
+</target>
+
+
+<target name="build-testlockperf" depends="build">
+ <antcall target="build-test">
+ <param name="test" value="testlockperf"/>
+ <param name="testfiles" value="testlockperf.c"/>
+ </antcall>
+</target>
+
+<target name="run-testlockperf" depends="build-testlockperf">
+ <antcall target="run-test">
+ <param name="test" value="testlockperf"/>
+ </antcall>
+</target>
+
+<target name="build-testshmproducer" depends="build">
+ <antcall target="build-test">
+ <param name="test" value="testshmproducer"/>
+ <param name="testfiles" value="testshmproducer.c"/>
+ </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"/>
+ <param name="testfiles" value="testshmconsumer.c"/>
+ </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">
+ <param name="test" value="testmutexscope"/>
+ <param name="testfiles" value="testmutexscope.c"/>
+ </antcall>
+</target>
+
+<target name="run-testmutexscope" depends="build-testmutexscope">
+ <antcall target="run-test">
+ <param name="test" value="testmutexscope"/>
+ </antcall>
+</target>
+
+<target name="build-occhild" depends="build">
+ <antcall target="build-test">
+ <param name="test" value="occhild"/>
+ <param name="testfiles" value="occhild.c"/>
+ </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">
+ <antcall target="build-test">
+ <param name="test" value="mockchild"/>
+ <param name="testfiles" value="mockchild.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">
+ <param name="test" value="readchild"/>
+ <param name="testfiles" value="readchild.c"/>
+ </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">
+ <param name="test" value="globalmutexchild"/>
+ <param name="testfiles" value="globalmutexchild.c"/>
+ </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"/>
+ <param name="testfiles" value="tryread.c"/>
+ </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">
+ <antcall target="build-test">
+ <param name="test" value="procchild"/>
+ <param name="testfiles" value="procchild.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">
+ <param name="test" value="sendfile"/>
+ <param name="testfiles" value="sendfile.c"/>
+ </antcall>
+</target>
+
+<target name="build-testall" depends="build">
+ <mkdir dir="${apr.lib.dir}/apr_obj"/>
+ <cc name="${compiler}"
+ outfile="${apr.lib.dir}/testall"
+ subsystem="console"
+ multithreaded="true"
+ outtype="executable"
+ objdir="${apr.lib.dir}/apr_obj"
+ debug="${debug}">
+ <fileset dir="${base.dir}/test" includes="*.c">
+ <exclude name="nw_misc.c"/>
+ <exclude name="testlockperf.c"/>
+ <exclude name="occhild.c"/>
+ <exclude name="sockchild.c"/>
+ <exclude name="mockchild.c"/>
+ <exclude name="readchild.c"/>
+ <exclude name="globalmutexchild.c"/>
+ <exclude name="tryread.c"/>
+ <exclude name="proc_child.c"/>
+ <exclude name="sendfile.c"/>
+ <exclude name="testshmproducer.c"/>
+ <exclude name="testshmconsumer.c"/>
+ <exclude name="testmutexscope.c"/>
+ <exclude name="testapp.c"/>
+ </fileset>
+ <includepath path="${include.dir}"/>
+ <defineset if="is-windows">
+ <define name="WIN32" value="1"/>
+ </defineset>
+ <libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
+ <libset libs="cw32mt" if="is-bcc"/>
+ </cc>
+</target>
+
+<target name="run-testall" depends="build-testall">
+ <antcall target="run-test">
+ <param name="test" value="testall"/>
+ </antcall>
+</target>
+
+
+
+<target name="build-check"
+ depends="build-testlockperf,
+ build-testshmproducer,
+ build-testshmconsumer,
+ build-testmutexscope,
+ build-testall"/>
+
+<target name="check"
+ depends="run-testlockperf,
+ run-testshmproducer,
+ run-testshmconsumer,
+ run-testmutexscope,
+ run-testall">
+</target>
+
+
+</project>
1.4 +242 -145 logging-log4cxx/apriconv-build.xml
Index: apriconv-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apriconv-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apriconv-build.xml 6 Feb 2005 04:48:34 -0000 1.3
+++ apriconv-build.xml 9 Feb 2005 22:52:00 -0000 1.4
@@ -1,145 +1,242 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2004-2005 The Apache Software Foundation.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-<!--
-
-This file builds APR using Apache Ant (http://ant.apache.org)
-and the C++ compilation tasks from http://ant-contrib.sourceforge.net.
-
-
--->
-<project name="apriconv" default="check">
-
-<property name="debug" value="true"/>
-<property name="build.dir" location="build"/>
-<property name="version" value="1.0.1"/>
-<property name="base.dir" location="."/>
-<property name="include.dir" location="${base.dir}/include"/>
-<property name="lib.type" value="static"/>
-
-
-<taskdef resource="cpptasks.tasks"/>
-<typedef resource="cpptasks.types"/>
-<property name="apr.dir" location="${base.dir}/../apr-1.1.0"/>
-<property name="apr.include.dir" location="${apr.dir}/include"/>
-<property name="with-apr" value="${apr.dir}"/>
-
-<target name="usage">
- <echo>
- </echo>
-</target>
-
-<target name="os-detect">
- <condition property="is-unix" value="true">
- <os family="unix"/>
- </condition>
- <condition property="is-windows" value="true">
- <os family="windows"/>
- </condition>
-</target>
-
-
-<target name="win-init" depends="os-detect" if="is-windows">
- <property name="compiler" value="msvc"/>
- <property name="arch" value="win32"/>
-</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"/>
-</target>
-
-<target name="init" depends="win-init, unix-init">
- <condition property="is-debug" value="true">
- <istrue value="${debug}"/>
- </condition>
- <condition property="executable.dir" value="${build.dir}/debug">
- <isset property="is-debug"/>
- </condition>
- <property name="executable.dir" location="${build.dir}/release"/>
- <mkdir dir="${executable.dir}"/>
- <condition property="lib-suffix" value="d">
- <isset property="is-debug"/>
- </condition>
- <property name="lib-suffix" value=""/>
-</target>
-
-<target name="clean">
- <delete dir="${build.dir}"/>
-</target>
-
-
-
-
-
-
-<target name="configure-check" depends="init">
- <condition property="config-available" value="true">
- <available file="${base.dir}/lib/apr_iconv_private.h"/>
- </condition>
-</target>
-
-
-<target name="win-configure" depends="configure-check" if="is-windows"
unless="config-available">
- <copy tofile="${base.dir}/lib/apr_iconv_private.h"
file="${base.dir}/lib/apr_iconv_private.h.in"/>
-</target>
-
-<target name="unix-configure" depends="configure-check" if="is-unix"
unless="config-available">
- <exec executable="${base.dir}/configure" dir="${base.dir}">
- <arg value="--with-apr=${with-apr}"/>
- </exec>
-</target>
-
-
-
-
-<target name="configure" depends="unix-configure, win-configure"/>
-
-
-<target name="build" depends="configure" description="Build library">
- <mkdir dir="${executable.dir}/${lib.type}/apriconv_obj"/>
- <cc name="${compiler}"
- outfile="${executable.dir}/${lib.type}/apriconv${lib-suffix}"
- subsystem="console"
- multithreaded="true"
- outtype="${lib.type}"
- objdir="${executable.dir}/${lib.type}/apriconv_obj"
- debug="${debug}">
- <fileset dir="${base.dir}" includes="**/*.c" excludes="util/*"/>
- <includepath path="${include.dir}"/>
- <includepath path="${base.dir}/lib"/>
- <includepath path="${apr.include.dir}"/>
- <includepath path="${apr.include.dir}/private"/>
- <defineset define="API_DECLARE_EXPORT" if="is-shared"/>
- <defineset define="API_DECLARE_STATIC" unless="is-shared"/>
- <defineset define="WIN32" if="is-windows"/>
- <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
- </cc>
-</target>
-
-<target name="build-check" depends="build"/>
-
-<target name="check" depends="build-check"/>
-
-</project>
+<?xml version="1.0"?>
+<!--
+ Copyright 2004-2005 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<!--
+
+This file builds APR-iconv using Apache Ant (http://ant.apache.org)
+and the C++ compilation tasks from http://ant-contrib.sourceforge.net.
+
+
+-->
+<project name="apriconv" default="check">
+
+<property name="debug" value="true"/>
+<property name="build.dir" location="build"/>
+<property name="version" value="1.0.1"/>
+<property name="base.dir" location="."/>
+<property name="include.dir" location="${base.dir}/include"/>
+<property name="apriconv.lib.type" value="static"/>
+<property name="apr.lib.type" value="shared"/>
+
+
+<taskdef resource="cpptasks.tasks"/>
+<typedef resource="cpptasks.types"/>
+<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+
+
+<property name="apr.dir" location="${base.dir}/../apr-1.1.0"/>
+<property name="apr.include.dir" location="${apr.dir}/include"/>
+<property name="with-apr" value="${apr.dir}"/>
+
+<target name="usage">
+ <echo>
+ </echo>
+</target>
+
+<target name="os-detect">
+ <condition property="is-unix" value="true">
+ <os family="unix"/>
+ </condition>
+ <condition property="is-windows" value="true">
+ <os family="windows"/>
+ </condition>
+</target>
+
+
+<target name="win-init" depends="os-detect" if="is-windows">
+ <property name="compiler" value="msvc"/>
+ <property name="arch" value="win32"/>
+</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"/>
+</target>
+
+<target name="init" depends="win-init, unix-init">
+ <condition property="is-debug" value="true">
+ <istrue value="${debug}"/>
+ </condition>
+ <condition property="apriconv.lib.dir"
value="${build.dir}/debug/${aprutil.lib.type}">
+ <isset property="is-debug"/>
+ </condition>
+ <property name="apriconv.lib.dir"
location="${build.dir}/release/${aprutil.lib.type}"/>
+ <mkdir dir="${apriconv.lib.dir}"/>
+ <condition property="lib-suffix" value="d">
+ <isset property="is-debug"/>
+ </condition>
+ <property name="lib-suffix" value=""/>
+ <condition property="is-bcc" value="true">
+ <equals arg1="${compiler}" arg2="bcc"/>
+ </condition>
+
+ <condition property="is-apr-shared" value="true">
+ <equals arg1="${apr.lib.type}" arg2="shared"/>
+ </condition>
+
+ <condition property="is-apriconv-shared" value="true">
+ <equals arg1="${apriconv.lib.type}" arg2="shared"/>
+ </condition>
+</target>
+
+<target name="clean">
+ <delete dir="${build.dir}"/>
+</target>
+
+
+
+
+
+
+<target name="configure-check" depends="init">
+ <condition property="config-available" value="true">
+ <available file="${base.dir}/lib/apr_iconv_private.h"/>
+ </condition>
+</target>
+
+
+<target name="win-configure" depends="configure-check" if="is-windows"
unless="config-available">
+ <copy tofile="${base.dir}/lib/apr_iconv_private.h"
+ file="${base.dir}/lib/apr_iconv_private.h.in"
+ failonerror="false"/>
+</target>
+
+<target name="unix-configure" depends="configure-check" if="is-unix"
unless="config-available">
+ <exec executable="${base.dir}/configure" dir="${base.dir}">
+ <arg value="--with-apr=${with-apr}"/>
+ </exec>
+</target>
+
+
+
+
+<target name="configure" depends="unix-configure, win-configure"/>
+
+
+<target name="build-lib" depends="configure" description="Build library">
+ <mkdir dir="${apriconv.lib.dir}/apriconv_obj"/>
+ <cc name="${compiler}"
+ outfile="${apriconv.lib.dir}/apriconv${lib-suffix}"
+ subsystem="console"
+ multithreaded="true"
+ outtype="${apriconv.lib.type}"
+ objdir="${apriconv.lib.dir}/apriconv_obj"
+ debug="${debug}">
+ <fileset dir="${base.dir}" includes="lib/*.c"/>
+ <includepath path="${include.dir}"/>
+ <includepath path="${base.dir}/lib"/>
+ <includepath path="${apr.include.dir}"/>
+ <includepath path="${apr.include.dir}/private"/>
+ <defineset define="API_DECLARE_EXPORT" if="is-apriconv-shared"/>
+ <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"/>
+ </cc>
+</target>
+
+<target name="build-module" depends="init">
+ <basename file="${module.src}" property="module" suffix="c"/>
+ <cc name="${compiler}"
+ outfile="${apriconv.lib.dir}/${module}"
+ subsystem="console"
+ multithreaded="true"
+ outtype="shared"
+ objdir="${apriconv.lib.dir}/apriconv_obj"
+ debug="${debug}">
+ <fileset file="${module.src}"/>
+ <includepath path="${include.dir}"/>
+ <includepath path="${base.dir}/lib"/>
+ <includepath path="${apr.include.dir}"/>
+ <includepath path="${apr.include.dir}/private"/>
+ <defineset define="API_DECLARE_EXPORT"/>
+ <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"/>
+ <libset libs="apriconv${lib-suffix}" dir="${apriconv.lib.dir}"/>
+ <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"/>
+ </cc>
+</target>
+
+
+<target name="build-ces" depends="build-lib">
+
+<foreach target="build-module" param="module.src">
+ <path>
+ <fileset dir="${base.dir}" includes="ces/*.c"/>
+ </path>
+</foreach>
+
+</target>
+
+
+<target name="build-ccs-c" depends="build-lib">
+ <foreach target="build-module" param="module.src">
+ <path>
+ <fileset dir="${base.dir}/ccs" includes="c*.c"/>
+ </path>
+ </foreach>
+</target>
+
+<target name="build-ccs-i" depends="build-lib">
+ <foreach target="build-module" param="module.src">
+ <path>
+ <fileset dir="${base.dir}/ccs" includes="i*.c"/>
+ </path>
+ </foreach>
+</target>
+
+<target name="build-ccs-w" depends="build-lib">
+ <foreach target="build-module" param="module.src">
+ <path>
+ <fileset dir="${base.dir}/ccs" includes="w*.c"/>
+ </path>
+ </foreach>
+</target>
+
+<target name="build-ccs-other" depends="build-lib">
+
+ <foreach target="build-module" param="module.src">
+ <path>
+ <fileset dir="${base.dir}/ccs"
+ includes="*.c"
+ excludes="c*.c i*.c w*.c"/>
+ </path>
+ </foreach>
+</target>
+
+<target name="build-ccs" depends="build-ccs-c, build-ccs-i, build-ccs-w,
build-ccs-other"/>
+
+<target name="build-util" depends="build-lib">
+</target>
+
+<target name="build" depends="build-lib, build-ccs, build-ces, build-util"/>
+
+<target name="build-check" depends="build-lib"/>
+
+<target name="check" depends="build-check"/>
+
+</project>
1.4 +411 -179 logging-log4cxx/aprutil-build.xml
Index: aprutil-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/aprutil-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aprutil-build.xml 6 Feb 2005 04:48:34 -0000 1.3
+++ aprutil-build.xml 9 Feb 2005 22:52:00 -0000 1.4
@@ -1,179 +1,411 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2004-2005 The Apache Software Foundation.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-<!--
-
-This file builds APR using Apache Ant (http://ant.apache.org)
-and the C++ compilation tasks from http://ant-contrib.sourceforge.net.
-
-
--->
-<project name="aprutil" default="check">
-
-<property name="debug" value="true"/>
-<property name="build.dir" location="build"/>
-<property name="version" value="1.1.0"/>
-<property name="base.dir" location="."/>
-<property name="include.dir" location="${base.dir}/include"/>
-<property name="lib.type" value="shared"/>
-
-
-
-<taskdef resource="cpptasks.tasks"/>
-<typedef resource="cpptasks.types"/>
-
-<property name="apr.dir" location="${base.dir}/../apr-1.1.0"/>
-<property name="apr.include.dir" location="${apr.dir}/include"/>
-<property name="with-apr" value="${apr.dir}"/>
-<property name="apriconv.dir" location="${base.dir}/../apr-iconv-1.0.1"/>
-<property name="apriconv.include.dir" location="${apriconv.dir}/include"/>
-<property name="with-apr-iconv" value="${apriconv.dir}"/>
-
-<target name="usage">
- <echo>
- </echo>
-</target>
-
-<target name="os-detect">
- <condition property="is-unix" value="true">
- <os family="unix"/>
- </condition>
- <condition property="is-windows" value="true">
- <os family="windows"/>
- </condition>
-</target>
-
-
-<target name="win-init" depends="os-detect" if="is-windows">
- <property name="compiler" value="msvc"/>
- <property name="arch" value="win32"/>
-</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"/>
-</target>
-
-<target name="init" depends="win-init, unix-init">
- <condition property="is-debug" value="true">
- <istrue value="${debug}"/>
- </condition>
- <condition property="executable.dir" value="${build.dir}/debug">
- <isset property="is-debug"/>
- </condition>
- <property name="executable.dir" location="${build.dir}/release"/>
- <mkdir dir="${executable.dir}"/>
- <condition property="lib-suffix" value="d">
- <isset property="is-debug"/>
- </condition>
- <property name="lib-suffix" value=""/>
- <available property="src-available" file="${base.dir}"/>
-
- <condition property="is-shared" value="true">
- <equals arg1="${lib.type}" arg2="shared"/>
- </condition>
-</target>
-
-<target name="clean">
- <delete dir="${build.dir}"/>
-</target>
-
-
-<target name="configure-check" depends="init">
- <condition property="config-available" value="true">
- <and>
- <available file="${include.dir}/apu.h"/>
- <available file="${include.dir}/apu_want.h"/>
- <available file="${include.dir}/private/apu_config.h"/>
- <available
file="${include.dir}/private/apu_select_dbm.h"/>
- <available file="${base.dir}/xml/expat/lib/expat.h"/>
- <available file="${base.dir}/xml/expat/config.h"/>
- </and>
- </condition>
-</target>
-
-
-<target name="win-configure" depends="configure-check" if="is-windows"
unless="config-available">
- <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}/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"/>
- <copy tofile="${base.dir}/xml/expat/lib/config.h"
file="${base.dir}/xml/expat/lib/winconfig.h"/>
-</target>
-
-<target name="unix-configure" depends="configure-check" if="is-unix"
unless="config-available">
- <exec executable="${base.dir}/configure" dir="${base.dir}">
- <arg value="--with-apr=${with-apr}"/>
- <arg value="--with-apr-iconv=${with-apr-iconv}"/>
- </exec>
- <exec executable="${base.dir}/xml/expat/configure"
dir="${base.dir}/xml/expat"/>
-</target>
-
-
-<target name="configure" depends="unix-configure, win-configure"/>
-
-
-<target name="build" depends="configure" description="Build library">
- <mkdir dir="${executable.dir}/${lib.type}/aprutil_obj"/>
- <!-- uses replace instead of preprocessor since
- the quotes on VERSION cause problems with cpptasks -->
- <replace file="${base.dir}/xml/expat/lib/xmlparse.c">
- <replacefilter token="XML_MAJOR_VERSION" value="1"/>
- <replacefilter token="XML_MINOR_VERSION" value="95"/>
- <replacefilter token="XML_MICRO_VERSION" value="1"/>
- <replacefilter token="VERSION" value='"expat_1.95.1"'/>
- </replace>
- <cc name="${compiler}"
- outfile="${executable.dir}/${lib.type}/aprutil-1${lib-suffix}"
- subsystem="console"
- multithreaded="true"
- outtype="${lib.type}"
- objdir="${executable.dir}/${lib.type}/aprutil_obj"
- 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"/>
- <includepath path="${include.dir}"/>
- <includepath path="${include.dir}/private"/>
- <includepath path="${apr.include.dir}"/>
- <includepath path="${apriconv.include.dir}"/>
- <includepath path="${base.dir}/xml/expat/lib"/>
- <includepath path="${base.dir}/xml/expat"/>
- <defineset define="APU_DECLARE_EXPORT" if="is-shared"/>
- <defineset define="APU_DECLARE_STATIC" unless="is-shared"/>
- <defineset define="WIN32" if="is-windows"/>
- <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
-
- <libset dir="${apr.lib.dir}" libs="apr-1"/>
- <libset dir="${apriconv.lib.dir}" libs="apriconv"/>
- </cc>
-</target>
-
-<target name="build-check" depends="build"/>
-
-<target name="check" depends="build-check"/>
-
-</project>
+<?xml version="1.0"?>
+<!--
+ Copyright 2004-2005 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<!--
+
+This file builds APR using Apache Ant (http://ant.apache.org)
+and the C++ compilation tasks from http://ant-contrib.sourceforge.net.
+
+
+-->
+<project name="aprutil" default="check">
+
+<property name="debug" value="true"/>
+<property name="build.dir" location="build"/>
+<property name="version" value="1.1.0"/>
+<property name="base.dir" location="."/>
+<property name="include.dir" location="${base.dir}/include"/>
+<property name="apr.lib.type" value="shared"/>
+<property name="apriconv.lib.type" value="static"/>
+<property name="aprutil.lib.type" value="shared"/>
+
+
+
+<taskdef resource="cpptasks.tasks"/>
+<typedef resource="cpptasks.types"/>
+
+<property name="apr.dir" location="${base.dir}/../apr-1.1.0"/>
+<property name="apr.include.dir" location="${apr.dir}/include"/>
+<property name="with-apr" value="${apr.dir}"/>
+<property name="apriconv.dir" location="${base.dir}/../apr-iconv-1.0.1"/>
+<property name="apriconv.include.dir" location="${apriconv.dir}/include"/>
+<property name="with-apr-iconv" value="${apriconv.dir}"/>
+
+<target name="usage">
+ <echo>
+ </echo>
+</target>
+
+<target name="os-detect">
+ <condition property="is-unix" value="true">
+ <os family="unix"/>
+ </condition>
+ <condition property="is-windows" value="true">
+ <os family="windows"/>
+ </condition>
+</target>
+
+
+<target name="win-init" depends="os-detect" if="is-windows">
+ <property name="compiler" value="msvc"/>
+ <property name="arch" value="win32"/>
+</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"/>
+</target>
+
+<target name="init" depends="win-init, unix-init">
+ <condition property="is-debug" value="true">
+ <istrue value="${debug}"/>
+ </condition>
+ <condition property="aprutil.lib.dir"
value="${build.dir}/debug/${aprutil.lib.type}">
+ <isset property="is-debug"/>
+ </condition>
+ <property name="aprutil.lib.dir"
location="${build.dir}/release/${aprutil.lib.type}"/>
+ <mkdir dir="${aprutil.lib.dir}"/>
+
+ <condition property="lib-suffix" value="d">
+ <isset property="is-debug"/>
+ </condition>
+ <property name="lib-suffix" value=""/>
+ <available property="src-available" file="${base.dir}"/>
+
+ <condition property="is-apr-shared" value="true">
+ <equals arg1="${apr.lib.type}" arg2="shared"/>
+ </condition>
+ <condition property="is-apriconv-shared" value="true">
+ <equals arg1="${apriconv.lib.type}" arg2="shared"/>
+ </condition>
+ <condition property="is-aprutil-shared" value="true">
+ <equals arg1="${aprutil.lib.type}" arg2="shared"/>
+ </condition>
+
+
+ <condition property="is-bcc" value="true">
+ <equals arg1="${compiler}" arg2="bcc"/>
+ </condition>
+
+</target>
+
+<target name="clean">
+ <delete dir="${build.dir}"/>
+</target>
+
+
+<target name="configure-check" depends="init">
+ <condition property="config-available" value="true">
+ <and>
+ <available file="${include.dir}/apu.h"/>
+ <available file="${include.dir}/apu_want.h"/>
+ <available file="${include.dir}/private/apu_config.h"/>
+ <available
file="${include.dir}/private/apu_select_dbm.h"/>
+ <available file="${base.dir}/xml/expat/lib/expat.h"/>
+ <available file="${base.dir}/xml/expat/config.h"/>
+ </and>
+ </condition>
+</target>
+
+
+<target name="win-configure" depends="configure-check" if="is-windows"
unless="config-available">
+ <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"/>
+ <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"/>
+ <copy tofile="${base.dir}/xml/expat/lib/config.h"
file="${base.dir}/xml/expat/lib/winconfig.h"/>
+</target>
+
+<target name="unix-configure" depends="configure-check" if="is-unix"
unless="config-available">
+ <exec executable="${base.dir}/configure" dir="${base.dir}">
+ <arg value="--with-apr=${with-apr}"/>
+ <arg value="--with-apr-iconv=${with-apr-iconv}"/>
+ </exec>
+ <exec executable="${base.dir}/xml/expat/configure"
dir="${base.dir}/xml/expat"/>
+</target>
+
+
+<target name="configure" depends="unix-configure, win-configure"/>
+
+
+<target name="build" depends="configure" description="Build library">
+ <mkdir dir="${aprutil.lib.dir}/aprutil_obj"/>
+ <!-- uses replace instead of preprocessor since
+ the quotes on VERSION cause problems with cpptasks -->
+ <replace file="${base.dir}/xml/expat/lib/xmlparse.c">
+ <replacefilter token="XML_MAJOR_VERSION" value="1"/>
+ <replacefilter token="XML_MINOR_VERSION" value="95"/>
+ <replacefilter token="XML_MICRO_VERSION" value="1"/>
+ <replacefilter token="VERSION" value='"expat_1.95.1"'/>
+ </replace>
+ <cc name="${compiler}"
+ outfile="${aprutil.lib.dir}/aprutil-1${lib-suffix}"
+ subsystem="console"
+ multithreaded="true"
+ outtype="${aprutil.lib.type}"
+ objdir="${aprutil.lib.dir}/aprutil_obj"
+ 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"/>
+ <includepath path="${include.dir}"/>
+ <includepath path="${include.dir}/private"/>
+ <includepath path="${apr.include.dir}"/>
+ <includepath path="${apriconv.include.dir}"/>
+ <includepath path="${base.dir}/xml/expat/lib"/>
+ <includepath path="${base.dir}/xml/expat"/>
+ <defineset define="APU_DECLARE_EXPORT" if="is-aprutil-shared"/>
+ <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="WIN32" if="is-windows"/>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+
+ <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"/>
+ </cc>
+</target>
+
+<target name="build-test">
+ <mkdir dir="${aprutil.lib.dir}/apr_obj"/>
+ <cc name="${compiler}"
+ outfile="${aprutil.lib.dir}/${test}"
+ subsystem="console"
+ multithreaded="true"
+ outtype="executable"
+ objdir="${aprutil.lib.dir}/apr_obj"
+ debug="${debug}">
+ <fileset dir="${base.dir}/test" includes="${testfiles}"/>
+ <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 if="is-windows">
+ <define name="WIN32" value="1"/>
+ </defineset>
+ <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"/>
+ </cc>
+</target>
+
+<target name="copy-apr" if="is-windows">
+ <copy todir="${aprutil.lib.dir}">
+ <fileset dir="${apr.lib.dir}" includes="apr-1${lib-suffix}.dll"/>
+ <fileset dir="${apriconv.lib.dir}" includes="*.dll"/>
+ </copy>
+</target>
+
+<target name="run-test" depends="copy-apr">
+ <exec executable="${aprutil.lib.dir}/${test}"
+ dir="${aprutil.lib.dir}"
+ failonerror="true">
+ <env key="DYLD_LIBRARY_PATH"
+
value="${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ <env key="LD_LIBRARY_PATH"
+
value="${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ <env key="Path"
+
value="${apr.lib.dir}:${aprutil.lib.dir}:${apriconv.lib.dir}:${env.Path}"/>
+ </exec>
+</target>
+
+
+<target name="build-testdbm" depends="build">
+ <antcall target="build-test">
+ <param name="test" value="testdbm"/>
+ <param name="testfiles" value="testdbm.c"/>
+ </antcall>
+</target>
+
+<target name="run-testdbm" depends="build-testdbm">
+ <antcall target="run-test">
+ <param name="test" value="testdbm"/>
+ </antcall>
+</target>
+
+<target name="build-testdbd" depends="build">
+ <antcall target="build-test">
+ <param name="test" value="testdbd"/>
+ <param name="testfiles" value="testdbd.c"/>
+ </antcall>
+</target>
+
+<target name="run-testdbd" depends="build-testdbd">
+ <antcall target="run-test">
+ <param name="test" value="testdbd"/>
+ </antcall>
+</target>
+
+<target name="build-testdate" depends="build" unless="is-windows">
+ <antcall target="build-test">
+ <param name="test" value="testdate"/>
+ <param name="testfiles" value="testdate.c"/>
+ </antcall>
+</target>
+
+<target name="run-testdate" depends="build-testdate" unless="is-windows">
+ <antcall target="run-test">
+ <param name="test" value="testdate"/>
+ </antcall>
+</target>
+
+
+<target name="build-testxml" depends="build">
+ <antcall target="build-test">
+ <param name="test" value="testxml"/>
+ <param name="testfiles" value="testxml.c"/>
+ </antcall>
+</target>
+
+<target name="run-testxml" depends="build-testxml">
+ <antcall target="run-test">
+ <param name="test" value="testxml"/>
+ </antcall>
+</target>
+
+<target name="build-testrmm" depends="build">
+ <antcall target="build-test">
+ <param name="test" value="testrmm"/>
+ <param name="testfiles" value="testrmm.c"/>
+ </antcall>
+</target>
+
+<target name="run-testrmm" depends="build-testrmm">
+ <antcall target="run-test">
+ <param name="test" value="testrmm"/>
+ </antcall>
+</target>
+
+<target name="build-testreslist" depends="build" unless="is-windows">
+ <antcall target="build-test">
+ <param name="test" value="testreslist"/>
+ <param name="testfiles" value="testreslist.c"/>
+ </antcall>
+</target>
+
+<target name="run-testreslist" depends="build-testreslist"
unless="is-windows">
+ <antcall target="run-test">
+ <param name="test" value="testreslist"/>
+ </antcall>
+</target>
+
+<target name="build-testqueue" depends="build">
+ <antcall target="build-test">
+ <param name="test" value="testqueue"/>
+ <param name="testfiles" value="testqueue.c"/>
+ </antcall>
+</target>
+
+<target name="run-testqueue" depends="build-testqueue">
+ <antcall target="run-test">
+ <param name="test" value="testqueue"/>
+ </antcall>
+</target>
+
+<target name="build-testxlate" depends="build">
+ <antcall target="build-test">
+ <param name="test" value="testxlate"/>
+ <param name="testfiles" value="testxlate.c"/>
+ </antcall>
+</target>
+
+<target name="run-testxlate" depends="build-testxlate">
+ <antcall target="run-test">
+ <param name="test" value="testxlate"/>
+ </antcall>
+</target>
+
+
+<target name="build-testall" depends="build">
+ <mkdir dir="${aprutil.lib.dir}/apr_obj"/>
+ <cc name="${compiler}"
+ outfile="${aprutil.lib.dir}/testall"
+ subsystem="console"
+ multithreaded="true"
+ outtype="executable"
+ objdir="${aprutil.lib.dir}/apr_obj"
+ debug="${debug}">
+ <fileset dir="${base.dir}/test" includes="*.c">
+ <exclude name="nw_misc.c"/>
+ <exclude name="testdbm.c"/>
+ <exclude name="testdbd.c"/>
+ <exclude name="testdate.c"/>
+ <exclude name="testxml.c"/>
+ <exclude name="testrmm.c"/>
+ <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 if="is-windows">
+ <define name="WIN32" value="1"/>
+ </defineset>
+ <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"/>
+ </cc>
+</target>
+
+<target name="run-testall" depends="build-testall">
+ <antcall target="run-test">
+ <param name="test" value="testall"/>
+ </antcall>
+</target>
+
+
+
+<target name="build-check"
+ depends="build-testdbm,
+ build-testdbd,
+ build-testdate,
+ build-testxml,
+ build-testrmm,
+ build-testreslist,
+ build-testqueue,
+ build-testxlate,
+ build-testall"/>
+
+<target name="check"
+ depends="build-testdbm,
+ build-testdbd,
+ run-testdate,
+ run-testxml,
+ run-testrmm,
+ run-testreslist,
+ run-testqueue,
+ run-testxlate,
+ run-testall"/>
+
+
+</project>
1.38 +16 -13 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 9 Feb 2005 04:09:34 -0000 1.37
+++ build.xml 9 Feb 2005 22:52:00 -0000 1.38
@@ -335,6 +335,8 @@
<antcall target="untar-apr-src"/>
<property name="apr.dir" location="${lib.dir}/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="apr-build.xml" target="build" inheritAll="false">
<property name="version" value="${apr.version}"/>
@@ -342,11 +344,9 @@
<property name="lib-suffix" value="${lib-suffix}"/>
<property name="compiler" value="${compiler}"/>
<property name="base.dir" value="${apr.dir}"/>
- <property name="executable.dir" value="${executable.dir}"/>
- <property name="lib.type" value="${apr.lib.type}"/>
+ <property name="apr.lib.dir" value="${apr.lib.dir}"/>
+ <property name="apr.lib.type" value="${apr.lib.type}"/>
</ant>
- <property name="apr.include.dir" location="${apr.dir}/include"/>
- <property name="apr.lib.dir"
location="${executable.dir}/${apr.lib.type}"/>
</target>
<target name="get-apriconv-src" unless="apriconv-src-available">
@@ -368,7 +368,9 @@
<antcall target="untar-apriconv-src"/>
<property name="apriconv.dir"
location="${lib.dir}/apr-iconv-${apriconv.version}"/>
- <ant antfile="apriconv-build.xml" target="build" inheritAll="false">
+ <property name="apriconv.include.dir"
location="${apriconv.dir}/include"/>
+ <property name="apriconv.lib.dir"
location="${executable.dir}/${apriconv.lib.type}"/>
+ <ant antfile="apriconv-build.xml" target="build-lib" inheritAll="false">
<property name="version" value="${apriconv.version}"/>
<property name="base.dir" value="${apriconv.dir}"/>
<property name="debug" value="${debug}"/>
@@ -376,12 +378,11 @@
<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="executable.dir" value="${executable.dir}"/>
- <property name="lib.type" value="${apriconv.lib.type}"/>
+ <property name="apriconv.lib.dir" value="${apriconv.lib.dir}"/>
+ <property name="apr.lib.type" value="${apr.lib.type}"/>
+ <property name="apriconv.lib.type" value="${apriconv.lib.type}"/>
<property name="with-apr" value="${apr.dir}/apr--config"/>
</ant>
- <property name="apriconv.include.dir"
location="${apriconv.dir}/include"/>
- <property name="apriconv.lib.dir"
location="${executable.dir}/${apriconv.lib.type}"/>
</target>
<target name="get-aprutil-src" unless="aprutil-src-available">
@@ -406,6 +407,8 @@
<antcall target="untar-aprutil-src"/>
<property name="aprutil.dir"
location="${lib.dir}/apr-util-${aprutil.version}"/>
+ <property name="aprutil.include.dir" location="${aprutil.dir}/include"/>
+ <property name="aprutil.lib.dir"
location="${executable.dir}/${aprutil.lib.type}"/>
<ant antfile="aprutil-build.xml" target="build" inheritAll="false">
<property name="version" value="${aprutil.version}"/>
@@ -417,12 +420,12 @@
<property name="apr.lib.dir" value="${apr.lib.dir}"/>
<property name="apriconv.include.dir"
value="${apriconv.include.dir}"/>
<property name="apriconv.lib.dir" value="${apriconv.lib.dir}"/>
- <property name="executable.dir" value="${executable.dir}"/>
- <property name="lib.type" value="${aprutil.lib.type}"/>
+ <property name="aprutil.lib.dir" value="${aprutil.lib.dir}"/>
+ <property name="apr.lib.type" value="${apr.lib.type}"/>
+ <property name="apriconv.lib.type" value="${apriconv.lib.type}"/>
+ <property name="aprutil.lib.type" value="${aprutil.lib.type}"/>
<property name="with-apr" value="${apr.dir}/apr--config"/>
</ant>
- <property name="aprutil.include.dir" location="${aprutil.dir}/include"/>
- <property name="aprutil.lib.dir"
location="${executable.dir}/${aprutil.lib.type}"/>
</target>
<target name="get-cppunit-src" unless="cppunit-src-available">
