carnold 2005/05/04 14:32:16
Modified: . apr-build.xml aprutil-build.xml build.xml Log: LOGCXX-43: Config improvments, fix apu breakage Revision Changes Path 1.15 +461 -461 logging-log4cxx/apr-build.xml Index: apr-build.xml =================================================================== RCS file: /home/cvs/logging-log4cxx/apr-build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- apr-build.xml 29 Apr 2005 01:23:16 -0000 1.14 +++ apr-build.xml 4 May 2005 21:32:16 -0000 1.15 @@ -1,468 +1,468 @@ -<?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="version" value="1.1.0"/> -<property name="apr.dir" location="."/> -<property name="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" value="${build.dir}"/> - -<taskdef resource="cpptasks.tasks"/> -<typedef resource="cpptasks.types"/> - -<target name="usage" description="Displays usage notes on build"> - <echo> - </echo> -</target> - -<target name="os-detect"> - <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}"/> -</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"> +<?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="version" value="1.1.0"/> +<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" value="${build.dir}"/> + +<taskdef resource="cpptasks.tasks"/> +<typedef resource="cpptasks.types"/> + +<target name="usage" description="Displays usage notes on build"> + <echo> + </echo> +</target> + +<target name="os-detect"> + <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}"/> +</target> + + +<target name="configure-check" depends="init"> + <condition property="apr-configure-available" value="true"> + <available file="${apr.include.dir}/apr.h"/> + </condition> +</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> + +<target name="unix-configure" depends="configure-check" if="is-unix" unless="apr-configure-available"> <!-- shelling to configure allows cygwin to work --> <exec executable="sh" dir="${apr.dir}"> <arg value="./configure"/> - </exec> -</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" - outputfileproperty="apr-1.dll" - debug="${debug}"> - <fileset dir="${src.dir}" includes="**/${arch}/*.c" excludes="**/apr_app.c"/> - <fileset dir="${src.dir}/file_io/unix" - includes="copy.c fileacc.c filepath_util.c fullrw.c mktemp.c tempdir.c"/> - <fileset dir="${src.dir}/memory/unix" includes="*.c"/> - <fileset dir="${src.dir}/misc/${arch}" includes="*.c"/> - <fileset dir="${src.dir}/misc/unix" - includes="errorcodes.c getopt.c otherchild.c version.c"/> - <fileset dir="${src.dir}/mmap/unix" includes="common.c"/> - <fileset dir="${src.dir}/network_io/unix" - includes="inet_ntop.c inet_pton.c sockaddr.c"/> - <fileset dir="${src.dir}/poll/unix" includes="select.c"/> - <fileset dir="${src.dir}/random/unix" includes="*.c"/> - <fileset dir="${src.dir}/strings" includes="*.c"/> - <fileset dir="${src.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="${src.dir}/support/unix" includes="waitio.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"/> - <compilerarg value="${pic-option}" if="pic-option"/> - <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"/> - </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="${test.dir}" includes="${testfiles}"/> - <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"/> - <compilerarg value="${pic-option}" if="pic-option"/> - <libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/> - <libset libs="cw32mt" if="is-bcc"/> + </exec> +</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" + outputfileproperty="apr-1.dll" + debug="${debug}"> + <fileset dir="${src.dir}" includes="**/${arch}/*.c" excludes="**/apr_app.c"/> + <fileset dir="${src.dir}/file_io/unix" + includes="copy.c fileacc.c filepath_util.c fullrw.c mktemp.c tempdir.c"/> + <fileset dir="${src.dir}/memory/unix" includes="*.c"/> + <fileset dir="${src.dir}/misc/${arch}" includes="*.c"/> + <fileset dir="${src.dir}/misc/unix" + includes="errorcodes.c getopt.c otherchild.c version.c"/> + <fileset dir="${src.dir}/mmap/unix" includes="common.c"/> + <fileset dir="${src.dir}/network_io/unix" + includes="inet_ntop.c inet_pton.c sockaddr.c"/> + <fileset dir="${src.dir}/poll/unix" includes="select.c"/> + <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="${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"/> + <defineset if="is-windows"> + <define name="WIN32" value="1"/> + </defineset> + <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/> + <compilerarg value="${pic-option}" if="pic-option"/> + <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"/> + </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="${test.dir}" includes="${testfiles}"/> + <includepath path="${apr.include.dir}"/> + <defineset if="is-windows"> + <define name="WIN32" value="1"/> + </defineset> + <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/> + <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}/${test}" if="project.if"/> - </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="build-testshmconsumer" depends="build"> - <antcall target="build-test"> - <param name="test" value="testshmconsumer"/> - <param name="testfiles" value="testshmconsumer.c"/> - </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="build-sockchild" depends="build"> - <antcall target="build-test"> - <param name="test" value="sockchild"/> - <param name="testfiles" value="sockchild.c"/> - </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="build-globalmutexchild" depends="build"> - <antcall target="build-test"> - <param name="test" value="globalmutexchild"/> - <param name="testfiles" value="globalmutexchild.c"/> - </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="build-proc_child" depends="build"> - <antcall target="build-test"> - <param name="test" value="proc_child"/> - <param name="testfiles" value="proc_child.c"/> - </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-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="${test.dir}" 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"/> - <compilerarg value="${pic-option}" if="pic-option"/> - <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"/> + </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="build-testshmconsumer" depends="build"> + <antcall target="build-test"> + <param name="test" value="testshmconsumer"/> + <param name="testfiles" value="testshmconsumer.c"/> + </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="build-sockchild" depends="build"> + <antcall target="build-test"> + <param name="test" value="sockchild"/> + <param name="testfiles" value="sockchild.c"/> + </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="build-globalmutexchild" depends="build"> + <antcall target="build-test"> + <param name="test" value="globalmutexchild"/> + <param name="testfiles" value="globalmutexchild.c"/> + </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="build-proc_child" depends="build"> + <antcall target="build-test"> + <param name="test" value="proc_child"/> + <param name="testfiles" value="proc_child.c"/> + </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-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="${test.dir}" includes="mod_test.c"/> + <includepath path="${apr.include.dir}"/> + <defineset if="is-windows"> + <define name="WIN32" value="1"/> + </defineset> + <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/> + <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"/> - </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}" - outfile="${apr.lib.dir}/testall" - subsystem="console" - multithreaded="true" - outtype="executable" - objdir="${apr.lib.dir}/apr_obj" - debug="${debug}"> - <fileset dir="${test.dir}" 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> - <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/> - <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"/> + <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}" + outfile="${apr.lib.dir}/testall" + subsystem="console" + multithreaded="true" + outtype="executable" + objdir="${apr.lib.dir}/apr_obj" + debug="${debug}"> + <fileset dir="${test.dir}" 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="${apr.include.dir}"/> + <defineset if="is-windows"> + <define name="WIN32" value="1"/> + </defineset> + <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/> + <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"/> - </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"> - <fileset dir="${test.dir}/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, - build-testshmproducer, - build-testshmconsumer, - build-testmutexscope, - build-testall" - description="Builds all test applications"/> - -<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> - - - -</project> + <project type="${project.type}" outfile="${project.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"> + <fileset dir="${test.dir}/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, + build-testshmproducer, + build-testshmconsumer, + build-testmutexscope, + build-testall" + description="Builds all test applications"/> + +<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> + + + +</project> 1.16 +484 -484 logging-log4cxx/aprutil-build.xml Index: aprutil-build.xml =================================================================== RCS file: /home/cvs/logging-log4cxx/aprutil-build.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- aprutil-build.xml 28 Apr 2005 20:53:45 -0000 1.15 +++ aprutil-build.xml 4 May 2005 21:32:16 -0000 1.16 @@ -1,496 +1,496 @@ -<?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="version" value="1.1.0"/> -<property name="aprutil.dir" location="."/> -<property name="build.dir" location="${aprutil.dir}/build"/> -<property name="include.dir" location="${aprutil.dir}/include"/> -<property name="apr.lib.type" value="shared"/> -<property name="aprutil.lib.type" value="shared"/> - - - -<taskdef resource="cpptasks.tasks"/> -<typedef resource="cpptasks.types"/> - -<property name="apr.dir" location="${aprutil.dir}/../apr-1.1.0"/> -<property name="apr.include.dir" location="${apr.dir}/include"/> - -<target name="usage" description="Displays usage notes"> - <echo> - </echo> -</target> - -<target name="os-detect"> - <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="unix"/> - <equals arg1="${os.family}" arg2="cygwin"/> - </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"/> -</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> +<?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="version" value="1.1.0"/> +<property name="aprutil.dir" location="."/> +<property name="build.dir" location="${aprutil.dir}/build"/> +<property name="aprutil.include.dir" location="${aprutil.dir}/include"/> +<property name="apr.lib.type" value="shared"/> +<property name="aprutil.lib.type" value="shared"/> + + + +<taskdef resource="cpptasks.tasks"/> +<typedef resource="cpptasks.types"/> + +<property name="apr.dir" location="${aprutil.dir}/../apr-1.1.0"/> +<property name="apr.include.dir" location="${apr.dir}/include"/> + +<target name="usage" description="Displays usage notes"> + <echo> + </echo> +</target> + +<target name="os-detect"> + <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="unix"/> + <equals arg1="${os.family}" arg2="cygwin"/> + </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"/> +</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"/> - <!-- - can't use Windows path names if building cygwin + <!-- + can't use Windows path names if building cygwin assuming typical location. --> <basename property="with-apr-base" file="${apr.dir}"/> <condition property="with-apr" value="../${with-apr-base}"> <os family="windows"/> </condition> - -</target> - -<target name="init" depends="win-init, unix-init"> - <property environment="env"/> - <condition property="is-debug" value="true"> - <istrue value="${debug}"/> - </condition> - <condition property="pic-option" value="-fPIC"> - <and> - <isset property="is-gcc"/> - <istrue value="${use-pic}"/> - </and> - </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="${aprutil.dir}"/> - - <condition property="is-apr-shared" value="true"> - <equals arg1="${apr.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> - <condition property="project.if" value="true"> - <istrue value="${project.if.value}"/> - </condition> + +</target> + +<target name="init" depends="win-init, unix-init"> + <property environment="env"/> + <condition property="is-debug" value="true"> + <istrue value="${debug}"/> + </condition> + <condition property="pic-option" value="-fPIC"> + <and> + <isset property="is-gcc"/> + <istrue value="${use-pic}"/> + </and> + </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="${aprutil.dir}"/> + + <condition property="is-apr-shared" value="true"> + <equals arg1="${apr.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> + <condition property="project.if" value="true"> + <istrue value="${project.if.value}"/> + </condition> <property name="with-apr" value="${apr.dir}"/> - -</target> - -<target name="clean" description="Deletes build products"> - <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="${aprutil.dir}/xml/expat/lib/expat.h"/> - <available file="${aprutil.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"/> - <replaceregexp file="${include.dir}/apu.h" match="#define *APU_HAVE_APR_ICONV.*" replace="#define APU_HAVE_APR_ICONV 0"/> - <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"/> - <replaceregexp file="${include.dir}/apr_ldap.h" match="#define APR_HAS_LDAP.*" replace="#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="${aprutil.dir}/xml/expat/lib/expat.h" file="${aprutil.dir}/xml/expat/lib/expat.h.in"/> - <copy tofile="${aprutil.dir}/xml/expat/lib/config.h" file="${aprutil.dir}/xml/expat/lib/winconfig.h"/> -</target> - -<target name="unix-configure" depends="configure-check" if="is-unix" unless="config-available"> - <exec executable="sh" dir="${aprutil.dir}"> + +</target> + +<target name="clean" description="Deletes build products"> + <delete dir="${build.dir}"/> +</target> + + +<target name="configure-check" depends="init"> + <condition property="aprutil-config-available" value="true"> + <and> + <available file="${aprutil.include.dir}/apu.h"/> + <available file="${aprutil.include.dir}/apu_want.h"/> + <available file="${aprutil.include.dir}/private/apu_config.h"/> + <available file="${aprutil.include.dir}/private/apu_select_dbm.h"/> + <available file="${aprutil.dir}/xml/expat/lib/expat.h"/> + <available file="${aprutil.dir}/xml/expat/config.h"/> + </and> + </condition> +</target> + + +<target name="win-configure" depends="configure-check" if="is-windows" unless="aprutil-config-available"> + <copy tofile="${aprutil.include.dir}/apu.h" file="${aprutil.include.dir}/apu.hw"/> + <replaceregexp file="${aprutil.include.dir}/apu.h" match="#define *APU_HAVE_APR_ICONV.*" replace="#define APU_HAVE_APR_ICONV 0"/> + <copy tofile="${aprutil.include.dir}/apu_want.h" file="${aprutil.include.dir}/apu_want.hw"/> + <copy tofile="${aprutil.include.dir}/apr_ldap.h" file="${aprutil.include.dir}/apr_ldap.hw"/> + <replaceregexp file="${aprutil.include.dir}/apr_ldap.h" match="#define APR_HAS_LDAP.*" replace="#define APR_HAS_LDAP 0"/> + <copy tofile="${aprutil.include.dir}/private/apu_config.h" file="${aprutil.include.dir}/private/apu_config.hw"/> + <copy tofile="${aprutil.include.dir}/private/apu_select_dbm.h" file="${aprutil.include.dir}/private/apu_select_dbm.hw"/> + <copy tofile="${aprutil.dir}/xml/expat/lib/expat.h" file="${aprutil.dir}/xml/expat/lib/expat.h.in"/> + <copy tofile="${aprutil.dir}/xml/expat/lib/config.h" file="${aprutil.dir}/xml/expat/lib/winconfig.h"/> +</target> + +<target name="unix-configure" depends="configure-check" if="is-unix" unless="aprutil-config-available"> + <exec executable="sh" dir="${aprutil.dir}"> <arg value="./configure"/> - <arg value="--with-apr=${with-apr}"/> - </exec> + <arg value="--with-apr=${with-apr}"/> + </exec> <exec executable="sh" dir="${aprutil.dir}/xml/expat"> <arg value="./configure"/> - </exec> -</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="${aprutil.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" - warnings="none" - debug="${debug}"> - <fileset dir="${aprutil.dir}" includes="**/*.c" - excludes="test/*.c ldap/*.c xml/expat/lib/*"/> - <fileset dir="${aprutil.dir}/xml/expat/lib" - includes="xmlparse.c xmlrole.c xmltok.c"/> - <fileset dir="${include.dir}" includes="*.h"/> - <fileset dir="${include.dir}/private" includes="*.h"/> - <fileset dir="${aprutil.dir}/xml/expat/lib" includes="*.h"/> - <fileset dir="${aprutil.dir}/xml/expat" includes="*.h"/> - <includepath path="${include.dir}"/> - <includepath path="${include.dir}/private"/> - <includepath path="${apr.include.dir}"/> - <includepath path="${aprutil.dir}/xml/expat/lib"/> - <includepath path="${aprutil.dir}/xml/expat"/> - <defineset define="APU_DECLARE_EXPORT" if="is-aprutil-shared"/> - <defineset define="APU_DECLARE_STATIC" unless="is-aprutil-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"/> - <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 crypt" if="is-unix"/> - <defineset if="is-bcc"> - <define name="EILSEQ" value="50"/> - </defineset> - <defineset> - <define name="APU_HAVE_APR_ICONV" value="0"/> - </defineset> - <project type="${project.type}" outfile="${project.dir}/aprutil" if="project.if"/> - </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="${aprutil.dir}/test" includes="${testfiles}"/> - <includepath path="${include.dir}"/> - <includepath path="${apr.include.dir}"/> - <defineset define="APU_DECLARE_STATIC" unless="is-aprutil-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"/> - <compilerarg value="${pic-option}" if="pic-option"/> - <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"/> - <project type="${project.type}" outfile="${project.dir}/aprutil-test" if="project.if"/> - </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"/> - </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}:${env.DYLD_LIBRARY_PATH}"/> - <env key="LD_LIBRARY_PATH" - value="${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/> - <env key="Path" - value="${apr.lib.dir}:${aprutil.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="${aprutil.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"/> - </fileset> - <includepath path="${include.dir}"/> - <includepath path="${apr.include.dir}"/> - <defineset define="APU_DECLARE_STATIC" unless="is-aprutil-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"/> - <compilerarg value="${pic-option}" if="pic-option"/> - <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> - -<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" - description="Builds all tests"/> - -<target name="check" - depends="build-testdbm, - build-testdbd, - run-testdate, - run-testxml, - run-testrmm, - run-testreslist, - run-testqueue, - run-testxlate, - 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> - - - -</project> + </exec> +</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="${aprutil.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" + warnings="none" + debug="${debug}"> + <fileset dir="${aprutil.dir}" includes="**/*.c" + excludes="test/*.c ldap/*.c xml/expat/lib/*"/> + <fileset dir="${aprutil.dir}/xml/expat/lib" + includes="xmlparse.c xmlrole.c xmltok.c"/> + <fileset dir="${aprutil.include.dir}" includes="*.h"/> + <fileset dir="${aprutil.include.dir}/private" includes="*.h"/> + <fileset dir="${aprutil.dir}/xml/expat/lib" includes="*.h"/> + <fileset dir="${aprutil.dir}/xml/expat" includes="*.h"/> + <includepath path="${aprutil.include.dir}"/> + <includepath path="${aprutil.include.dir}/private"/> + <includepath path="${apr.include.dir}"/> + <includepath path="${aprutil.dir}/xml/expat/lib"/> + <includepath path="${aprutil.dir}/xml/expat"/> + <defineset define="APU_DECLARE_EXPORT" if="is-aprutil-shared"/> + <defineset define="APU_DECLARE_STATIC" unless="is-aprutil-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"/> + <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 crypt" if="is-unix"/> + <defineset if="is-bcc"> + <define name="EILSEQ" value="50"/> + </defineset> + <defineset> + <define name="APU_HAVE_APR_ICONV" value="0"/> + </defineset> + <project type="${project.type}" outfile="${project.dir}/aprutil" if="project.if"/> + </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="${aprutil.dir}/test" includes="${testfiles}"/> + <includepath path="${aprutil.include.dir}"/> + <includepath path="${apr.include.dir}"/> + <defineset define="APU_DECLARE_STATIC" unless="is-aprutil-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"/> + <compilerarg value="${pic-option}" if="pic-option"/> + <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"/> + <project type="${project.type}" outfile="${project.dir}/aprutil-test" if="project.if"/> + </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"/> + </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}:${env.DYLD_LIBRARY_PATH}"/> + <env key="LD_LIBRARY_PATH" + value="${apr.lib.dir}:${aprutil.lib.dir}:${env.LD_LIBRARY_PATH}"/> + <env key="Path" + value="${apr.lib.dir}:${aprutil.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="${aprutil.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"/> + </fileset> + <includepath path="${aprutil.include.dir}"/> + <includepath path="${apr.include.dir}"/> + <defineset define="APU_DECLARE_STATIC" unless="is-aprutil-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"/> + <compilerarg value="${pic-option}" if="pic-option"/> + <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> + +<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" + description="Builds all tests"/> + +<target name="check" + depends="build-testdbm, + build-testdbd, + run-testdate, + run-testxml, + run-testrmm, + run-testreslist, + run-testqueue, + run-testxlate, + 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> + + + +</project> 1.65 +1 -1 logging-log4cxx/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/logging-log4cxx/build.xml,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- build.xml 4 May 2005 19:17:35 -0000 1.64 +++ build.xml 4 May 2005 21:32:16 -0000 1.65 @@ -441,7 +441,7 @@ <condition property="with-apr" value="../apr-${apr.version}/apr--config"> <isset property="is-cygwin"/> </condition> - <property name="with-apr" location="${apr.dir}/apr--config"/> + <property name="with-apr" location="${apr.dir}"/> </target>
