carnold 2005/02/05 20:48:35
Modified: . apr-build.xml apriconv-build.xml aprutil-build.xml
build.xml cppunit-build.xml
Log:
LOGCXX-25: Ant build more linux iterations
Revision Changes Path
1.3 +1 -4 logging-log4cxx/apr-build.xml
Index: apr-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apr-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr-build.xml 6 Feb 2005 04:10:42 -0000 1.2
+++ apr-build.xml 6 Feb 2005 04:48:34 -0000 1.3
@@ -135,10 +135,7 @@
<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>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
</cc>
</target>
1.3 +2 -5 logging-log4cxx/apriconv-build.xml
Index: apriconv-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apriconv-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apriconv-build.xml 6 Feb 2005 04:10:42 -0000 1.2
+++ apriconv-build.xml 6 Feb 2005 04:48:34 -0000 1.3
@@ -105,7 +105,7 @@
<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="configure-available">
+<target name="unix-configure" depends="configure-check" if="is-unix"
unless="config-available">
<exec executable="${base.dir}/configure" dir="${base.dir}">
<arg value="--with-apr=${with-apr}"/>
</exec>
@@ -134,10 +134,7 @@
<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>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
</cc>
</target>
1.3 +9 -16 logging-log4cxx/aprutil-build.xml
Index: aprutil-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/aprutil-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aprutil-build.xml 6 Feb 2005 04:10:42 -0000 1.2
+++ aprutil-build.xml 6 Feb 2005 04:48:34 -0000 1.3
@@ -137,6 +137,14 @@
<target name="build" depends="configure" description="Build library">
<mkdir dir="${executable.dir}/${lib.type}/aprutil_obj"/>
+ <!-- uses replace instead of preprocessor since
+ the quotes on VERSION cause problems with cpptasks -->
+ <replace file="${base.dir}/xml/expat/lib/xmlparse.c">
+ <replacefilter token="XML_MAJOR_VERSION" value="1"/>
+ <replacefilter token="XML_MINOR_VERSION" value="95"/>
+ <replacefilter token="XML_MICRO_VERSION" value="1"/>
+ <replacefilter token="VERSION" value='"expat_1.95.1"'/>
+ </replace>
<cc name="${compiler}"
outfile="${executable.dir}/${lib.type}/aprutil-1${lib-suffix}"
subsystem="console"
@@ -156,23 +164,8 @@
<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="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>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
<libset dir="${apr.lib.dir}" libs="apr-1"/>
<libset dir="${apriconv.lib.dir}" libs="apriconv"/>
1.32 +40 -5 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 6 Feb 2005 04:10:42 -0000 1.31
+++ build.xml 6 Feb 2005 04:48:34 -0000 1.32
@@ -67,7 +67,37 @@
<target name="usage">
<echo>
- </echo>
+Ant build file for log4cxx
+
+Common invocations:
+
+> ant
+
+Builds and tests log4cxx. Will download and build
+apr, apr-util, apr-iconv and cppunit from source.
+
+> ant -Dapr.dir=/usr/local/lib -Dcppunit.dir=/usr/lib
+
+Builds and tests log4cxx using installed APR and cppunit
+
+> ant -p
+
+Displays available targets
+
+> ant build-projects-vc6
+
+Builds Microsoft Visual Studio projects.
+-xcode and -cbx for Apple Xcode and Borland CBuilderX for Linux
+respectively.
+
+Common command line options:
+
+-Ddebug=[true|false]
+-Doptimize=[speed|size|none]
+-Dversion=n.n.n
+-Dlib.type=[shared|static]
+
+</echo>
</target>
<target name="os-detect">
@@ -109,6 +139,9 @@
<property name="project.type" value="cbuilderx"/>
<property name="project.dir" value="cbx"/>
<property name="compiler" value="g++"/>
+ <property name="lib-suffix" value=""/>
+
+ <property name="extra.libs" value="expat"/>
</target>
@@ -138,7 +171,7 @@
</condition>
<property name="debug.release" value="release"/>
- <condition property="apr.include.dir" value="${apr.dir}/include">
+ <condition property="apr.include.dir"
value="${apr.dir}/include/apr-1">
<isset property="apr.dir"/>
</condition>
<condition property="apr.lib.dir" value="${apr.dir}/lib">
@@ -149,7 +182,7 @@
<condition property="apriconv.dir" value="${apr.dir}">
<isset property="apr.dir"/>
</condition>
- <condition property="apriconv.include.dir"
value="${apriconv.dir}/include">
+ <condition property="apriconv.include.dir"
value="${apriconv.dir}/include/apr-1">
<isset property="apriconv.dir"/>
</condition>
<condition property="apriconv.lib.dir" value="${apriconv.dir}/lib">
@@ -160,7 +193,7 @@
<condition property="aprutil.dir" value="${apr.dir}">
<isset property="apr.dir"/>
</condition>
- <condition property="aprutil.include.dir"
value="${aprutil.dir}/include">
+ <condition property="aprutil.include.dir"
value="${aprutil.dir}/include/apr-1">
<isset property="aprutil.dir"/>
</condition>
<condition property="aprutil.lib.dir" value="${aprutil.dir}/lib">
@@ -181,7 +214,7 @@
<available property="apr-available"
file="${apr.lib.dir}/${lib.prefix}apr-1${lib-suffix}${lib.extension}"/>
<available property="aprutil-available"
file="${aprutil.lib.dir}/${lib.prefix}aprutil-1${lib-suffix}${lib.extension}"/>
- <available property="apriconv-available"
file="${apriconv.lib.dir}/${lib.prefix}apriconv-1${lib-suffix}${lib.extension}"/>
+ <available property="apriconv-available"
file="${apriconv.lib.dir}/${lib.prefix}apriconv${lib-suffix}${lib.extension}"/>
<available property="cppunit-available"
file="${cppunit.lib.dir}/${lib.prefix}cppunit${lib-suffix}${lib.extension}"/>
<available property="apr-src-available"
file="${lib.dir}/apr-${apr.version}.tar.gz"/>
@@ -507,6 +540,7 @@
dir="${apriconv.lib.dir}" if="apriconv.lib.dir"/>
<libset libs="${apriconv.lib.name}${lib-suffix}"
unless="apriconv.lib.dir"/>
+ <libset libs="${extra.libs}" if="extra.libs"/>
<libset libs="stdc++" if="is-gcc"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
@@ -595,6 +629,7 @@
<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"/>
+ <libset libs="${extra.libs}" if="extra.libs"/>
<project outfile="${project.dir}/shortsocketserver"
type="${project.type}" if="project.if"/>
</cc>
1.3 +1 -4 logging-log4cxx/cppunit-build.xml
Index: cppunit-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/cppunit-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cppunit-build.xml 6 Feb 2005 04:10:42 -0000 1.2
+++ cppunit-build.xml 6 Feb 2005 04:48:34 -0000 1.3
@@ -125,10 +125,7 @@
<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>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
</cc>
</target>
