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/03/16 18:11:21 UTC
cvs commit: logging-log4cxx INSTALL build.xml
carnold 2005/03/16 09:11:21
Modified: . INSTALL build.xml
Log:
LOGCXX-77: static builds broken (linux iter)
Revision Changes Path
1.11 +27 -27 logging-log4cxx/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/logging-log4cxx/INSTALL,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- INSTALL 11 Mar 2005 15:17:07 -0000 1.10
+++ INSTALL 16 Mar 2005 17:11:20 -0000 1.11
@@ -11,27 +11,27 @@
Apache Ant 1.6.1 or later (1.6.2 preferred)
http://ant.apache.org
-cpptasks.jar and ant-contrib.jar on CLASSPATH
+cpptasks.jar and ant-contrib.jar on CLASSPATH
(March 2005 or later releases or CVS HEAD)
http://ant-contrib.sourceforge.net
-
-JDK 1.4 or later. Earlier versions might work but
+
+JDK 1.4 or later. Earlier versions might work but
have not been tested.
GNU patch on command path.
GNU sed on command path (required for tests)
-Connection to internet
+Connection to internet
- - or -
+ - or -
The following files placed in the lib directory:
apr-1.1.0.tar.gz
apr-util-1.1.0.tar.gz
apr-iconv-1.0.1.tar.gz
cppunit-1.10.2.gz
-
+
http://apr.apache.org
http://cppunit.sourceforge.net
@@ -48,7 +48,7 @@
$> setenv CLASSPATH path_to_cpptasks/cpptasks.jar:path_to_antcontrib/ant-contrib.jar
-$> ant
+$> ant
Microsoft Visual C++:
@@ -69,7 +69,7 @@
-Dcompiler= see list from http://ant-contrib.sourceforge.net/cc.html
-Ddebug=[true | false]
- -Dlibtype=[shared | static | dylib]
+ -Dlib.type=[shared | static | dylib]
-Drtti=[false | true]
-Dapache.mirror=URL
-Dcppunit.mirror=URL
@@ -111,7 +111,7 @@
autoconf.sh is known to be incompatible with some versions
of autotools. The autotools make has not been kept up to date
with development. See Bug LOGCXX-43 for details on this issue.
-The following description has not been changed since log4cxx-0.9.7.
+The following description has not been changed since log4cxx-0.9.7.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -138,13 +138,13 @@
2. type `./autogen.sh' to generate the configure script.
If you're using `csh' on an old version of System V, you might
- need to type `sh ./autogen.sh' instead to prevent `csh' from trying
- to execute `autogen.sh' itself.
+ need to type `sh ./autogen.sh' instead to prevent `csh' from trying
+ to execute `autogen.sh' itself.
3. type `./configure' to configure the package for your system.
If you're using `csh' on an old version of System V, you might
- need to type `sh ./configure' instead to prevent `csh' from trying
- to execute `configure' itself.
+ need to type `sh ./configure' instead to prevent `csh' from trying
+ to execute `configure' itself.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
@@ -226,28 +226,28 @@
(2 bytes wide characters instead of 1 byte wide characters)
If the libXML2 library (http://xmlsoft.org) is detected, the DOMConfigurator
-class will be compiled.
+class will be compiled.
Threading support can be added through option -with-thread
- * "pthread" (default): pthread library
- * "Microsoft" : native microsoft library
- * "no" : no threading support
+ * "pthread" (default): pthread library
+ * "Microsoft" : native microsoft library
+ * "no" : no threading support
ODBC support (ODBCAppender) can be added through option -with-ODBC
- * "unixODBC" : unixODBC library (http://www.unixodbc.org)
- * "iODBC" : iODBC library (http://www.iodbc.org)
- * "Microsoft" : Microsoft ODBC library
- * "no" (default) : no ODBC support
+ * "unixODBC" : unixODBC library (http://www.unixodbc.org)
+ * "iODBC" : iODBC library (http://www.iodbc.org)
+ * "Microsoft" : Microsoft ODBC library
+ * "no" (default) : no ODBC support
SMTP support (SMTPAppender) can be added through option -with-SMTP
- * "libsmtp" : libsmtp library (http://libsmtp.berlios.de)
- * "CDO" : Microsoft CDO library (no yet implemented !)
- * "no" (default) : no SMTP support
+ * "libsmtp" : libsmtp library (http://libsmtp.berlios.de)
+ * "CDO" : Microsoft CDO library (no yet implemented !)
+ * "no" (default) : no SMTP support
XML support (DOMConfigurator) can be added through option -with-XML
- * "libxm2" (default) : gnome xml library (http://xmlsoft.org)
- * "Microsoft" : MSXML library
- * "no" : no XML support
+ * "libxm2" (default) : gnome xml library (http://xmlsoft.org)
+ * "Microsoft" : MSXML library
+ * "no" : no XML support
Specifying the System Type
1.57 +34 -69 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- build.xml 16 Mar 2005 16:39:24 -0000 1.56
+++ build.xml 16 Mar 2005 17:11:20 -0000 1.57
@@ -1,4 +1,21 @@
<?xml version="1.0"?>
+<!DOCTYPE project [
+<!ENTITY libsets '
+ <libset libs="${aprutil.lib.name}${lib-suffix}" dir="${aprutil.lib.dir}" if="aprutil.lib.dir"/>
+ <libset libs="${aprutil.lib.name}${lib-suffix}" unless="aprutil.lib.dir"/>
+ <libset libs="${apriconv.lib.name}${lib-suffix}"
+ dir="${apriconv.lib.dir}" if="apriconv.lib.dir"/>
+ <libset libs="${apriconv.lib.name}${lib-suffix}"
+ unless="apriconv.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="iconv" if="has-iconv"/>
+ <libset libs="xml2 pthread" if="is-unix"/>
+ <libset libs="expat" if="has-expat"/>
+ <libset libs="advapi32 odbc32 ws2_32" if="is-windows"/>
+ <libset libs="stdc++" if="is-gcc"/>
+ <libset libs="cw32mt" if="is-bcc"/>
+'>]>
<!--
Copyright 2004-2005 The Apache Software Foundation.
@@ -152,6 +169,9 @@
<condition property="is-mingw" value="true">
<isset property="is-gcc"/>
</condition>
+ <condition property="is-win-static" value="true">
+ <equals arg1="${lib.type}" arg2="static"/>
+ </condition>
</target>
<target name="mac-init" depends="os-detect" if="is-mac">
@@ -176,6 +196,9 @@
<condition property="is-cygwin" value="true">
<os family="windows"/>
</condition>
+ <condition property="is-unix-static" value="true">
+ <equals arg1="${lib.type}" arg2="static"/>
+ </condition>
</target>
@@ -280,6 +303,10 @@
<available property="aprutil-src-expanded" file="${lib.dir}/apr-util-${aprutil.version}"/>
<available property="cppunit-src-expanded" file="${lib.dir}/cppunit-${cppunit.version}"/>
+ <condition property="is-static" value="true">
+ <equals arg1="${lib.type}" arg2="static"/>
+ </condition>
+
<condition property="apr-static" value="true">
<equals arg1="${apr.lib.type}" arg2="static"/>
</condition>
@@ -649,21 +676,7 @@
<define name="LOG4CXX_HAS_STD_WLOCALE" value="0"/>
</defineset>
<compilerarg value="${pic-option}" if="pic-option"/>
- <libset libs="advapi32 odbc32 ws2_32" if="is-windows"/>
- <libset libs="stdc++" if="is-gcc"/>
- <libset libs="cw32mt" if="is-bcc"/>
- <libset libs="xml2" if="is-unix"/>
- <libset libs="iconv" if="has-iconv"/>
- <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="${apriconv.lib.name}${lib-suffix}"
- dir="${apriconv.lib.dir}" if="apriconv.lib.dir"/>
- <libset libs="${apriconv.lib.name}${lib-suffix}"
- unless="apriconv.lib.dir"/>
- <libset libs="${aprutil.lib.name}${lib-suffix}" dir="${aprutil.lib.dir}" if="aprutil.lib.dir"/>
- <libset libs="${aprutil.lib.name}${lib-suffix}" unless="aprutil.lib.dir"/>
-
- <syslibset libs="pthread" if="is-unix"/>
+ &libsets;
<project type="${project.type}" outfile="${project.dir}/log4cxx" if="project.if"/>
</cc>
</target>
@@ -698,21 +711,7 @@
<compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="log4cxx${lib-suffix}" dir="${log4cxx.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="${aprutil.lib.name}${lib-suffix}" dir="${aprutil.lib.dir}" if="aprutil.lib.dir"/>
- <libset libs="${aprutil.lib.name}${lib-suffix}" unless="aprutil.lib.dir"/>
- <libset libs="${apriconv.lib.name}${lib-suffix}"
- 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="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
-
+ &libsets;
<project outfile="${project.dir}/${example.name}" type="${project.type}" if="project.if"/>
</cc>
@@ -809,19 +808,7 @@
<define name="LOG4CXX_HAS_WCHAR_T" value="${has.wchar_t}"/>
</defineset>
<libset libs="log4cxx${lib-suffix}" dir="${log4cxx.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="${aprutil.lib.name}${lib-suffix}" dir="${aprutil.lib.dir}" if="aprutil.lib.dir"/>
- <libset libs="${aprutil.lib.name}${lib-suffix}" unless="aprutil.lib.dir"/>
-
- <libset libs="${apriconv.lib.name}${lib-suffix}"
- 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"/>
+ &libsets;
<project outfile="${project.dir}/shortsocketserver" type="${project.type}" if="project.if"/>
</cc>
@@ -861,23 +848,11 @@
<define name="LOG4CXX_HAS_WCHAR_T" value="${has.wchar_t}"/>
</defineset>
<compilerarg value="${pic-option}" if="pic-option"/>
- <libset libs="log4cxx${lib-suffix}" dir="${log4cxx.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="${aprutil.lib.name}${lib-suffix}" dir="${aprutil.lib.dir}" if="aprutil.lib.dir"/>
- <libset libs="${aprutil.lib.name}${lib-suffix}" unless="aprutil.lib.dir"/>
- <libset libs="${apriconv.lib.name}${lib-suffix}"
- dir="${apriconv.lib.dir}" if="apriconv.lib.dir"/>
- <libset libs="${apriconv.lib.name}${lib-suffix}"
- unless="apriconv.lib.dir"/>
+ <libset libs="log4cxx${lib-suffix}" dir="${log4cxx.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"/>
+ &libsets;
<project outfile="${project.dir}/log4cxx-test" type="${project.type}" if="project.if"/>
</cc>
@@ -918,20 +893,10 @@
<define name="LOG4CXX_HAS_WCHAR_T" value="${has.wchar_t}"/>
</defineset>
<compilerarg value="${pic-option}" if="pic-option"/>
- <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"/>
- <libset libs="${aprutil.lib.name}${lib-suffix}" unless="aprutil.lib.dir"/>
-
- <libset libs="${apriconv.lib.name}${lib-suffix}"
- dir="${apriconv.lib.dir}" if="apriconv.lib.dir"/>
- <libset libs="${apriconv.lib.name}${lib-suffix}"
- 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"/>
+
+ &libsets;
<includepath path="${include.dir}"/>
<includepath path="/usr/include/libxml2" if="is-unix"/>