You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/01/30 06:32:06 UTC
svn commit: r616632 [2/2] - in /logging/log4cxx/trunk: ./ src/ src/ant/
src/apr-util/ src/apr/ src/assembly/ src/changes/ src/cppunit/
src/dependencies/ src/mock/ src/performance/cpp/xml/ src/site/apt/
src/site/fml/ src/site/xdoc/ src/test/java/org/apa...
Copied: logging/log4cxx/trunk/src/ant/apr-util-build.xml (from r616425, logging/log4cxx/trunk/src/apr-util/ant/build.xml)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-util-build.xml?p2=logging/log4cxx/trunk/src/ant/apr-util-build.xml&p1=logging/log4cxx/trunk/src/apr-util/ant/build.xml&r1=616425&r2=616632&rev=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/apr-util/ant/build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-util-build.xml Tue Jan 29 21:32:03 2008
@@ -16,6 +16,9 @@
limitations under the License.
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM 'common.xml'>
+]>
<!--
@@ -24,175 +27,90 @@
-->
-<project name="aprutil" default="check">
+<project name="aprutil" default="check" basedir=".">
-<property name="debug" value="true"/>
-<property name="version" value="1.2.2"/>
-<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"/>
+&common;
+<property name="src.dir" location="${basedir}"/>
+<property name="include.dir" location="${src.dir}/include"/>
+<property name="target.dir" location="${basedir}/target"/>
+<property name="projects.dir" location="${target.dir}"/>
-<taskdef resource="cpptasks.tasks"/>
-<typedef resource="cpptasks.types"/>
-
-<property name="apr.dir" location="${aprutil.dir}/../apr-${version}"/>
-<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
- 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>
-
- <property name="with-apr" value="${apr.dir}"/>
-
+<target name="init" depends="common-init">
</target>
<target name="clean" description="Deletes build products">
- <delete dir="${build.dir}"/>
+ <delete dir="${target.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"/>
+ <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="${src.dir}/xml/expat/lib/expat.h"/>
+ <available file="${src.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"/>
+ <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="${src.dir}/xml/expat/lib/expat.h" file="${src.dir}/xml/expat/lib/expat.h.in"/>
+ <copy tofile="${src.dir}/xml/expat/lib/config.h" file="${src.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}">
+<target name="unix-configure" depends="configure-check, find-apr" if="is-unix" unless="aprutil-config-available">
+ <exec executable="sh" dir="${src.dir}">
<arg value="./configure"/>
- <arg value="--with-apr=${with-apr}"/>
+ <arg value="--with-apr=${apr.dir}"/>
</exec>
- <exec executable="sh" dir="${aprutil.dir}/xml/expat">
+ <exec executable="sh" dir="${src.dir}/xml/expat">
<arg value="./configure"/>
</exec>
</target>
-<target name="configure" depends="unix-configure, win-configure"/>
+<target name="configure" depends="unix-configure, win-configure">
+ <condition property="has-iconv" value="1">
+ <isfileselected file="${include.dir}/apu.h">
+ <contains text="#define APR_HAVE_ICONV 1" ignorewhitespace="true"/>
+ </isfileselected>
+ </condition>
+ <condition property="has-iconv" value="1">
+ <isfileselected file="${include.dir}/apu.h">
+ <contains text="#define APU_HAVE_ICONV 1" ignorewhitespace="true"/>
+ </isfileselected>
+ </condition>
+ <condition property="has-sqlite3" value="1">
+ <isfileselected file="${include.dir}/apu.h">
+ <contains text="#define APU_HAVE_SQLITE3 1" ignorewhitespace="true"/>
+ </isfileselected>
+ </condition>
+</target>
-<target name="build" depends="configure" description="Build library">
- <mkdir dir="${aprutil.lib.dir}/aprutil_obj"/>
+<target name="build" depends="configure, find-apr" description="Build library">
+ <mkdir dir="${executable.dir}/apr-util-ofiles"/>
<!-- uses replace instead of preprocessor since
the quotes on VERSION cause problems with cpptasks -->
- <replace file="${aprutil.dir}/xml/expat/lib/xmlparse.c">
+ <replace file="${src.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"/>
@@ -200,85 +118,88 @@
</replace>
<property name="project.compiler" value="${compiler}"/>
<cc name="${project.compiler}"
- outfile="${aprutil.lib.dir}/aprutil-1${lib-suffix}"
+ outfile="${executable.dir}/aprutil-1${lib-suffix}"
subsystem="console"
multithreaded="true"
- outtype="${aprutil.lib.type}"
- objdir="${aprutil.lib.dir}/aprutil_obj"
+ outtype="${lib.type}"
+ objdir="${executable.dir}/apr-util-ofiles"
warnings="none"
debug="${debug}"
projectsOnly="${projectsOnly}">
- <fileset dir="${aprutil.dir}" includes="**/*.c"
+ <fileset dir="${src.dir}" includes="**/*.c"
excludes="test/*.c ldap/*.c xml/expat/lib/*"/>
- <fileset dir="${aprutil.dir}/xml/expat/lib"
+ <fileset dir="${src.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"/>
+ <fileset dir="${include.dir}" includes="*.h"/>
+ <fileset dir="${include.dir}/private" includes="*.h"/>
+ <fileset dir="${src.dir}/xml/expat/lib" includes="*.h"/>
+ <fileset dir="${src.dir}/xml/expat" includes="*.h"/>
<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"/>
+ <includepath path="${include.dir}"/>
+ <includepath path="${include.dir}/private"/>
+ <includepath path="${src.dir}/xml/expat/lib"/>
+ <includepath path="${src.dir}/xml/expat"/>
+ <defineset define="APU_DECLARE_EXPORT" if="is-shared"/>
+ <defineset define="APU_DECLARE_STATIC" unless="is-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 dir="${executable.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
- <libset libs="pthread dl crypt" if="is-unix"/>
+ <libset libs="pthread dl" if="is-unix"/>
+ <libset libs="iconv" if="has-iconv"/>
+ <libset libs="sqlite3" if="has-sqlite3"/>
<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"/>
+ <project type="${project.type}" outfile="${projects.dir}/aprutil" if="project.if"/>
</cc>
+ <property name="apr.lib.dir" location="${executable.dir}"/>
</target>
<target name="build-test">
- <mkdir dir="${aprutil.lib.dir}/apr_obj"/>
+ <mkdir dir="${executable.dir}/apr-util-test-ofiles"/>
<property name="project.compiler" value="${compiler}"/>
<cc name="${project.compiler}"
- outfile="${aprutil.lib.dir}/${test}"
+ outfile="${executable.dir}/${test}"
subsystem="console"
multithreaded="true"
outtype="executable"
- objdir="${aprutil.lib.dir}/apr_obj"
+ objdir="${executable.dir}/apr-util-test-ofiles"
debug="${debug}"
projectsOnly="${projectsOnly}">
- <fileset dir="${aprutil.dir}/test" includes="${testfiles}"/>
- <includepath path="${aprutil.include.dir}"/>
+ <fileset dir="${src.dir}/test" includes="${include.files}" excludes="${exclude.files}"/>
+ <includepath path="${include.dir}"/>
<includepath path="${apr.include.dir}"/>
- <defineset define="APU_DECLARE_STATIC" unless="is-aprutil-shared"/>
+ <defineset define="APU_DECLARE_STATIC" unless="is-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 dir="${apr.lib.dir}" libs="apr-1${lib-suffix}" if="apr.lib.dir"/>
+ <libset libs="apr-1${lib-suffix}" unless="apr.lib.dir"/>
+ <libset dir="${executable.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"/>
+ <libset libs="pthread dl" if="is-unix"/>
+ <libset libs="iconv" if="has-iconv"/>
+ <libset libs="sqlite3" if="has-sqlite3"/>
+ <project type="${project.type}" outfile="${projects.dir}/${test}" if="project.if"/>
</cc>
</target>
<target name="copy-apr" if="is-windows">
- <copy todir="${aprutil.lib.dir}">
+ <copy todir="${executable.dir}" overwrite="true">
<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}"
+ <exec executable="${executable.dir}/${test}"
+ dir="${executable.dir}"
failonerror="true">
<env key="DYLD_LIBRARY_PATH"
value="${apr.lib.dir}:${aprutil.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
@@ -290,197 +211,86 @@
</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">
+<target name="build-testall" depends="build">
<antcall target="build-test">
- <param name="test" value="testxml"/>
- <param name="testfiles" value="testxml.c"/>
+ <param name="test" value="testall"/>
+ <param name="include.files" value="**/*.c"/>
+ <param name="exclude.files" value="dbd.c testssl.c echod.c sockperf.c nw*.c"/>
</antcall>
</target>
-<target name="run-testxml" depends="build-testxml">
+<target name="run-testall" depends="build-testall">
<antcall target="run-test">
- <param name="test" value="testxml"/>
+ <param name="test" value="testall"/>
</antcall>
</target>
-<target name="build-testrmm" depends="build">
+<target name="build-dbd" depends="build">
<antcall target="build-test">
- <param name="test" value="testrmm"/>
- <param name="testfiles" value="testrmm.c"/>
+ <param name="test" value="dbd"/>
+ <param name="include.files" value="dbd.c"/>
+ <param name="exclude.files" value="*.y"/>
</antcall>
</target>
-<target name="run-testrmm" depends="build-testrmm">
+<target name="run-dbd" depends="build-dbd">
<antcall target="run-test">
- <param name="test" value="testrmm"/>
+ <param name="test" value="dbd"/>
</antcall>
</target>
-<target name="build-testreslist" depends="build" unless="is-windows">
+<target name="build-testssl" depends="build">
<antcall target="build-test">
- <param name="test" value="testreslist"/>
- <param name="testfiles" value="testreslist.c"/>
+ <param name="test" value="testssl"/>
+ <param name="include.files" value="testssl.c"/>
</antcall>
</target>
-<target name="run-testreslist" depends="build-testreslist" unless="is-windows">
+<target name="run-testssl" depends="build-testssl">
<antcall target="run-test">
- <param name="test" value="testreslist"/>
+ <param name="test" value="testssl"/>
</antcall>
</target>
-<target name="build-testqueue" depends="build">
+<target name="build-echod" depends="build">
<antcall target="build-test">
- <param name="test" value="testqueue"/>
- <param name="testfiles" value="testqueue.c"/>
+ <param name="test" value="echod"/>
+ <param name="include.files" value="echod.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">
+<target name="build-sockperf" 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"/>
- <property name="project.compiler" value="${compiler}"/>
- <cc name="${project.compiler}"
- outfile="${aprutil.lib.dir}/testall"
- subsystem="console"
- multithreaded="true"
- outtype="executable"
- objdir="${aprutil.lib.dir}/apr_obj"
- debug="${debug}"
- projectsOnly="${projectsOnly}">
- <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"/>
+ <param name="test" value="sockperf"/>
+ <param name="include.files" value="sockperf.c"/>
</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"
+ depends="build-testall, build-dbd, build-testssl, build-echod"
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"
+ depends="build-check"
description="Runs all tests"/>
<target name="build-projects">
- <mkdir dir="${project.dir}"/>
+ <mkdir dir="${projects.dir}"/>
<antcall target="build">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
- <param name="projects.dir" value="${project.dir}"/>
+ <param name="projects.dir" value="${projects.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
</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="projects.dir" value="${projects.dir}"/>
<param name="project.type" value="msvc6"/>
<param name="project.compiler" value="msvc"/>
</antcall>
@@ -488,7 +298,7 @@
<target name="build-projects-vc8" description="Builds project files for Microsoft Visual C++ 2005">
<antcall target="build-projects">
- <param name="project.dir" value="msvc"/>
+ <param name="projects.dir" value="${projects.dir}"/>
<param name="project.type" value="msvc8"/>
<param name="project.compiler" value="msvc"/>
</antcall>
@@ -496,16 +306,8 @@
<target name="build-projects-xcode" description="Builds project files for Apple Xcode">
<antcall target="build-projects">
- <param name="project.dir" value="xcode"/>
+ <param name="projects.dir" value="${projects.dir}"/>
<param name="project.type" value="xcode"/>
- <param name="project.compiler" value="${compiler}"/>
- </antcall>
- </target>
-
- <target name="build-projects-cbx" description="Builds project files for Borland CBuilderX">
- <antcall target="build-projects">
- <param name="project.dir" value="cbx"/>
- <param name="project.type" value="cbuilderx"/>
<param name="project.compiler" value="${compiler}"/>
</antcall>
</target>
Added: logging/log4cxx/trunk/src/ant/common.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/common.xml?rev=616632&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/ant/common.xml (added)
+++ logging/log4cxx/trunk/src/ant/common.xml Tue Jan 29 21:32:03 2008
@@ -0,0 +1,352 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+
+-->
+
+
+<property file="build.properties"/>
+<property name="debug" value="true"/>
+<property name="rtti" value="false"/>
+<property name="optimize" value="none"/>
+<property name="lib.type" value="shared"/>
+
+<taskdef resource="cpptasks.tasks"/>
+<typedef resource="cpptasks.types"/>
+
+<target name="os-detect">
+ <condition property="is-mac" value="true">
+ <and>
+ <os family="mac"/>
+ <not><isset property="is-windows"/></not>
+ </and>
+ </condition>
+ <condition property="is-unix" value="true">
+ <or>
+ <isset property="is-mac"/>
+ <equals arg1="${os.family}" arg2="cygwin"/>
+ <and>
+ <os family="unix"/>
+ <not><isset property="is-windows"/></not>
+ </and>
+ </or>
+ </condition>
+ <condition property="is-windows" value="true">
+ <and>
+ <os family="windows"/>
+ <not><isset property="is-unix"/></not>
+ </and>
+ </condition>
+ <condition property="os.family" value="windows">
+ <isset property="is-windows"/>
+ </condition>
+ <condition property="os.family" value="unix">
+ <isset property="is-unix"/>
+ </condition>
+
+
+</target>
+
+
+<target name="win-init" depends="os-detect" if="is-windows">
+ <property name="lib.prefix" value=""/>
+ <property name="lib.extension" value=".lib"/>
+ <property name="project.type" value="msvc6"/>
+ <property name="compiler" value="msvc"/>
+
+ <condition property="is-bcc" value="true">
+ <or>
+ <equals arg1="${compiler}" arg2="bcc"/>
+ </or>
+ </condition>
+
+ <condition property="is-mingw" value="true">
+ <isset property="is-gcc"/>
+ </condition>
+</target>
+
+<target name="mac-init" depends="os-detect" if="is-mac">
+ <property name="project.type" value="xcode"/>
+</target>
+
+
+<target name="unix-init" depends="mac-init" if="is-unix">
+
+ <property name="compiler" value="gcc"/>
+
+ <property name="lib.prefix" value="lib"/>
+ <property name="lib.extension" value=".a"/>
+ <property name="project.type" value="cbuilderx"/>
+ <property name="compiler" value="g++"/>
+ <property name="lib-suffix" value=""/>
+
+ <condition property="has-expat" value="true">
+ <not><isset property="is-mac"/></not>
+ </condition>
+ <condition property="is-cygwin" value="true">
+ <os family="windows"/>
+ </condition>
+</target>
+
+
+<target name="common-init" depends="win-init, unix-init">
+ <available classname="net.sf.antcontrib.cpptasks.CCTask" property="cctask-available"/>
+ <fail unless="cctask-available">cpptasks required
+
+Use CVS HEAD or Feb 2005 or later release from
+http://ant-contrib.sourceforge.net.
+</fail>
+
+ <available classname="net.sf.antcontrib.cpptasks.ide.ProjectDef"
+ property="cctask-project-available"/>
+ <!-- fail unless="cctask-project-available">later version of cpptasks required
+
+Required features not present in cpptasks releases prior to Feb 2005</fail -->
+
+ <mkdir dir="${target.dir}"/>
+ <mkdir dir="${projects.dir}"/>
+
+ <condition property="is-gcc" value="true">
+ <or>
+ <equals arg1="${compiler}" arg2="gcc"/>
+ <equals arg1="${compiler}" arg2="g++"/>
+ </or>
+ </condition>
+
+ <condition property="pic-option" value="-fPIC">
+ <and>
+ <isset property="is-gcc"/>
+ <istrue value="${use-pic}"/>
+ </and>
+ </condition>
+
+
+ <condition property="is-debug" value="true">
+ <istrue value="${debug}"/>
+ </condition>
+
+ <condition property="debug.release" value="debug">
+ <isset property="is-debug"/>
+ </condition>
+ <property name="debug.release" value="release"/>
+
+
+ <condition property="lib-suffix" value="d">
+ <isset property="is-debug"/>
+ </condition>
+ <property name="lib-suffix" value=""/>
+
+
+ <condition property="is-static" value="1">
+ <equals arg1="${lib.type}" arg2="static"/>
+ </condition>
+ <condition property="is-shared" value="1">
+ <equals arg1="${lib.type}" arg2="shared"/>
+ </condition>
+ <condition property="static.shared" value="static">
+ <equals arg1="${lib.type}" arg2="static"/>
+ </condition>
+ <property name="static.shared" value="shared"/>
+
+ <property name="executable.dir" value="${target.dir}/${debug.release}/${static.shared}"/>
+
+ <property name="projectsOnly" value="false"/>
+
+</target>
+
+
+<target name="copy-if-changed-checksum" unless="force-copy">
+ <condition property="force-copy" value="2">
+ <not><filesmatch file1="${tofile}" file2="${file}"/></not>
+ </condition>
+</target>
+
+<target name="copy-if-changed" depends="copy-if-changed-checksum" if="force-copy">
+ <copy tofile="${tofile}" file="${file}" overwrite="true"/>
+</target>
+
+
+<target name="find-apr" depends="init">
+ <condition property="apr.dir" value="${with-apr}">
+ <available file="${with-apr}"/>
+ </condition>
+ <property name="apr.lib.name" value="apr-1"/>
+ <condition property="apr.dir" value="/usr">
+ <or>
+ <available file="/usr/lib/lib${apr.lib.name}.a"/>
+ <available file="/usr/lib/lib${apr.lib.name}.la"/>
+ </or>
+ </condition>
+ <condition property="apr.dir" value="/usr/local/apr">
+ <available file="/usr/local/apr"/>
+ </condition>
+ <property name="relative-apr" location="../apr"/>
+ <condition property="apr.dir" value="${relative-apr}">
+ <available file="${relative-apr}"/>
+ </condition>
+ <fail unless="apr.dir">Unable to locate APR base directory.</fail>
+
+ <condition property="apr.include.dir" value="${apr.dir}/include/apr-1.0">
+ <available file="${apr.dir}/include/apr-1.0/apr_pools.h"/>
+ </condition>
+ <condition property="apr.include.dir" value="${apr.dir}/include/apr-1">
+ <available file="${apr.dir}/include/apr-1/apr_pools.h"/>
+ </condition>
+ <condition property="apr.include.dir" value="${apr.dir}/include">
+ <available file="${apr.dir}/include/apr_pools.h"/>
+ </condition>
+ <fail unless="apr.include.dir">Unable to locate APR include directory.</fail>
+
+ <condition property="apr.lib.dir" value="${apr.dir}/lib">
+ <and>
+ <not><equals arg1="${apr.dir}" arg2="/usr"/></not>
+ <or>
+ <available file="${apr.dir}/lib/lib${apr.lib.name}.a"/>
+ <available file="${apr.dir}/lib/lib${apr.lib.name}.la"/>
+ <available file="${apr.dir}/lib/${apr.lib.name}.lib"/>
+ <available file="${apr.dir}/lib/${apr.lib.name}d.lib"/>
+ </or>
+ </and>
+ </condition>
+ <condition property="apr.lib.dir" value="${apr.dir}/.libs">
+ <and>
+ <not><equals arg1="${apr.dir}" arg2="/usr"/></not>
+ <or>
+ <available file="${apr.dir}/.libs/lib${apr.lib.name}.a"/>
+ <available file="${apr.dir}/.libs/lib${apr.lib.name}.la"/>
+ <available file="${apr.dir}/.libs/${apr.lib.name}.lib"/>
+ <available file="${apr.dir}/.libs/${apr.lib.name}d.lib"/>
+ </or>
+ </and>
+ </condition>
+ <condition property="apr.lib.dir" value="${apr.dir}/target/${debug.release}/static">
+ <or>
+ <available file="${apr.dir}/target/${debug.release}/static/lib${apr.lib.name}${lib-suffix}.a"/>
+ <available file="${apr.dir}/target/${debug.release}/static/lib${apr.lib.name}${lib-suffix}.la"/>
+ <available file="${apr.dir}/target/${debug.release}/static/${apr.lib.name}${lib-suffix}.lib"/>
+ </or>
+ </condition>
+ <condition property="apr.lib.dir" value="${apr.dir}/target/${debug.release}/shared">
+ <or>
+ <available file="${apr.dir}/target/${debug.release}/shared/lib${apr.lib.name}${lib-suffix}.a"/>
+ <available file="${apr.dir}/target/${debug.release}/shared/lib${apr.lib.name}${lib-suffix}.la"/>
+ <available file="${apr.dir}/target/${debug.release}/shared/${apr.lib.name}${lib-suffix}.lib"/>
+ </or>
+ </condition>
+
+ <condition property="apr-available" value="1">
+ <or>
+ <equals arg1="${apr.dir}" arg2="/usr"/>
+ <isset property="apr.lib.dir"/>
+ </or>
+ </condition>
+
+ <condition property="apr.src.dir" value="${with-apr}">
+ <available file="${with-apr}/file_io/unix/dir.c"/>
+ </condition>
+
+ <condition property="apr.src.dir" value="${relative-apr}">
+ <available file="${relative-apr}/file_io/unix/dir.c"/>
+ </condition>
+</target>
+
+
+
+
+<target name="find-apr-util" depends="init">
+ <condition property="apr-util.dir" value="${with-apr-util}">
+ <available file="${with-apr-util}"/>
+ </condition>
+ <property name="apr-util.lib.name" value="aprutil-1"/>
+ <condition property="apr-util.dir" value="/usr">
+ <or>
+ <available file="/usr/lib/lib${apr-util.lib.name}.a"/>
+ <available file="/usr/lib/lib${apr-util.lib.name}.la"/>
+ </or>
+ </condition>
+ <condition property="apr-util.dir" value="/usr/local/apr">
+ <available file="/usr/local/apr"/>
+ </condition>
+ <property name="relative-apr-util" location="../apr-util"/>
+ <condition property="apr-util.dir" value="${relative-apr-util}">
+ <available file="${relative-apr-util}"/>
+ </condition>
+ <fail unless="apr.dir">Unable to locate APR-Util base directory.</fail>
+
+ <condition property="apr-util.include.dir" value="${apr-util.dir}/include/apr-1.0">
+ <available file="${apr-util.dir}/include/apr-1.0/apr_xml.h"/>
+ </condition>
+ <condition property="apr-util.include.dir" value="${apr-util.dir}/include/apr-1">
+ <available file="${apr-util.dir}/include/apr-1/apr_xml.h"/>
+ </condition>
+ <condition property="apr-util.include.dir" value="${apr-util.dir}/include">
+ <available file="${apr-util.dir}/include/apr_xml.h"/>
+ </condition>
+ <fail unless="apr-util.include.dir">Unable to locate APR include directory.</fail>
+
+ <condition property="apr-util.lib.dir" value="${apr-util.dir}/lib">
+ <and>
+ <not><equals arg1="${apr-util.dir}" arg2="/usr"/></not>
+ <or>
+ <available file="${apr-util.dir}/lib/lib${apr-util.lib.name}.a"/>
+ <available file="${apr-util.dir}/lib/lib${apr-util.lib.name}.la"/>
+ <available file="${apr-util.dir}/lib/${apr-util.lib.name}.lib"/>
+ <available file="${apr-util.dir}/lib/${apr-util.lib.name}d.lib"/>
+ </or>
+ </and>
+ </condition>
+ <condition property="apr-util.lib.dir" value="${apr-util.dir}/.libs">
+ <and>
+ <not><equals arg1="${apr-util.dir}" arg2="/usr"/></not>
+ <or>
+ <available file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a"/>
+ <available file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la"/>
+ <available file="${apr-util.dir}/.libs/${apr-util.lib.name}.lib"/>
+ <available file="${apr-util.dir}/.libs/${apr-util.lib.name}d.lib"/>
+ </or>
+ </and>
+ </condition>
+ <condition property="apr-util.lib.dir" value="${apr-util.dir}/target/${debug.release}/static">
+ <or>
+ <available file="${apr-util.dir}/target/${debug.release}/static/lib${apr-util.lib.name}${lib-suffix}.a"/>
+ <available file="${apr-util.dir}/target/${debug.release}/static/lib${apr-util.lib.name}${lib-suffix}.la"/>
+ <available file="${apr-util.dir}/target/${debug.release}/static/${apr-util.lib.name}${lib-suffix}.lib"/>
+ </or>
+ </condition>
+ <condition property="apr-util.lib.dir" value="${apr-util.dir}/target/${debug.release}/shared">
+ <or>
+ <available file="${apr-util.dir}/target/${debug.release}/shared/lib${apr-util.lib.name}${lib-suffix}.a"/>
+ <available file="${apr-util.dir}/target/${debug.release}/shared/lib${apr-util.lib.name}${lib-suffix}.la"/>
+ <available file="${apr-util.dir}/target/${debug.release}/shared/${apr-util.lib.name}${lib-suffix}.lib"/>
+ </or>
+ </condition>
+
+
+ <condition property="apr-util-available" value="1">
+ <or>
+ <equals arg1="${apr-util.dir}" arg2="/usr"/>
+ <isset property="apr-util.lib.dir"/>
+ </or>
+ </condition>
+
+ <condition property="apr-util.src.dir" value="${with-apr-util}">
+ <available file="${with-apr-util}/xml/apr_xml.c"/>
+ </condition>
+
+ <condition property="apr-util.src.dir" value="${relative-apr-util}">
+ <available file="${relative-apr-util}/xml/apr_xml.c"/>
+ </condition>
+</target>
+
Copied: logging/log4cxx/trunk/src/ant/esmtp-build.xml (from r616425, logging/log4cxx/trunk/src/dependencies/esmtp/build.xml)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/esmtp-build.xml?p2=logging/log4cxx/trunk/src/ant/esmtp-build.xml&p1=logging/log4cxx/trunk/src/dependencies/esmtp/build.xml&r1=616425&r2=616632&rev=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/dependencies/esmtp/build.xml (original)
+++ logging/log4cxx/trunk/src/ant/esmtp-build.xml Tue Jan 29 21:32:03 2008
@@ -1,4 +1,7 @@
<?xml version="1.0"?>
+<!DOCTYPE project [
+<!ENTITY common SYSTEM 'common.xml'>
+]>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -17,6 +20,7 @@
-->
+
<!--
This file builds libesmtp using Apache Ant (http://ant.apache.org)
@@ -26,131 +30,46 @@
-->
<project name="esmtp" default="build">
-<property name="debug" value="true"/>
-<property name="esmtp.version" value="1.0.4"/>
-<property name="esmtp.dir" location="${ant.file}/../../../../../libesmtp-${esmtp.version}"/>
-<property name="esmtp.include.dir" location="${esmtp.dir}"/>
-<property name="esmtp.win.include.dir" location="${ant.file}/../win32"/>
-<property name="build.dir" location="${user.dir}/target"/>
-<property name="src.dir" location="${esmtp.dir}"/>
-<property name="esmtp.lib.type" value="shared"/>
-<property name="project.dir" location="${build.dir}"/>
+&common;
-<taskdef resource="cpptasks.tasks"/>
-<typedef resource="cpptasks.types"/>
+<property name="src.dir" location="${basedir}"/>
+<property name="include.dir" location="${src.dir}"/>
+<property name="test.dir" location="${src.dir}/test"/>
+<property name="target.dir" location="${basedir}/target"/>
+<property name="lib.type" value="shared"/>
+<property name="projects.dir" location="${target.dir}"/>
<target name="usage" description="Displays usage notes on build">
<echo>
</echo>
</target>
-<target name="os-detect">
- <condition property="is-mac" value="true">
- <and>
- <os family="mac"/>
- <not><isset property="is-windows"/></not>
- </and>
- </condition>
- <condition property="is-unix" value="true">
- <and>
- <not>
- <or>
- <isset property="is-windows"/>
- <equals arg1="${os.family}" arg2="windows"/>
- </or>
- </not>
- <or>
- <os family="unix"/>
- <equals arg1="${os.family}" arg2="cygwin"/>
- <equals arg1="${os.family}" arg2="unix"/>
- </or>
- </and>
- </condition>
- <condition property="is-windows" value="true">
- <and>
- <not><isset property="is-unix"/></not>
- <or>
- <os family="windows"/>
- <equals arg1="${os.family}" arg2="windows"/>
- </or>
- </and>
- </condition>
-</target>
-
-
-<target name="win-init" depends="os-detect" if="is-windows">
- <property name="compiler" value="msvc"/>
- <property name="arch" value="win32"/>
- <property name="project.type" value="msvc6"/>
-</target>
-
-<target name="unix-init" depends="os-detect" if="is-unix">
- <property name="compiler" value="gcc"/>
- <condition property="is-gcc" value="true">
- <or>
- <equals arg1="${compiler}" arg2="gcc"/>
- <equals arg1="${compiler}" arg2="g++"/>
- </or>
- </condition>
- <property name="arch" value="unix"/>
- <property name="project.type" value="cbuilderx"/>
-</target>
-
-<target name="init" depends="win-init, unix-init">
- <property environment="env"/>
- <condition property="pic-option" value="-fPIC">
- <and>
- <isset property="is-gcc"/>
- <istrue value="${use-pic}"/>
- </and>
- </condition>
-
- <condition property="is-debug" value="true">
- <istrue value="${debug}"/>
- </condition>
-
- <condition property="esmtp.lib.dir" value="${build.dir}/debug/${esmtp.lib.type}">
- <isset property="is-debug"/>
- </condition>
- <property name="esmtp.lib.dir" location="${build.dir}/release/${esmtp.lib.type}"/>
- <mkdir dir="${esmtp.lib.dir}"/>
-
- <condition property="lib-suffix" value="d">
- <isset property="is-debug"/>
- </condition>
- <property name="lib-suffix" value=""/>
-
- <condition property="is-esmtp-shared" value="true">
- <equals arg1="${esmtp.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 name="init" depends="common-init">
</target>
<target name="clean" description="Removes build product files">
- <delete dir="${build.dir}"/>
+ <delete dir="${target.dir}"/>
</target>
<target name="configure-check" depends="init">
<condition property="esmtp-configure-available" value="true">
- <available file="${esmtp.include.dir}/libesmtp.h"/>
+ <available file="${include.dir}/libesmtp.h"/>
</condition>
</target>
-<target name="win-configure" depends="configure-check" if="is-windows" unless="esmtp-configure-available">
- <copy tofile="${esmtp.include.dir}/libesmtp.h" file="${esmtp.include.dir}/libesmtp.hw"/>
+<target name="win-configure" depends="configure-check" if="is-windows">
+ <antcall target="copy-if-changed">
+ <param name="file" value="${include.dir}/config.h.in"/>
+ <param name="tofile" value="${include.dir}/config.h"/>
+ </antcall>
</target>
<target name="unix-configure" depends="configure-check" if="is-unix" unless="esmtp-configure-available">
<!-- shelling to configure allows cygwin to work -->
- <exec executable="sh" dir="${esmtp.dir}">
+ <exec executable="sh" dir="${src.dir}">
<arg value="./configure"/>
</exec>
</target>
@@ -160,14 +79,14 @@
<target name="build" depends="configure" description="Build library">
- <mkdir dir="${esmtp.lib.dir}/esmtp_obj"/>
+ <mkdir dir="${executable.dir}/libesmtp-ofiles"/>
<property name="project.compiler" value="${compiler}"/>
<cc name="${project.compiler}"
- outfile="${esmtp.lib.dir}/esmtp${lib-suffix}"
+ outfile="${executable.dir}/esmtp${lib-suffix}"
subsystem="console"
multithreaded="true"
- outtype="${esmtp.lib.type}"
- objdir="${esmtp.lib.dir}/esmtp_obj"
+ outtype="${lib.type}"
+ objdir="${executable.dir}/libesmtp-ofiles"
outputfileproperty="esmtp.dll"
debug="${debug}"
projectsOnly="${projectsOnly}">
@@ -180,17 +99,13 @@
<exclude name="auth-client.c" if="is-windows"/>
<!-- exclude name="siobuf.c" if="is-windows"/ -->
</fileset>
- <includepath path="${esmtp.win.include.dir}" if="is-windows"/>
- <includepath path="${esmtp.include.dir}"/>
+ <includepath path="${include.dir}"/>
<defineset define="HAVE_CONFIG_H"/>
- <defineset>
- <define name="VERSION" value='"${esmtp.version}"'/>
- </defineset>
<compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
<libset libs="ssl crypto" if="is-unix"/>
<libset libs="cw32mt" if="is-bcc"/>
- <project type="${project.type}" outfile="${project.dir}/esmtp" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/libesmtp" if="project.if"/>
</cc>
</target>
@@ -201,14 +116,13 @@
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
<param name="project.compiler" value="${project.compiler}"/>
- <param name="projects.dir" value="${project.dir}"/>
+ <param name="projects.dir" value="${projects.dir}"/>
<param name="projectsOnly" value="true"/>
</antcall>
</target>
<target name="build-projects-vc6" description="Builds project files for Microsoft Visual C++ 6">
<antcall target="build-projects">
- <param name="project.dir" value="msvc"/>
<param name="project.type" value="msvc6"/>
<param name="project.compiler" value="msvc"/>
</antcall>
@@ -216,7 +130,6 @@
<target name="build-projects-vc8" description="Builds project files for Microsoft Visual C++ 2005">
<antcall target="build-projects">
- <param name="project.dir" value="msvc"/>
<param name="project.type" value="msvc8"/>
<param name="project.compiler" value="msvc"/>
</antcall>
@@ -224,20 +137,10 @@
<target name="build-projects-xcode" description="Builds project files for Apple Xcode">
<antcall target="build-projects">
- <param name="project.dir" value="xcode"/>
<param name="project.type" value="xcode"/>
- <param name="project.compiler" value="${compiler}"/>
- </antcall>
-</target>
-
-<target name="build-projects-cbx" description="Builds project files for Borland CBuilderX">
- <antcall target="build-projects">
- <param name="project.dir" value="cbx"/>
- <param name="project.type" value="cbuilderx"/>
- <param name="project.compiler" value="${compiler}"/>
+ <param name="project.compiler" value="g++"/>
</antcall>
</target>
-
</project>
Copied: logging/log4cxx/trunk/src/assembly/source.xml (from r616425, logging/log4cxx/trunk/src/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/assembly/source.xml?p2=logging/log4cxx/trunk/src/assembly/source.xml&p1=logging/log4cxx/trunk/src/assembly/bin.xml&r1=616425&r2=616632&rev=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/assembly/bin.xml (original)
+++ logging/log4cxx/trunk/src/assembly/source.xml Tue Jan 29 21:32:03 2008
@@ -16,7 +16,7 @@
-->
<assembly>
- <id>bin</id>
+ <id>source</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
@@ -26,16 +26,16 @@
<fileSets>
<fileSet>
<includes>
- <include>*.sh</include>
- <include>*.in</include>
- <include>*.m4</include>
+ <include>*.sh</include>
+ <include>*.in</include>
+ <include>*.m4</include>
<include>*.xml</include>
<include>INSTALL</include>
<include>KEYS</include>
<include>LICENSE</include>
<include>NOTICE</include>
<include>src/**</include>
- <exclude>src/test/resources/output</exclude>
+ <exclude>src/test/resources/output</exclude>
</includes>
</fileSet>
</fileSets>
Added: logging/log4cxx/trunk/src/changes/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/changes/Makefile.am?rev=616632&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/changes/Makefile.am (added)
+++ logging/log4cxx/trunk/src/changes/Makefile.am Tue Jan 29 21:32:03 2008
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
Modified: logging/log4cxx/trunk/src/performance/cpp/xml/logging300.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/performance/cpp/xml/logging300.xml?rev=616632&r1=616631&r2=616632&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/performance/cpp/xml/logging300.xml (original)
+++ logging/log4cxx/trunk/src/performance/cpp/xml/logging300.xml Tue Jan 29 21:32:03 2008
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+
+-->
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP" />
Added: logging/log4cxx/trunk/src/site/apt/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/Makefile.am?rev=616632&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/Makefile.am (added)
+++ logging/log4cxx/trunk/src/site/apt/Makefile.am Tue Jan 29 21:32:03 2008
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
Added: logging/log4cxx/trunk/src/site/fml/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/fml/Makefile.am?rev=616632&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/site/fml/Makefile.am (added)
+++ logging/log4cxx/trunk/src/site/fml/Makefile.am Tue Jan 29 21:32:03 2008
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
Added: logging/log4cxx/trunk/src/site/xdoc/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/xdoc/Makefile.am?rev=616632&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/site/xdoc/Makefile.am (added)
+++ logging/log4cxx/trunk/src/site/xdoc/Makefile.am Tue Jan 29 21:32:03 2008
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#