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 2005/02/06 05:10:42 UTC
cvs commit: logging-log4cxx apr-build.xml apriconv-build.xml aprutil-build.xml build.xml cppunit-build.xml
carnold 2005/02/05 20:10:42
Modified: . apr-build.xml apriconv-build.xml aprutil-build.xml
build.xml cppunit-build.xml
Log:
LOGCXX-25: Ant build linux iteration
Revision Changes Path
1.2 +6 -2 logging-log4cxx/apr-build.xml
Index: apr-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apr-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr-build.xml 6 Feb 2005 02:04:33 -0000 1.1
+++ apr-build.xml 6 Feb 2005 04:10:42 -0000 1.2
@@ -101,8 +101,8 @@
<copy tofile="${include.dir}/apr.h" file="${include.dir}/apr.hw"/>
</target>
-<target name="unix-configure" depends="configure-check" if="is-unix" unless="apr_h-available">
- <exec executable="configure" dir="${base.dir}"/>
+<target name="unix-configure" depends="configure-check" if="is-unix" unless="configure-available">
+ <exec executable="${base.dir}/configure" dir="${base.dir}"/>
</target>
@@ -135,6 +135,10 @@
<defineset define="APR_DECLARE_EXPORT" if="is-shared"/>
<defineset define="APR_DECLARE_STATIC" unless="is-shared"/>
<defineset define="WIN32" if="is-windows"/>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE _LARGEFILE64_SOURCE"
+ unless="is-windows">
+ <define name="LINUX" value="2"/>
+ </defineset>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
</cc>
</target>
1.2 +12 -2 logging-log4cxx/apriconv-build.xml
Index: apriconv-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apriconv-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apriconv-build.xml 6 Feb 2005 02:04:33 -0000 1.1
+++ apriconv-build.xml 6 Feb 2005 04:10:42 -0000 1.2
@@ -37,6 +37,7 @@
<typedef resource="cpptasks.types"/>
<property name="apr.dir" location="${base.dir}/../apr-1.1.0"/>
<property name="apr.include.dir" location="${apr.dir}/include"/>
+<property name="with-apr" value="${apr.dir}"/>
<target name="usage">
<echo>
@@ -104,11 +105,15 @@
<copy tofile="${base.dir}/lib/apr_iconv_private.h" file="${base.dir}/lib/apr_iconv_private.h.in"/>
</target>
-<target name="unix-configure" depends="configure-check" if="is-unix" unless="apr_h-available">
- <exec executable="configure" dir="${base.dir}"/>
+<target name="unix-configure" depends="configure-check" if="is-unix" unless="configure-available">
+ <exec executable="${base.dir}/configure" dir="${base.dir}">
+ <arg value="--with-apr=${with-apr}"/>
+ </exec>
</target>
+
+
<target name="configure" depends="unix-configure, win-configure"/>
@@ -125,9 +130,14 @@
<includepath path="${include.dir}"/>
<includepath path="${base.dir}/lib"/>
<includepath path="${apr.include.dir}"/>
+ <includepath path="${apr.include.dir}/private"/>
<defineset define="API_DECLARE_EXPORT" if="is-shared"/>
<defineset define="API_DECLARE_STATIC" unless="is-shared"/>
<defineset define="WIN32" if="is-windows"/>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE _LARGEFILE64_SOURCE"
+ unless="is-windows">
+ <define name="LINUX" value="2"/>
+ </defineset>
</cc>
</target>
1.2 +24 -6 logging-log4cxx/aprutil-build.xml
Index: aprutil-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/aprutil-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprutil-build.xml 6 Feb 2005 02:04:33 -0000 1.1
+++ aprutil-build.xml 6 Feb 2005 04:10:42 -0000 1.2
@@ -39,8 +39,10 @@
<property name="apr.dir" location="${base.dir}/../apr-1.1.0"/>
<property name="apr.include.dir" location="${apr.dir}/include"/>
+<property name="with-apr" value="${apr.dir}"/>
<property name="apriconv.dir" location="${base.dir}/../apr-iconv-1.0.1"/>
<property name="apriconv.include.dir" location="${apriconv.dir}/include"/>
+<property name="with-apr-iconv" value="${apriconv.dir}"/>
<target name="usage">
<echo>
@@ -106,7 +108,7 @@
<available file="${include.dir}/private/apu_config.h"/>
<available file="${include.dir}/private/apu_select_dbm.h"/>
<available file="${base.dir}/xml/expat/lib/expat.h"/>
- <available file="${base.dir}/xml/expat/lib/config.h"/>
+ <available file="${base.dir}/xml/expat/config.h"/>
</and>
</condition>
</target>
@@ -121,8 +123,12 @@
<copy tofile="${base.dir}/xml/expat/lib/config.h" file="${base.dir}/xml/expat/lib/winconfig.h"/>
</target>
-<target name="unix-configure" depends="configure-check" if="is-unix" unless="apr_h-available">
- <exec executable="configure" dir="${base.dir}"/>
+<target name="unix-configure" depends="configure-check" if="is-unix" unless="config-available">
+ <exec executable="${base.dir}/configure" dir="${base.dir}">
+ <arg value="--with-apr=${with-apr}"/>
+ <arg value="--with-apr-iconv=${with-apr-iconv}"/>
+ </exec>
+ <exec executable="${base.dir}/xml/expat/configure" dir="${base.dir}/xml/expat"/>
</target>
@@ -138,24 +144,36 @@
outtype="${lib.type}"
objdir="${executable.dir}/${lib.type}/aprutil_obj"
debug="${debug}">
- <fileset dir="${base.dir}" includes="**/*.c"
+ <fileset dir="${base.dir}" includes="**/*.c"
excludes="test/*.c ldap/*.c xml/expat/lib/*"/>
- <fileset dir="${base.dir}/xml/expat/lib"
+ <fileset dir="${base.dir}/xml/expat/lib"
includes="xmlparse.c xmlrole.c xmltok.c"/>
<includepath path="${include.dir}"/>
<includepath path="${include.dir}/private"/>
<includepath path="${apr.include.dir}"/>
<includepath path="${apriconv.include.dir}"/>
<includepath path="${base.dir}/xml/expat/lib"/>
+ <includepath path="${base.dir}/xml/expat"/>
<defineset define="APU_DECLARE_EXPORT" if="is-shared"/>
<defineset define="APU_DECLARE_STATIC" unless="is-shared"/>
<defineset>
- <define name="VERSION" value='\"expat_1.95.1\"'/>
+ <!-- define name="VERSION" value='\"expat_1.95.1\"'/ -->
<define name="XML_MAJOR_VERSION" value="1"/>
<define name="XML_MINOR_VERSION" value="95"/>
<define name="XML_MICRO_VERSION" value="1"/>
</defineset>
+ <defineset unless="is-gcc">
+ <define name="VERSION" value='\"expat_1.95.1\"'/>
+ </defineset>
+ <defineset if="is-gcc">
+ <define name="VERSION" value='0'/>
+ </defineset>
<defineset define="WIN32" if="is-windows"/>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE _LARGEFILE64_SOURCE"
+ unless="is-windows">
+ <define name="LINUX" value="2"/>
+ </defineset>
+
<libset dir="${apr.lib.dir}" libs="apr-1"/>
<libset dir="${apriconv.lib.dir}" libs="apriconv"/>
</cc>
1.31 +88 -73 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.xml 6 Feb 2005 02:04:33 -0000 1.30
+++ build.xml 6 Feb 2005 04:10:42 -0000 1.31
@@ -118,7 +118,7 @@
<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
+Use CVS HEAD or Feb 2005 or later release from
http://ant-contrib.sourceforge.net.
</fail>
@@ -189,21 +189,21 @@
<available property="aprutil-src-available" file="${lib.dir}/apr-util-${aprutil.version}.tar.gz"/>
<available property="cppunit-src-available" file="${lib.dir}/cppunit-${cppunit.version}.tar.gz"/>
- <condition property="apr-static" value="true">
- <equals arg1="${apr.lib.type}" arg2="static"/>
- </condition>
-
- <condition property="aprutil-static" value="true">
- <equals arg1="${aprutil.lib.type}" arg2="static"/>
- </condition>
-
- <condition property="apriconv-static" value="true">
- <equals arg1="${apriconv.lib.type}" arg2="static"/>
- </condition>
-
- <condition property="cppunit-static" value="true">
- <equals arg1="${cppunit.lib.type}" arg2="static"/>
- </condition>
+ <condition property="apr-static" value="true">
+ <equals arg1="${apr.lib.type}" arg2="static"/>
+ </condition>
+
+ <condition property="aprutil-static" value="true">
+ <equals arg1="${aprutil.lib.type}" arg2="static"/>
+ </condition>
+
+ <condition property="apriconv-static" value="true">
+ <equals arg1="${apriconv.lib.type}" arg2="static"/>
+ </condition>
+
+ <condition property="cppunit-static" value="true">
+ <equals arg1="${cppunit.lib.type}" arg2="static"/>
+ </condition>
<condition property="executable.dir" value="${build.dir}/debug">
@@ -231,17 +231,17 @@
</target>
-<target name="unix-configure"
- depends="config-check"
+<target name="unix-configure"
+ depends="config-check"
if="is-unix"
unless="config-available">
- <exec executable="configure">
- <arg value="--with-apr=${apr.dir}"/>
- <arg value="--with-aprutil=${aprutil.dir}"/>
- <arg value="--with-apriconv=${apriconv.dir}"/>
- <arg value="--with-cppunit=${cppunit.dir}"/>
- </exec>
+ <!-- exec executable="configure">
+ <arg value="- -with-apr=${apr.dir}"/>
+ <arg value="- -with-aprutil=${aprutil.dir}"/>
+ <arg value="- -with-apriconv=${apriconv.dir}"/>
+ <arg value="- -with-cppunit=${cppunit.dir}"/>
+ </exec-->
</target>
<target name="win-configure" depends="config-check" if="is-windows">
@@ -251,6 +251,7 @@
<target name="configure" depends="unix-configure, win-configure"/>
<target name="get-apr-module">
+ <mkdir dir="${lib.dir}"/>
<get src="${apache.mirror}/apr/${module}-${module.version}.tar.gz"
dest="${lib.dir}/${module}-${module.version}.tar.gz"
usetimestamp="true"/>
@@ -263,6 +264,9 @@
</exec>
<untar src="${lib.dir}/${module}-${module.version}.tar.gz"
dest="${lib.dir}" compression="gzip"/>
+ <chmod file="${lib.dir}/${module}-${module.version}/configure"
+ perm="u+x"/>
+
</target>
<target name="get-apr-src" unless="apr-src-available">
@@ -275,18 +279,19 @@
<target name="build-apr" depends="init" unless="apr-available">
<antcall target="get-apr-src"/>
+ <property name="apr.dir" location="${lib.dir}/apr-${apr.version}"/>
+
<ant antfile="apr-build.xml" target="build" inheritAll="false">
<property name="version" value="${apr.version}"/>
<property name="debug" value="${debug}"/>
<property name="lib-suffix" value="${lib-suffix}"/>
<property name="compiler" value="${compiler}"/>
- <property name="base.dir" value="${lib.dir}/apr-${apr.version}"/>
+ <property name="base.dir" value="${apr.dir}"/>
<property name="executable.dir" value="${executable.dir}"/>
<property name="lib.type" value="${apr.lib.type}"/>
</ant>
- <property name="apr.dir" value="${lib.dir}/apr-${apr.version}"/>
- <property name="apr.include.dir" value="${apr.dir}/include"/>
- <property name="apr.lib.dir" value="${executable.dir}/${apr.lib.type}"/>
+ <property name="apr.include.dir" location="${apr.dir}/include"/>
+ <property name="apr.lib.dir" location="${executable.dir}/${apr.lib.type}"/>
</target>
<target name="get-apriconv-src" unless="apriconv-src-available">
@@ -299,9 +304,10 @@
<target name="build-apriconv" depends="build-apr" unless="apriconv-available">
<antcall target="get-apriconv-src"/>
+ <property name="apriconv.dir" location="${lib.dir}/apr-iconv-${apriconv.version}"/>
<ant antfile="apriconv-build.xml" target="build" inheritAll="false">
<property name="version" value="${apriconv.version}"/>
- <property name="base.dir" value="${lib.dir}/apr-iconv-${apriconv.version}"/>
+ <property name="base.dir" value="${apriconv.dir}"/>
<property name="debug" value="${debug}"/>
<property name="lib-suffix" value="${lib-suffix}"/>
<property name="compiler" value="${compiler}"/>
@@ -309,10 +315,10 @@
<property name="apr.lib.dir" value="${apr.lib.dir}"/>
<property name="executable.dir" value="${executable.dir}"/>
<property name="lib.type" value="${apriconv.lib.type}"/>
+ <property name="with-apr" value="${apr.dir}/apr--config"/>
</ant>
- <property name="apriconv.dir" value="${lib.dir}/apr-iconv-${apriconv.version}"/>
- <property name="apriconv.include.dir" value="${apriconv.dir}/include"/>
- <property name="apriconv.lib.dir" value="${executable.dir}/${apriconv.lib.type}"/>
+ <property name="apriconv.include.dir" location="${apriconv.dir}/include"/>
+ <property name="apriconv.lib.dir" location="${executable.dir}/${apriconv.lib.type}"/>
</target>
<target name="get-aprutil-src" unless="aprutil-src-available">
@@ -320,15 +326,20 @@
<param name="module" value="apr-util"/>
<param name="module.version" value="${aprutil.version}"/>
</antcall>
+ <chmod file="${lib.dir}/apr-util-$aprutil.version}/xml/expat/configure"
+ perm="u+x"/>
+
</target>
<target name="build-aprutil" depends="build-apriconv" unless="aprutil-available">
<antcall target="get-aprutil-src"/>
+ <property name="aprutil.dir" location="${lib.dir}/apr-util-${aprutil.version}"/>
+
<ant antfile="aprutil-build.xml" target="build" inheritAll="false">
<property name="version" value="${aprutil.version}"/>
- <property name="base.dir" value="${lib.dir}/apr-util-${aprutil.version}"/>
+ <property name="base.dir" value="${aprutil.dir}"/>
<property name="debug" value="${debug}"/>
<property name="lib-suffix" value="${lib-suffix}"/>
<property name="compiler" value="${compiler}"/>
@@ -338,26 +349,31 @@
<property name="apriconv.lib.dir" value="${apriconv.lib.dir}"/>
<property name="executable.dir" value="${executable.dir}"/>
<property name="lib.type" value="${aprutil.lib.type}"/>
+ <property name="with-apr" value="${apr.dir}/apr--config"/>
</ant>
- <property name="aprutil.dir" value="${lib.dir}/apr-util-${aprutil.version}"/>
- <property name="aprutil.include.dir" value="${aprutil.dir}/include"/>
- <property name="aprutil.lib.dir" value="${executable.dir}/${aprutil.lib.type}"/>
+ <property name="aprutil.include.dir" location="${aprutil.dir}/include"/>
+ <property name="aprutil.lib.dir" location="${executable.dir}/${aprutil.lib.type}"/>
</target>
<target name="get-cppunit-src" unless="cppunit-src-available">
+ <mkdir dir="${lib.dir}"/>
<get src="${cppunit.mirror}/cppunit/cppunit-${cppunit.version}.tar.gz"
dest="${lib.dir}/cppunit-${cppunit.version}.tar.gz"
usetimestamp="true"/>
<untar src="${lib.dir}/cppunit-${cppunit.version}.tar.gz"
dest="${lib.dir}" compression="gzip"/>
+ <chmod file="${lib.dir}/cppunit-${cppunit.version}/configure"
+ perm="u+x"/>
</target>
<target name="build-cppunit" depends="init" unless="cppunit-available">
<antcall target="get-cppunit-src"/>
+ <property name="cppunit.dir" value="${lib.dir}/cppunit-${cppunit.version}"/>
+
<ant antfile="cppunit-build.xml" target="build" inheritAll="false">
- <property name="base.dir" value="${lib.dir}/cppunit-${cppunit.version}"/>
+ <property name="base.dir" value="${cppunit.dir}"/>
<property name="cppunit.version" value="${cppunit.version}"/>
<property name="debug" value="${debug}"/>
<property name="lib-suffix" value="${lib-suffix}"/>
@@ -365,7 +381,6 @@
<property name="executable.dir" value="${executable.dir}"/>
<property name="lib.type" value="${cppunit.lib.type}"/>
</ant>
- <property name="cppunit.dir" value="${lib.dir}/cppunit-${cppunit.version}"/>
<property name="cppunit.include.dir" value="${cppunit.dir}/include"/>
<property name="cppunit.lib.dir" value="${executable.dir}/${cppunit.lib.type}"/>
</target>
@@ -413,7 +428,7 @@
<includepath path="include"/>
<includepath path="${apr.include.dir}"/>
<includepath path="${aprutil.include.dir}"/>
- <project outfile="${project.dir}/header-check"
+ <project outfile="${project.dir}/header-check"
type="${project.type}" if="project.if"/>
</cc>
</target>
@@ -501,7 +516,7 @@
</target>
<target name="run-example">
- <exec executable="${executable.dir}/${lib.type}/${example.name}"
+ <exec executable="${executable.dir}/${lib.type}/${example.name}"
dir="${executable.dir}/${lib.type}"
failonerror="true">
<env key="DYLD_LIBRARY_PATH"
@@ -577,8 +592,8 @@
<includepath path="${include.dir}"/>
<includepath path="${apr.include.dir}"/>
<libset libs="log4cxx${lib-suffix}" dir="${executable.dir}/${lib.type}"/>
- <libset libs="${apr.lib.name}" dir="${apr.lib.dir}" if="apr.lib.dir"/>
- <libset libs="${apr.lib.name}" unless="apr.lib.dir"/>
+ <libset libs="${apr.lib.name}${lib-suffix}" dir="${apr.lib.dir}" if="apr.lib.dir"/>
+ <libset libs="${apr.lib.name}${lib-suffix}" unless="apr.lib.dir"/>
<libset libs="stdc++" if="is-gcc"/>
<project outfile="${project.dir}/shortsocketserver" type="${project.type}" if="project.if"/>
</cc>
@@ -765,37 +780,37 @@
</target>
<target name="build-projects">
- <mkdir dir="msvc"/>
- <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-unittest">
- <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-standalone-unittest">
- <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-examples">
- <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-performance">
- <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>
+ <mkdir dir="msvc"/>
+ <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-unittest">
+ <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-standalone-unittest">
+ <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-examples">
+ <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-performance">
+ <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">
1.2 +8 -3 logging-log4cxx/cppunit-build.xml
Index: cppunit-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/cppunit-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cppunit-build.xml 6 Feb 2005 02:04:33 -0000 1.1
+++ cppunit-build.xml 6 Feb 2005 04:10:42 -0000 1.2
@@ -93,7 +93,7 @@
<target name="configure-check" depends="init">
<condition property="config-available" value="true">
- <available file="${include.dir}/apr.h"/>
+ <available file="${include.dir}/cppunit/config-auto.h"/>
</condition>
</target>
@@ -102,7 +102,7 @@
</target>
<target name="unix-configure" depends="configure-check" if="is-unix" unless="config-available">
- <exec executable="configure" dir="${base.dir}"/>
+ <exec executable="${base.dir}/configure" dir="${base.dir}"/>
</target>
@@ -120,11 +120,16 @@
exceptions="true"
objdir="${executable.dir}/${lib.type}/cppunit_obj"
debug="${debug}">
- <fileset dir="${base.dir}/src/cppunit" includes="**/*.cpp"/>
+ <fileset dir="${base.dir}/src/cppunit" includes="**/*.cpp" excludes="DllMain.cpp"/>
<includepath path="${include.dir}"/>
<defineset define="CPPUNIT_BUILD_DLL" if="is-shared"/>
<defineset define="CPPUNIT_BUILD_STATIC" unless="is-shared"/>
<defineset define="WIN32" if="is-windows"/>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE _LARGEFILE64_SOURCE"
+ unless="is-windows">
+ <define name="LINUX" value="2"/>
+ </defineset>
+
</cc>
</target>