carnold 2005/02/10 11:36:03
Modified: . apr-build.xml apriconv-build.xml aprutil-build.xml
Log:
LOGCXX-25: Added project generation for APR
Revision Changes Path
1.6 +60 -7 logging-log4cxx/apr-build.xml
Index: apr-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apr-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr-build.xml 9 Feb 2005 22:52:00 -0000 1.5
+++ apr-build.xml 10 Feb 2005 19:36:03 -0000 1.6
@@ -31,11 +31,12 @@
<property name="base.dir" location="."/>
<property name="include.dir" location="${base.dir}/include"/>
<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">
+<target name="usage" description="Displays usage notes on build">
<echo>
</echo>
</target>
@@ -53,6 +54,7 @@
<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">
@@ -64,6 +66,7 @@
</or>
</condition>
<property name="arch" value="unix"/>
+ <property name="project.type" value="cbuilderx"/>
</target>
<target name="init" depends="win-init, unix-init">
@@ -88,10 +91,13 @@
<condition property="is-bcc" value="true">
<equals arg1="${compiler}" arg2="bcc"/>
- </condition>
+ </condition>
+ <condition property="project.if" value="true">
+ <istrue value="${project.if.value}"/>
+ </condition>
</target>
-<target name="clean">
+<target name="clean" description="Removes build product files">
<delete dir="${build.dir}"/>
</target>
@@ -134,7 +140,11 @@
<fileset dir="${base.dir}/poll/unix" includes="select.c"/>
<fileset dir="${base.dir}/random/unix" includes="*.c"/>
<fileset dir="${base.dir}/strings" includes="*.c"/>
- <fileset dir="${base.dir}/tables" includes="*.c"/>
+ <fileset dir="${base.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"/>
<includepath path="${include.dir}"/>
<includepath path="${include.dir}/arch"/>
<includepath path="${include.dir}/arch/${arch}"/>
@@ -146,7 +156,8 @@
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
- <libset libs="cw32mt" if="is-bcc"/>
+ <libset libs="cw32mt" if="is-bcc"/>
+ <project type="${project.type}" outfile="${project.dir}/apr"
if="project.if"/>
</cc>
</target>
@@ -166,6 +177,7 @@
</defineset>
<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>
@@ -349,6 +361,7 @@
</defineset>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
+ <project type="${project.type}" outfile="${project.dir}/testall"
if="project.if"/>
</cc>
</target>
@@ -365,15 +378,55 @@
build-testshmproducer,
build-testshmconsumer,
build-testmutexscope,
- build-testall"/>
+ build-testall"
+ description="Builds all test applications"/>
<target name="check"
depends="run-testlockperf,
run-testshmproducer,
run-testshmconsumer,
run-testmutexscope,
- run-testall">
+ 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.5 +53 -9 logging-log4cxx/apriconv-build.xml
Index: apriconv-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apriconv-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apriconv-build.xml 9 Feb 2005 22:52:00 -0000 1.4
+++ apriconv-build.xml 10 Feb 2005 19:36:03 -0000 1.5
@@ -26,7 +26,8 @@
<project name="apriconv" default="check">
<property name="debug" value="true"/>
-<property name="build.dir" location="build"/>
+<property name="build.dir" location="build"/>
+<property name="project.dir" value="${build.dir}"/>
<property name="version" value="1.0.1"/>
<property name="base.dir" location="."/>
<property name="include.dir" location="${base.dir}/include"/>
@@ -43,7 +44,7 @@
<property name="apr.include.dir" location="${apr.dir}/include"/>
<property name="with-apr" value="${apr.dir}"/>
-<target name="usage">
+<target name="usage" description="Displays usage notes">
<echo>
</echo>
</target>
@@ -61,6 +62,7 @@
<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">
@@ -71,7 +73,8 @@
<equals arg1="${compiler}" arg2="g++"/>
</or>
</condition>
- <property name="arch" value="unix"/>
+ <property name="arch" value="unix"/>
+ <property name="project.type" value="cbuilderx"/>
</target>
<target name="init" depends="win-init, unix-init">
@@ -97,7 +100,11 @@
<condition property="is-apriconv-shared" value="true">
<equals arg1="${apriconv.lib.type}" arg2="shared"/>
- </condition>
+ </condition>
+ <condition property="project.if" value="true">
+ <istrue value="${project.if.value}"/>
+ </condition>
+
</target>
<target name="clean">
@@ -143,7 +150,9 @@
outtype="${apriconv.lib.type}"
objdir="${apriconv.lib.dir}/apriconv_obj"
debug="${debug}">
- <fileset dir="${base.dir}" includes="lib/*.c"/>
+ <fileset dir="${base.dir}" includes="lib/*.c lib/*.h"/>
+ <fileset dir="${include.dir}" includes="*.h"/>
+ <includepath path="${base.dir}/lib"/>
<includepath path="${include.dir}"/>
<includepath path="${base.dir}/lib"/>
<includepath path="${apr.include.dir}"/>
@@ -152,7 +161,8 @@
<defineset define="API_DECLARE_STATIC" unless="is-apriconv-shared"/>
<defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
<defineset define="WIN32" if="is-windows"/>
- <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <project type="${project.type}" outfile="${project.dir}/apriconv"
if="project.if"/>
</cc>
</target>
@@ -178,6 +188,7 @@
<libset libs="apr-1${lib-suffix}" dir="${apr.lib.dir}"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
<libset libs="cw32mt" if="is-bcc"/>
+ <project type="${project.type}" outfile="${project.dir}/${module}"
if="project.if"/>
</cc>
</target>
@@ -233,10 +244,43 @@
<target name="build-util" depends="build-lib">
</target>
-<target name="build" depends="build-lib, build-ccs, build-ces, build-util"/>
+<target name="build" depends="build-lib, build-ccs, build-ces, build-util"
description="Builds all products"/>
-<target name="build-check" depends="build-lib"/>
+<target name="build-check" depends="build-lib" description="Builds all
tests"/>
-<target name="check" depends="build-check"/>
+<target name="check" depends="build-check" 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.5 +47 -5 logging-log4cxx/aprutil-build.xml
Index: aprutil-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/aprutil-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aprutil-build.xml 9 Feb 2005 22:52:00 -0000 1.4
+++ aprutil-build.xml 10 Feb 2005 19:36:03 -0000 1.5
@@ -46,7 +46,7 @@
<property name="apriconv.include.dir" location="${apriconv.dir}/include"/>
<property name="with-apr-iconv" value="${apriconv.dir}"/>
-<target name="usage">
+<target name="usage" description="Displays usage notes">
<echo>
</echo>
</target>
@@ -107,10 +107,13 @@
<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">
+<target name="clean" description="Deletes build products">
<delete dir="${build.dir}"/>
</target>
@@ -171,7 +174,11 @@
<fileset dir="${base.dir}" includes="**/*.c"
excludes="test/*.c ldap/*.c xml/expat/lib/*"/>
<fileset dir="${base.dir}/xml/expat/lib"
- includes="xmlparse.c xmlrole.c xmltok.c"/>
+ includes="xmlparse.c xmlrole.c xmltok.c"/>
+ <fileset dir="${include.dir}" includes="*.h"/>
+ <fileset dir="${include.dir}/private" includes="*.h"/>
+ <fileset dir="${base.dir}/xml/expat/lib" includes="*.h"/>
+ <fileset dir="${base.dir}/xml/expat" includes="*.h"/>
<includepath path="${include.dir}"/>
<includepath path="${include.dir}/private"/>
<includepath path="${apr.include.dir}"/>
@@ -394,7 +401,8 @@
build-testreslist,
build-testqueue,
build-testxlate,
- build-testall"/>
+ build-testall"
+ description="Builds all tests"/>
<target name="check"
depends="build-testdbm,
@@ -405,7 +413,41 @@
run-testreslist,
run-testqueue,
run-testxlate,
- run-testall"/>
+ 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>
