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 2008/01/30 10:26:22 UTC
svn commit: r616699 - in /logging/log4cxx/trunk: build.xml
src/ant/apr-build.xml src/ant/apr-util-build.xml src/ant/esmtp-build.xml
src/performance/include/nullappender.h src/test/cpp/logunit.h
src/test/cpp/util/filter.h src/test/cpp/vectorappender.h
Author: carnold
Date: Wed Jan 30 01:26:21 2008
New Revision: 616699
URL: http://svn.apache.org/viewvc?rev=616699&view=rev
Log:
LOGCXX-230: Windows now links DLL, fails compiling tests
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/ant/apr-build.xml
logging/log4cxx/trunk/src/ant/apr-util-build.xml
logging/log4cxx/trunk/src/ant/esmtp-build.xml
logging/log4cxx/trunk/src/performance/include/nullappender.h
logging/log4cxx/trunk/src/test/cpp/logunit.h
logging/log4cxx/trunk/src/test/cpp/util/filter.h
logging/log4cxx/trunk/src/test/cpp/vectorappender.h
Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=616699&r1=616698&r2=616699&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Wed Jan 30 01:26:21 2008
@@ -64,9 +64,6 @@
<property name="log4j.version" value="1.2.15"/>
<property name="log4j.jar"
location="${m2_repo}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar"/>
-<property name="apr.lib.type" value="static"/>
-<property name="apr-util.lib.type" value="static"/>
-<property name="libesmtp.lib.type" value="static"/>
<property name="doxygen.exe" value="doxygen"/>
@@ -195,6 +192,7 @@
file="${include.dir}/log4cxx/log4cxx.hw" overwrite="true"/>
<copy tofile="${include.dir}/log4cxx/private/log4cxx_private.tmp"
file="${include.dir}/log4cxx/private/log4cxx_private.hw" overwrite="true"/>
+ <property name="has-MSODBC" value="1"/>
</target>
@@ -328,7 +326,7 @@
<target name="build-apr" depends="find-apr" unless="apr-available">
<fail unless="apr.src.dir">Could not locate apr library or source.</fail>
-
+ <property name="apr.lib.type" value="static"/>
<ant antfile="src/ant/apr-build.xml" target="build" inheritAll="false">
<property name="basedir" value="${apr.src.dir}"/>
<property name="target.dir" value="${target.dir}"/>
@@ -352,6 +350,7 @@
<target name="build-apr-util" depends="build-apr, find-apr-util" unless="apr-util-available">
<fail unless="apr-util.src.dir">Could not locate apr-util library or source.</fail>
+ <property name="apr-util.lib.type" value="static"/>
<ant antfile="src/ant/apr-util-build.xml" target="build" inheritAll="false">
<property name="target.dir" value="${target.dir}"/>
@@ -379,6 +378,7 @@
<target name="build-libesmtp" depends="find-libesmtp" if="has-libesmtp" unless="libesmtp.lib.dir">
<fail unless="libesmtp.src.dir">Could not locate libesmtp library or source.</fail>
+ <property name="libesmtp.lib.type" value="static"/>
<ant antfile="src/ant/esmtp-build.xml" target="build" inheritAll="false">
<property name="target.dir" value="${target.dir}"/>
@@ -451,6 +451,14 @@
<target name="build" depends="build-apr-util, configure" description="Build log4cxx library">
<mkdir dir="${log4cxx.lib.dir}/log4cxx_obj"/>
+ <condition property="apr-static" value="1">
+ <equals arg1="${apr.lib.type}" arg2="static"/>
+ </condition>
+
+ <condition property="apr-util-static" value="1">
+ <equals arg1="${apr-util.lib.type}" arg2="static"/>
+ </condition>
+
<property name="project.compiler" value="${compiler}"/>
<cc name="${project.compiler}"
exceptions="true"
@@ -818,7 +826,7 @@
</target>
<target name="build-projects">
- <mkdir dir="${project.dir}"/>
+ <mkdir dir="${projects.dir}"/>
<antcall target="build">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
@@ -851,21 +859,24 @@
</antcall>
</target>
-<target name="build-projects-vc6" description="Builds project files for Microsoft Visual C++ 6">
+<target name="build-projects-vc6" depends="init"
+ description="Builds project files for Microsoft Visual C++ 6">
<antcall target="build-projects">
<param name="project.type" value="msvc6"/>
<param name="project.compiler" value="msvc"/>
</antcall>
</target>
-<target name="build-projects-vc8" description="Builds project files for Microsoft Visual C++ 2005">
+<target name="build-projects-vc8" depends="init"
+ description="Builds project files for Microsoft Visual C++ 2005">
<antcall target="build-projects">
<param name="project.type" value="msvc8"/>
<param name="project.compiler" value="msvc"/>
</antcall>
</target>
-<target name="build-projects-xcode" description="Builds project files for Apple Xcode">
+<target name="build-projects-xcode" depends="init"
+ description="Builds project files for Apple Xcode">
<antcall target="build-projects">
<param name="project.type" value="xcode"/>
<param name="project.compiler" value="g++"/>
Modified: logging/log4cxx/trunk/src/ant/apr-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-build.xml?rev=616699&r1=616698&r2=616699&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-build.xml Wed Jan 30 01:26:21 2008
@@ -127,7 +127,7 @@
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
<libset libs="pthread dl" if="is-unix"/>
<libset libs="cw32mt" if="is-bcc"/>
- <project type="${project.type}" outfile="${projects.dir}/apr" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/apr-1" if="project.if"/>
</cc>
<property name="apr.lib.dir" location="${executable.dir}"/>
</target>
@@ -391,21 +391,24 @@
</antcall>
</target>
-<target name="build-projects-vc6" description="Builds project files for Microsoft Visual C++ 6">
+<target name="build-projects-vc6" depends="init"
+ description="Builds project files for Microsoft Visual C++ 6">
<antcall target="build-projects">
<param name="project.type" value="msvc6"/>
<param name="project.compiler" value="msvc"/>
</antcall>
</target>
-<target name="build-projects-vc8" description="Builds project files for Microsoft Visual C++ 2005">
+<target name="build-projects-vc8" depends="init"
+ description="Builds project files for Microsoft Visual C++ 2005">
<antcall target="build-projects">
<param name="project.type" value="msvc8"/>
<param name="project.compiler" value="msvc"/>
</antcall>
</target>
-<target name="build-projects-xcode" description="Builds project files for Apple Xcode">
+<target name="build-projects-xcode" depends="init"
+ description="Builds project files for Apple Xcode">
<antcall target="build-projects">
<param name="project.type" value="xcode"/>
<param name="project.compiler" value="${compiler}"/>
Modified: logging/log4cxx/trunk/src/ant/apr-util-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-util-build.xml?rev=616699&r1=616698&r2=616699&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-util-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-util-build.xml Wed Jan 30 01:26:21 2008
@@ -154,7 +154,7 @@
<defineset if="is-bcc">
<define name="EILSEQ" value="50"/>
</defineset>
- <project type="${project.type}" outfile="${projects.dir}/aprutil" if="project.if"/>
+ <project type="${project.type}" outfile="${projects.dir}/aprutil-1" if="project.if"/>
</cc>
<property name="apr.lib.dir" location="${executable.dir}"/>
</target>
@@ -288,7 +288,8 @@
</antcall>
</target>
- <target name="build-projects-vc6" description="Builds project files for Microsoft Visual C++ 6">
+ <target name="build-projects-vc6" depends="init"
+ description="Builds project files for Microsoft Visual C++ 6">
<antcall target="build-projects">
<param name="projects.dir" value="${projects.dir}"/>
<param name="project.type" value="msvc6"/>
@@ -296,7 +297,8 @@
</antcall>
</target>
- <target name="build-projects-vc8" description="Builds project files for Microsoft Visual C++ 2005">
+ <target name="build-projects-vc8" depends="init"
+ description="Builds project files for Microsoft Visual C++ 2005">
<antcall target="build-projects">
<param name="projects.dir" value="${projects.dir}"/>
<param name="project.type" value="msvc8"/>
@@ -304,7 +306,8 @@
</antcall>
</target>
- <target name="build-projects-xcode" description="Builds project files for Apple Xcode">
+ <target name="build-projects-xcode" depends="init"
+ description="Builds project files for Apple Xcode">
<antcall target="build-projects">
<param name="projects.dir" value="${projects.dir}"/>
<param name="project.type" value="xcode"/>
Modified: logging/log4cxx/trunk/src/ant/esmtp-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/esmtp-build.xml?rev=616699&r1=616698&r2=616699&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/esmtp-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/esmtp-build.xml Wed Jan 30 01:26:21 2008
@@ -111,7 +111,7 @@
<target name="build-projects">
- <mkdir dir="${project.dir}"/>
+ <mkdir dir="${projects.dir}"/>
<antcall target="build">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
Modified: logging/log4cxx/trunk/src/performance/include/nullappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/performance/include/nullappender.h?rev=616699&r1=616698&r2=616699&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/performance/include/nullappender.h (original)
+++ logging/log4cxx/trunk/src/performance/include/nullappender.h Wed Jan 30 01:26:21 2008
@@ -21,18 +21,12 @@
#include <log4cxx/portability.h>
#include <log4cxx/logstring.h>
#include <log4cxx/appenderskeleton.h>
-
+#include <log4cxx/layout.h>
namespace log4cxx
{
- class Layout;
- typedef helpers::ObjectPtrT<Layout> LayoutPtr;
-
namespace performance
{
- class NullAppender;
- typedef helpers::ObjectPtrT<NullAppender> NullAppenderPtr;
-
/**
* A bogus appender which calls the format method of its layout object
* but does not write the result anywhere.
@@ -61,6 +55,7 @@
*/
bool requiresLayout() const;
}; // NullAppender
+ typedef log4cxx::helpers::ObjectPtrT<NullAppender> NullAppenderPtr;
} // namespace performance
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/test/cpp/logunit.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/logunit.h?rev=616699&r1=616698&r2=616699&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/logunit.h (original)
+++ logging/log4cxx/trunk/src/test/cpp/logunit.h Wed Jan 30 01:26:21 2008
@@ -16,7 +16,13 @@
*/
#if !defined(_LOG4CXX_LOGUNIT_H)
-#define _LOG4CXX_LOGUNIT_H
+#define _LOG4CXX_LOGUNIT_H
+
+
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
#include "abts.h"
#include <exception>
@@ -215,6 +221,11 @@
#define LOGUNIT_ASSERT(x) { if (!(x)) throw LogUnit::AssertException(true, #x, __LINE__); }
#define LOGUNIT_ASSERT_EQUAL(expected, actual) assertEquals(expected, actual, #expected, #actual, __LINE__)
#define LOGUNIT_FAIL(msg) throw LogUnit::AssertException(msg, __LINE__)
+
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
#endif
Modified: logging/log4cxx/trunk/src/test/cpp/util/filter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/util/filter.h?rev=616699&r1=616698&r2=616699&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/util/filter.h (original)
+++ logging/log4cxx/trunk/src/test/cpp/util/filter.h Wed Jan 30 01:26:21 2008
@@ -18,6 +18,11 @@
#ifndef _LOG4CXX_TESTS_UTIL_FILTER_H
#define _LOG4CXX_TESTS_UTIL_FILTER_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
#include <string>
#include <vector>
#include <map>
@@ -55,5 +60,9 @@
PatternList patterns;
};
}
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
#endif //_LOG4CXX_TESTS_UTIL_FILTER_H
Modified: logging/log4cxx/trunk/src/test/cpp/vectorappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/vectorappender.h?rev=616699&r1=616698&r2=616699&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/vectorappender.h (original)
+++ logging/log4cxx/trunk/src/test/cpp/vectorappender.h Wed Jan 30 01:26:21 2008
@@ -21,8 +21,6 @@
namespace log4cxx
{
- class VectorAppender;
- typedef helpers::ObjectPtrT<VectorAppender> VectorAppenderPtr;
/**
@@ -57,4 +55,5 @@
bool requiresLayout() const
{ return false; }
};
+ typedef helpers::ObjectPtrT<VectorAppender> VectorAppenderPtr;
}