carnold 2005/03/11 07:17:07
Modified: . INSTALL apr-build.xml apriconv-build.xml
aprutil-build.xml autogen.sh build.xml
Removed: . autogen.macosx.sh
Log:
LOGCXX-25: Mac and cygwin build tweaks
Revision Changes Path
1.10 +3 -0 logging-log4cxx/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/logging-log4cxx/INSTALL,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- INSTALL 10 Mar 2005 00:35:52 -0000 1.9
+++ INSTALL 11 Mar 2005 15:17:07 -0000 1.10
@@ -76,6 +76,9 @@
-Dapr.lib.type=[static | shared]
-Daprutil.lib.type=[static | shared]
-Dapriconv.lib.type=[static | shared]
+ -Dhas.wchar_t=[1 | 0]
+ -Dlogchar=[wchar_t utf8]
+ -Dos.family=cygwin
Build targets:
1.11 +1 -0 logging-log4cxx/apr-build.xml
Index: apr-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apr-build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apr-build.xml 11 Mar 2005 06:34:48 -0000 1.10
+++ apr-build.xml 11 Mar 2005 15:17:07 -0000 1.11
@@ -54,6 +54,7 @@
</not>
<or>
<os family="unix"/>
+ <equals arg1="${os.family}" arg2="cygwin"/>
<equals arg1="${os.family}" arg2="unix"/>
</or>
</and>
1.10 +1 -0 logging-log4cxx/apriconv-build.xml
Index: apriconv-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apriconv-build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apriconv-build.xml 11 Mar 2005 06:34:48 -0000 1.9
+++ apriconv-build.xml 11 Mar 2005 15:17:07 -0000 1.10
@@ -60,6 +60,7 @@
</not>
<or>
<os family="unix"/>
+ <equals arg1="${os.family}" arg2="cygwin"/>
<equals arg1="${os.family}" arg2="unix"/>
</or>
</and>
1.12 +1 -0 logging-log4cxx/aprutil-build.xml
Index: aprutil-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/aprutil-build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aprutil-build.xml 11 Mar 2005 06:34:48 -0000 1.11
+++ aprutil-build.xml 11 Mar 2005 15:17:07 -0000 1.12
@@ -63,6 +63,7 @@
<or>
<os family="unix"/>
<equals arg1="${os.family}" arg2="unix"/>
+ <equals arg1="${os.family}" arg2="cygwin"/>
</or>
</and>
</condition>
1.3 +5 -1 logging-log4cxx/autogen.sh
Index: autogen.sh
===================================================================
RCS file: /home/cvs/logging-log4cxx/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.sh 16 Dec 2004 00:21:46 -0000 1.2
+++ autogen.sh 11 Mar 2005 15:17:07 -0000 1.3
@@ -1,7 +1,11 @@
#! /bin/sh
# Regenerate the files autoconf / automake
-libtoolize --force --automake
+case `uname` in
+ (Darwin) LIBTOOLIZE=glibtoolize ;;
+ (*) LIBTOOLIZE=libtoolize ;;
+esac
+$LIBTOOLIZE --force --automake
rm -f config.cache
rm -f config.log
1.49 +27 -8 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build.xml 11 Mar 2005 06:34:48 -0000 1.48
+++ build.xml 11 Mar 2005 15:17:07 -0000 1.49
@@ -104,12 +104,22 @@
</target>
<target name="os-detect">
- <condition property="is-unix" value="true">
+ <condition property="is-mac" value="true">
<and>
- <os family="unix"/>
+ <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"/>
@@ -140,8 +150,8 @@
</target>
<target name="mac-init" depends="os-detect" if="is-mac">
- <property name="project.type" value="cbuilderx"/>
- <property name="project.dir" value="cbx"/>
+ <property name="project.type" value="xcode"/>
+ <property name="project.dir" value="xcode"/>
</target>
@@ -168,8 +178,10 @@
<property name="project.dir" value="cbx"/>
<property name="compiler" value="g++"/>
<property name="lib-suffix" value=""/>
-
- <property name="extra.libs" value="expat"/>
+ <property name="has-iconv" value="true"/>
+ <condition property="has-expat" value="true">
+ <not><isset property="is-mac"/></not>
+ </condition>
</target>
@@ -605,6 +617,7 @@
<libset libs="stdc++" if="is-gcc"/>
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="xml2" if="is-unix"/>
+ <libset libs="iconv" if="is-unix"/>
<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="${aprutil.lib.name}${lib-suffix}"
dir="${aprutil.lib.dir}" if="aprutil.lib.dir"/>
@@ -658,7 +671,8 @@
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="iconv" if="has-iconv"/>
+ <libset libs="expat" if="has-expat"/>
<libset libs="stdc++" if="is-gcc"/>
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
@@ -768,9 +782,10 @@
dir="${apriconv.lib.dir}" if="apriconv.lib.dir"/>
<libset libs="${apriconv.lib.name}${lib-suffix}"
unless="apriconv.lib.dir"/>
+ <libset libs="iconv" if="has-iconv"/>
+ <libset libs="expat" if="has-expat"/>
<libset libs="stdc++" if="is-gcc"/>
<libset libs="cw32mt" if="is-bcc"/>
- <libset libs="${extra.libs}" if="extra.libs"/>
<project outfile="${project.dir}/shortsocketserver"
type="${project.type}" if="project.if"/>
</cc>
@@ -820,6 +835,8 @@
unless="apriconv.lib.dir"/>
<libset libs="${cppunit.lib.name}${lib-suffix}"
dir="${cppunit.lib.dir}" if="cppunit.lib.dir"/>
<libset libs="${cppunit.lib.name}${lib-suffix}"
unless="cppunit.lib.dir"/>
+ <libset libs="iconv" if="has-iconv"/>
+ <libset libs="expat" if="has-expat"/>
<libset libs="stdc++" if="is-gcc"/>
<libset libs="cw32mt" if="is-bcc"/>
<syslibset libs="Ws2_32 ws2 advapi32" if="is-windows"/>
@@ -872,6 +889,8 @@
unless="apriconv.lib.dir"/>
<libset libs="${cppunit.lib.name}${lib-suffix}"
dir="${cppunit.lib.dir}" if="cppunit.lib.dir"/>
<libset libs="${cppunit.lib.name}${lib-suffix}"
unless="cppunit.lib.dir"/>
+ <libset libs="iconv" if="has-iconv"/>
+ <libset libs="expat" if="has-expat"/>
<syslibset libs="advapi32 odbc32 ws2_32" if="is-windows"/>
<includepath path="${include.dir}"/>
