From a12e134dd53e66aae329834fea65cc439519500b Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Fri, 14 Mar 2014 08:33:26 +0100 Subject: [PATCH 001/165] ChangeLog: Prepare for 1.2.0-RC1. --- ChangeLog | 238 +++++------------------------------------------------- 1 file changed, 19 insertions(+), 219 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc83dbacb..6a006ffa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,228 +1,28 @@ -log4cplus 1.1.0 +log4cplus 1.2.0-RC1 +------------------- + + - TraceLogger and associated `LOG4CPLUS_TRACE_*()` macros now record + function name in generated event. -- Fixed MacOS X support - Reimplemented semaphores using named ones - for Apple builds. + - Added Qt5 based `Qt5DebugAppender`. -- Fixed resource leak on failure in openSocket(). + - Added prototype of Python bindings using Swig 2.0+. -- Improved configuration file modification check to include file size, - in addition to file modification time. + - Autotools based build system has been converted from `Makefile` per + directory to single `Makefile` for the whole project mode. + - Plain text documentation files have been converted to Markdown (with + Pandoc's extensions). -log4cplus 1.1.0-RC10 + - `FileAppender` can now create missing directories in log file path, if + this is enabled by `CreateDirs` property. -- Fixed non-STLPort4 builds with Solaris Studio. Switch - '-library=stlport4' is only added if CXXFLAGS does not already - contain a switch matching -library=(stlport4|stdcxx4|Cstd). + - Added `MSTTSAppender` that uses Windows' text-to-speech engine. -- Fixed --disable-shared MinGW builds. + - `SysLogAppender` can now log into remote `syslog` instance using TCP in + addition to previously supported UDP. -- Fixed non-working MinGW DLL binaries. DllMain() was not being called - because of missing extern "C" in its definition. + - Added Autotest based testsuite running and verifying output of existing + `tests/` directory tests. Improved tests coverage. -- CMake build configuration checks have been improved. (Chernyshev - Vyacheslav) - -- GCC switch -O2 is only added if CXXFLAGS does not already contain - any other -O. - -- Improved logging speed using SysLogAppender and Log4jUdpAppender by - optimizations in both the loggers and in common sockets code. - -- FileAppender locale can now be specified in properties files using - Locale property. See FileAppender Doxygen documentation for more - details. - - -log4cplus 1.1.0-RC9 - -- Improved Log4jUdpAppender compatibility with Chainsaw. - -- Fixed crash, bugs #3467112 and #3563699, related to thread-local - storage destruction. - -- Fixed build with Visual Studio 2005, bug #3565529. (xg00) - -- Created Cygwin port's .cygport definition for log4cplus. - -- Improved hiding of private symbols using GCC's - __attribute__((visibility("hidden"))) and Solaris Studio's __hidden. - -- Fixed build in environments where DEBUG (and other log level names) - are macros. (Chernyshev Vyacheslav) - -- Improved configuration of threads support. (Jens Rehsack) - - -log4cplus 1.1.0-RC8 - -- Turned on __thread (TLS) detection on NetBSD 5.1.0 and later that - has been previously disabled. - -- Improved compatibility with log4cplus 1.0.x: allow using log4cplus - 1.0.x log level to string callbacks in 1.1.x. - -- Improved various M4 macros. - -- Added detection and use C++11 thread_local. - -- Fixed XML entities escaping in Log4jUdpAppender. - -- Re-added synchronization between ConsoleAppender and LogLog. - -- Changed C logger API to return int instead of bool. - -- Added C logger API to Visual Studio 2010 projects. - -- Implemented remote syslog logging using UDP in SysLogAppender. - -- Enabled SysLogAppender on Windows with only remote syslog logging - enabled. - - -log4cplus 1.1.0-RC7 - -IMPORTANT: Builds with --with-iconv configure switch now assume UTF-8 - for plain char strings. - -- Bumped up SO version for UDP sockets support related changes. - -- Removed Windows CE support. - -- Regenerated with Automake 1.12.2. - -- Fixed Fedora RPM builds spec file. - -- Implemented log4cplus.disableOverride similar to log4j's - log4j.disableOverride. - -- Improved support of profiling and debugging builds with Sun CC. - -- Added documentation for configure script options. - -- Added detection and use of clock_nanosleep(). - -- Disabled __thread (TLS) detection for NetBSD. It is broken there. - -- New appender: Log4jUdpAppender. It allows logging using UDP with - log4j XML payload to Chainsaw or Log2Console. (Siva Chandran P) - -- Added support for __func__ as function name source for logging - events. - - -log4cplus 1.1.0-RC6 - -- Fixed compilation for build with wchar_t being alias to unsigned - short (/Zc:wchar_t-) (Windows). - -- Added new appender CLFSAppender (experimental), based on Microsoft - Common Log File System API. - -- Added new appender Qt4DebugAppender (experimenta), based on Qt4's - qDebug(), qWarning() and qCritical() functions. - -- Fixed bug #3530769 - compilation issues with Visual Studio 2011. - -- Added log4cplus.quietMode property handling to PropertyConfigurator. - -- Added #pragma once to all headers. - -- Implemented Time::gettimeofday() using Win32 API's - GetSystemTimeAsFileTime(). - -- Moved file based locking from FileAppender to Appender to make it - available for all appenders. - -- Changed Windows configuration to use __declspec(thread) when - compiling for Windows Vista or later and TlsAlloc() otherwise. - -- Implemented %r PatternLayout format specifier - miliseconds since - process start. - -- Fixed bug #3101459 - TTCCLayout time is not in milliseconds since - process start by default. - - -log4cplus 1.1.0-RC5 - -- Fixed single threaded log4cplus build issues. - -- Added ability to log to std::cerr (Andreas Bießmann). - -- Fixed disabling of LOG4CPLUS_*_FMT() macros. - - -log4cplus 1.1.0-RC4 - -IMPORTANT: Compilation with Solaris Studio now depends on STLPort - (-library=stlport4 switch). The default Cstd library is not - conforming enough for use in log4cplus. - -- Improved behaviour of log4cplus as a component of larger CMake based - project (Andreas Bießmann). - -- Updated various Autoconf detection scripts in m4/ directory to newer - versions. - -- Fixed some signedness and overflow warnings. - -- Improved Autotools build system's behaviour for cross compilation. - -- Added detection of C++11 header and related - functions. Implemented SharedObject reference counting using C++11 - atomics where possible. - -- Fixed compilation with GCC 4.6 in C++11 mode. - -- Fixed some single-threaded compilation and run time issues. - -- Fixed bug #3520891 - FileAppender buffering issue. - -- Updated to Autoconf 2.69, Automake 1.12 and Libtool 2.4.2. - -- Documented build procedure for Solaris Studio. - -- Improved support for Solaris Studio in configure.in. - - -log4cplus 1.1.0-RC3 - -- Fixed log4cplusS.vcxproj - Added missing source files to the - project. - - -log4cplus 1.1.0-RC2 - -- CMake build system fixes. - -- Fixed TTCCLayout double time stamp issue. - - -log4cplus 1.1.0-RC1 - -Important changes relative to PRODUCTION_1_0_x branch: - -- Added AsyncAppender. - -- Added simple C interface for interoperability with C. - -- Added inter-process file locking to file appenders to allow logging - into a single log file from multiple processes. - -- Added Mapped Diagnostic Context (MDC) and associated converter (%X). - -- Added alternative thread identification (%T) converter to pattern layout. - -- Added function name converter (%M). - -- Added wchar_t <-> char conversion implementations based on standard - C locale functions and based on iconv(). - -- Added DeviceAppender to allow use of Boost.IOStream's Sink as appender. - -- Added LOG4CPLUS_*_FMT() macros to allow printf-like formatted output - where it is possible. - -- Logging macros now accept both logger name as string and Logger - instance as their first parameter. + - Many other small and bigger improvements. From 4157a761f986b5932593e19e938c787f56fb84b5 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 15 Mar 2014 22:07:18 +0100 Subject: [PATCH 002/165] Rename prepare_dist_from_bzr.sh to prepare_dist_from_git.sh --- scripts/{prepare_dist_from_bzr.sh => prepare_dist_from_git.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{prepare_dist_from_bzr.sh => prepare_dist_from_git.sh} (100%) diff --git a/scripts/prepare_dist_from_bzr.sh b/scripts/prepare_dist_from_git.sh similarity index 100% rename from scripts/prepare_dist_from_bzr.sh rename to scripts/prepare_dist_from_git.sh From 0be6a7c2d7b71c3cf33488fbb0f84740456630fd Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 15 Mar 2014 22:50:30 +0100 Subject: [PATCH 003/165] scripts/prepare_dist_from_git.sh: Change to use Git. --- scripts/prepare_dist_from_git.sh | 33 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/scripts/prepare_dist_from_git.sh b/scripts/prepare_dist_from_git.sh index b242e8d4b..3f804922f 100755 --- a/scripts/prepare_dist_from_git.sh +++ b/scripts/prepare_dist_from_git.sh @@ -6,7 +6,7 @@ THIS_SCRIPT=`basename "$0"` function usage { - echo "$THIS_SCRIPT []" + echo "$THIS_SCRIPT [] []" } function gpg_sign @@ -32,24 +32,26 @@ function find_archiver command_exists "$1" && echo "$1" || echo ':' } -BZR_URL="$1" -if [[ -z "$BZR_URL" ]] ; then +GIT_URL="$1" +if [[ -z "$GIT_URL" ]] ; then usage exit 1 fi -if [[ -z "$2" ]] ; then - BZR_URL=${BZR_URL%/} - BZR_BASE_URL=${BZR_URL%/*} - BZR_BRANCH_NAME=${BZR_URL#$BZR_BASE_URL} - BZR_BRANCH_NAME=${BZR_BRANCH_NAME#/} - SRC_DIR=$BZR_BRANCH_NAME +GIT_BRANCH="$2" +if [[ -z "$GIT_BRANCH" ]] ; then + usage + exit 1 +fi + +if [[ -z "$3" ]] ; then + SRC_DIR=$GIT_BRANCH else - SRC_DIR="$2" + SRC_DIR="$3" fi -if [[ ! -z "$3" ]] ; then - GPG_KEY="$3" +if [[ ! -z "$4" ]] ; then + GPG_KEY="$4" else GPG_KEY= fi @@ -71,11 +73,12 @@ BZIP2=${BZIP2:-$(find_archiver bzip2)} GZIP=${GZIP:-$(find_archiver gzip)} SEVENZA=${SEVENZA:-$(find_archiver 7za)} LRZIP=${LRZIP:-$(find_archiver lrzip)} -BZR=${BZR:-bzr} +GIT=${GIT:-git} GPG=${GPG:-gpg} -$BZR export --per-file-timestamps -v "$SRC_DIR" "$BZR_URL" -$BZR version-info "$BZR_URL" >"$SRC_DIR/REVISION" +$GIT clone -v --depth=1 "$GIT_URL" "$SRC_DIR" +(cd "$SRC_DIR" && $GIT rev-parse >REVISION) +rm -rf "$SRC_DIR/.git" pushd "$SRC_DIR" $SHELL ./scripts/fix-timestamps.sh From d178fc3ee0115e05c0d87715f61159dc7ef1b034 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 16 Mar 2014 18:50:12 +0100 Subject: [PATCH 004/165] scripts/prepare_dist_from_git.sh: Check out requested branch and not HEAD. --- scripts/prepare_dist_from_git.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepare_dist_from_git.sh b/scripts/prepare_dist_from_git.sh index 3f804922f..07777921b 100755 --- a/scripts/prepare_dist_from_git.sh +++ b/scripts/prepare_dist_from_git.sh @@ -76,7 +76,7 @@ LRZIP=${LRZIP:-$(find_archiver lrzip)} GIT=${GIT:-git} GPG=${GPG:-gpg} -$GIT clone -v --depth=1 "$GIT_URL" "$SRC_DIR" +$GIT clone -v --depth=1 "$GIT_URL" -b "$GIT_BRANCH" "$SRC_DIR" (cd "$SRC_DIR" && $GIT rev-parse >REVISION) rm -rf "$SRC_DIR/.git" From 42692903081ee435cc4f191550e7070fb8fb3415 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Thu, 20 Mar 2014 08:23:17 +0100 Subject: [PATCH 005/165] docs/release.txt: We use Git now. --- docs/release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release.txt b/docs/release.txt index d46e1c1c6..884ad23d7 100644 --- a/docs/release.txt +++ b/docs/release.txt @@ -8,7 +8,7 @@ This describes log4cplus release procedure: to date. Run `scripts/propagate-version.sh` followed by `scripts/doautoreconf.sh`. _Do not forget to commit the changes._ - #. Run `scripts/prepare_dist_from_bzr.sh` to prepare tarballs. + #. Run `scripts/prepare_dist_from_git.sh` to prepare tarballs. #. [Upload tarballs][4] to SourceForge. From 2357f234209c6bf46ea7b94029dcdced2b165bb0 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 2 Apr 2014 19:11:05 +0200 Subject: [PATCH 006/165] thread/syncprims-pub-impl.h: Fix bug #298. -- int to pointer cast error on Xcode 5.1 --- include/log4cplus/thread/syncprims-pub-impl.h | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/include/log4cplus/thread/syncprims-pub-impl.h b/include/log4cplus/thread/syncprims-pub-impl.h index dd53bce0b..15e045cd9 100644 --- a/include/log4cplus/thread/syncprims-pub-impl.h +++ b/include/log4cplus/thread/syncprims-pub-impl.h @@ -1,16 +1,16 @@ // -*- C++ -*- // Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. -// +// // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: -// +// // 1. Redistributions of source code must retain the above copyright notice, // this list of conditions and the following disclaimer. -// +// // 2. Redistributions in binary form must reproduce the above copyright notice, // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. -// +// // THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND // FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -38,9 +38,11 @@ #if defined (LOG4CPLUS_SINGLE_THREADED) # define LOG4CPLUS_THREADED(x) +# define LOG4CPLUS_THREADED2(x, y) (y) #else # include # define LOG4CPLUS_THREADED(x) (x) +# define LOG4CPLUS_THREADED2(x, y) (x) #endif @@ -61,8 +63,9 @@ MutexImplBase::~MutexImplBase () // LOG4CPLUS_INLINE_EXPORT -Mutex::Mutex (Mutex::Type t) - : mtx (LOG4CPLUS_THREADED (new impl::Mutex (t)) + 0) +Mutex::Mutex (Mutex::Type LOG4CPLUS_THREADED (t)) + : mtx (LOG4CPLUS_THREADED2 (new impl::Mutex (t), + static_cast(0))) { } @@ -105,7 +108,8 @@ SemaphoreImplBase::~SemaphoreImplBase () LOG4CPLUS_INLINE_EXPORT Semaphore::Semaphore (unsigned LOG4CPLUS_THREADED (max), unsigned LOG4CPLUS_THREADED (initial)) - : sem (LOG4CPLUS_THREADED (new impl::Semaphore (max, initial)) + 0) + : sem (LOG4CPLUS_THREADED2 (new impl::Semaphore (max, initial), + static_cast(0))) { } @@ -147,7 +151,8 @@ FairMutexImplBase::~FairMutexImplBase () LOG4CPLUS_INLINE_EXPORT FairMutex::FairMutex () - : mtx (LOG4CPLUS_THREADED (new impl::FairMutex) + 0) + : mtx (LOG4CPLUS_THREADED2 (new impl::FairMutex, + static_cast(0))) { } @@ -189,7 +194,8 @@ ManualResetEventImplBase::~ManualResetEventImplBase () LOG4CPLUS_INLINE_EXPORT ManualResetEvent::ManualResetEvent (bool LOG4CPLUS_THREADED (sig)) - : ev (LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig)) + 0) + : ev (LOG4CPLUS_THREADED2 (new impl::ManualResetEvent (sig), + static_cast(0))) { } @@ -251,7 +257,8 @@ SharedMutexImplBase::~SharedMutexImplBase () LOG4CPLUS_INLINE_EXPORT SharedMutex::SharedMutex () - : sm (LOG4CPLUS_THREADED (new impl::SharedMutex) + 0) + : sm (LOG4CPLUS_THREADED2 (new impl::SharedMutex, + static_cast(0))) { } @@ -292,7 +299,7 @@ SharedMutex::wrunlock () const } -} } // namespace log4cplus { namespace thread { +} } // namespace log4cplus { namespace thread { #endif // LOG4CPLUS_ENABLE_SYNCPRIMS_PUB_IMPL From ad2f6363640b8ea7ccba71f7540997fc9370ad46 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 4 May 2014 08:19:54 +0200 Subject: [PATCH 007/165] android/android.toolchain.cmake: Update from https://github.com/taka-no-me/android-cmake/blob/master/android.toolchain.cmake. --- android/android.toolchain.cmake | 121 ++++++++++++++++++++------------ 1 file changed, 75 insertions(+), 46 deletions(-) diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake index 1b9880e1d..dfbd1218c 100644 --- a/android/android.toolchain.cmake +++ b/android/android.toolchain.cmake @@ -1,5 +1,5 @@ # Copyright (c) 2010-2011, Ethan Rublee -# Copyright (c) 2011-2013, Andrey Kamaev +# Copyright (c) 2011-2014, Andrey Kamaev # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -12,9 +12,9 @@ # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. # -# 3. The name of the copyright holders may be used to endorse or promote -# products derived from this software without specific prior written -# permission. +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from this +# software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -29,7 +29,7 @@ # POSSIBILITY OF SUCH DAMAGE. # ------------------------------------------------------------------------------ -# Android CMake toolchain file, for use with the Android NDK r5-r8 +# Android CMake toolchain file, for use with the Android NDK r5-r9 # Requires cmake 2.6.3 or newer (2.8.5 or newer is recommended). # See home page: https://github.com/taka-no-me/android-cmake # @@ -87,8 +87,7 @@ # "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP. # "x86" - matches to the NDK ABI with the same name. # See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation. -# "mips" - matches to the NDK ABI with the same name -# (It is not tested on real devices by the authos of this toolchain) +# "mips" - matches to the NDK ABI with the same name. # See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation. # # ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for. @@ -292,6 +291,18 @@ # - April 2013 # [+] support non-release NDK layouts (from Linaro git and Android git) # [~] automatically detect if explicit link to crtbegin_*.o is needed +# - June 2013 +# [~] fixed stl include path for standalone toolchain made by NDK >= r8c +# - July 2013 +# [+] updated for NDK r9 +# - November 2013 +# [+] updated for NDK r9b +# - December 2013 +# [+] updated for NDK r9c +# - January 2014 +# [~] fix copying of shared STL +# - April 2014 +# [+] updated for NDK r9d # ------------------------------------------------------------------------------ cmake_minimum_required( VERSION 2.6.3 ) @@ -318,7 +329,7 @@ set( CMAKE_SYSTEM_VERSION 1 ) # rpath makes low sence for Android set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." ) -set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) +set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS) if( CMAKE_HOST_WIN32 ) file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS ) @@ -464,7 +475,7 @@ endif() # detect current host platform -if( NOT DEFINED ANDROID_NDK_HOST_X64 AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") +if( NOT DEFINED ANDROID_NDK_HOST_X64 AND (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64" OR CMAKE_HOST_APPLE) ) set( ANDROID_NDK_HOST_X64 1 CACHE BOOL "Try to use 64-bit compiler toolchain" ) mark_as_advanced( ANDROID_NDK_HOST_X64 ) endif() @@ -484,9 +495,7 @@ else() message( FATAL_ERROR "Cross-compilation on your platform is not supported by this cmake toolchain" ) endif() -# CMAKE_HOST_SYSTEM_PROCESSOR on MacOS X always says i386 on Intel platform -# So we do not trust ANDROID_NDK_HOST_X64 on Apple hosts -if( NOT ANDROID_NDK_HOST_X64 AND NOT CMAKE_HOST_APPLE) +if( NOT ANDROID_NDK_HOST_X64 ) set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) endif() @@ -634,30 +643,27 @@ endif() macro( __GLOB_NDK_TOOLCHAINS __availableToolchainsVar __availableToolchainsLst __toolchain_subpath ) foreach( __toolchain ${${__availableToolchainsLst}} ) - # Skip renderscript folder. It's not C++ toolchain - if (NOT ${__toolchain} STREQUAL "renderscript") - if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}${__toolchain_subpath}" ) - string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" ) - else() - set( __gcc_toolchain "${__toolchain}" ) - endif() - __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK_TOOLCHAINS_PATH}/${__gcc_toolchain}${__toolchain_subpath}" ) - if( __machine ) - string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9x]+)?$" __version "${__gcc_toolchain}" ) - if( __machine MATCHES i686 ) - set( __arch "x86" ) - elseif( __machine MATCHES arm ) - set( __arch "arm" ) - elseif( __machine MATCHES mipsel ) - set( __arch "mipsel" ) - endif() - list( APPEND __availableToolchainMachines "${__machine}" ) - list( APPEND __availableToolchainArchs "${__arch}" ) - list( APPEND __availableToolchainCompilerVersions "${__version}" ) - list( APPEND ${__availableToolchainsVar} "${__toolchain}" ) + if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}${__toolchain_subpath}" ) + string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" ) + else() + set( __gcc_toolchain "${__toolchain}" ) + endif() + __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK_TOOLCHAINS_PATH}/${__gcc_toolchain}${__toolchain_subpath}" ) + if( __machine ) + string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9x]+)?$" __version "${__gcc_toolchain}" ) + if( __machine MATCHES i686 ) + set( __arch "x86" ) + elseif( __machine MATCHES arm ) + set( __arch "arm" ) + elseif( __machine MATCHES mipsel ) + set( __arch "mipsel" ) endif() - unset( __gcc_toolchain ) + list( APPEND __availableToolchainMachines "${__machine}" ) + list( APPEND __availableToolchainArchs "${__arch}" ) + list( APPEND __availableToolchainCompilerVersions "${__version}" ) + list( APPEND ${__availableToolchainsVar} "${__toolchain}" ) endif() + unset( __gcc_toolchain ) endforeach() endmacro() @@ -687,6 +693,7 @@ if( BUILD_WITH_ANDROID_NDK ) endif() __LIST_FILTER( __availableToolchainsLst "^[.]" ) __LIST_FILTER( __availableToolchainsLst "llvm" ) + __LIST_FILTER( __availableToolchainsLst "renderscript" ) __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 ) __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" ) @@ -975,7 +982,11 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) set( ANDROID_SYSROOT "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot" ) if( NOT ANDROID_STL STREQUAL "none" ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" ) + set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/include/c++/${ANDROID_COMPILER_VERSION}" ) + if( NOT EXISTS "${ANDROID_STL_INCLUDE_DIRS}" ) + # old location ( pre r8c ) + set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" ) + endif() if( ARMEABI_V7A AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}/bits" ) list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}" ) elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb/bits" ) @@ -1130,15 +1141,7 @@ endif() # case of shared STL linkage if( ANDROID_STL MATCHES "shared" AND DEFINED __libstl ) string( REPLACE "_static.a" "_shared.so" __libstl "${__libstl}" ) - if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" ) - get_filename_component( __libstlname "${__libstl}" NAME ) - execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess ) - if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}") - message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" ) - endif() - unset( __fileCopyProcess ) - unset( __libstlname ) - endif() + # TODO: check if .so file exists before the renaming endif() @@ -1503,7 +1506,8 @@ endif() # global includes and link directories include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} ) -link_directories( "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" ) +get_filename_component(__android_install_path "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" ABSOLUTE) # avoid CMP0015 policy warning +link_directories( "${__android_install_path}" ) # detect if need link crtbegin_so.o explicitly if( NOT DEFINED ANDROID_EXPLICIT_CRT_LINK ) @@ -1555,6 +1559,18 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" ) endif() +# copy shaed stl library to build directory +if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" ) + get_filename_component( __libstlname "${__libstl}" NAME ) + execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess ) + if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}") + message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" ) + endif() + unset( __fileCopyProcess ) + unset( __libstlname ) +endif() + + # set these global flags for cmake client scripts to change behavior set( ANDROID True ) set( BUILD_ANDROID True ) @@ -1663,6 +1679,19 @@ if( NOT PROJECT_NAME STREQUAL "CMAKE_TRY_COMPILE" ) endif() +# force cmake to produce / instead of \ in build commands for Ninja generator +if( CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_HOST_WIN32 ) + # it is a bad hack after all + # CMake generates Ninja makefiles with UNIX paths only if it thinks that we are going to build with MinGW + set( CMAKE_COMPILER_IS_MINGW TRUE ) # tell CMake that we are MinGW + set( CMAKE_CROSSCOMPILING TRUE ) # stop recursion + enable_language( C ) + enable_language( CXX ) + # unset( CMAKE_COMPILER_IS_MINGW ) # can't unset because CMake does not convert back-slashes in response files without it + unset( MINGW ) +endif() + + # set some obsolete variables for backward compatibility set( ANDROID_SET_OBSOLETE_VARIABLES ON CACHE BOOL "Define obsolete Andrid-specific cmake variables" ) mark_as_advanced( ANDROID_SET_OBSOLETE_VARIABLES ) @@ -1717,7 +1746,7 @@ endif() # BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used # ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform # ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86" or "mips" depending on ANDROID_ABI -# ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e; set only for NDK +# ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e, r9, r9b, r9c, r9d; set only for NDK # ANDROID_ARCH_NAME : "arm" or "x86" or "mips" depending on ANDROID_ABI # ANDROID_SYSROOT : path to the compiler sysroot # TOOL_OS_SUFFIX : "" or ".exe" depending on host platform From 8ac1e083edd43b30513dd064e45868b94ad1870d Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 4 May 2014 18:06:38 +0200 Subject: [PATCH 008/165] README.md: Document issue and work-around for Android's emutls issue. --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 06ce91c59..d60539b5e 100644 --- a/README.md +++ b/README.md @@ -253,6 +253,21 @@ compiling [log4cplus] targeted to Windows Vista or later. [tlsvista]: http://support.microsoft.com/kb/118816/en-us +Android, TLS and CMake +---------------------- + +[log4cplus] uses thread--local storage (TLS, see "Windows and TLS" for +details). On the Android platform, when [log4cplus] is being compiled using +the `android/android.toolchain.cmake`, you might get errors featuring the +`__emutls` symbol: + + + global-init.cxx:268:46: error: log4cplus::internal::__emutls_t._ZN9log4cplus8internal3ptdE causes a section type conflict with log4cplus::internal::ptd + +To work around this issue, invoke CMake with +`-DANDROID_FUNCTION_LEVEL_LINKING:BOOL=OFF` option. + + Threads and signals ------------------- From 77349fbfa43b68064d0f245473cf669392eef0a9 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 7 May 2014 16:30:56 +0200 Subject: [PATCH 009/165] src/CMakeLists.txt: Do not set SOVERSION and VERSION properties for Android builds. --- src/CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8cb0ca2d0..c8429892f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -97,10 +97,16 @@ if (LOG4CPLUS_WITH_ICONV AND LIBICONV) endif () target_link_libraries (${log4cplus} ${log4cplus_LIBS}) -set_target_properties (${log4cplus} PROPERTIES - VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}" - SOVERSION "${log4cplus_soversion}" - COMPILE_FLAGS "-DINSIDE_LOG4CPLUS") +if (ANDROID) + # Android does not seem to have SO version support. + set_target_properties (${log4cplus} PROPERTIES + COMPILE_FLAGS "-DINSIDE_LOG4CPLUS") +else () + set_target_properties (${log4cplus} PROPERTIES + VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}" + SOVERSION "${log4cplus_soversion}" + COMPILE_FLAGS "-DINSIDE_LOG4CPLUS") +endif () if (WIN32) set_target_properties (${log4cplus} PROPERTIES From 939d8b53e251a79a32c39272bdbacdadaf8953df Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 7 May 2014 21:39:54 +0200 Subject: [PATCH 010/165] scripts/prepare_dist_from_git.sh: Generate correct REVISION file contents. --- scripts/prepare_dist_from_git.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepare_dist_from_git.sh b/scripts/prepare_dist_from_git.sh index 07777921b..6c1d5abc1 100755 --- a/scripts/prepare_dist_from_git.sh +++ b/scripts/prepare_dist_from_git.sh @@ -77,7 +77,7 @@ GIT=${GIT:-git} GPG=${GPG:-gpg} $GIT clone -v --depth=1 "$GIT_URL" -b "$GIT_BRANCH" "$SRC_DIR" -(cd "$SRC_DIR" && $GIT rev-parse >REVISION) +(cd "$SRC_DIR" && $GIT rev-parse @ >REVISION) rm -rf "$SRC_DIR/.git" pushd "$SRC_DIR" From cf256888b44e2222d2abdf8e70046aeec7343d82 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Thu, 12 Jun 2014 11:14:22 +0200 Subject: [PATCH 011/165] ChangeLog: Update for 1.2.0-RC2. --- ChangeLog | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a006ffa8..7a1eadba4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,28 +1,41 @@ +log4cplus 1.2.0-RC2 +------------------- + + - Fixed bug #298. -- int to pointer cast error on Xcode 5.1. + + - Updated `android/android.toolchain.cmake`. + + - Documented issue and work-around for Android's emutls issue. + + - Do not set SOVERSION and VERSION properties for CMake based Android +builds. + + log4cplus 1.2.0-RC1 ------------------- - TraceLogger and associated `LOG4CPLUS_TRACE_*()` macros now record - function name in generated event. +function name in generated event. - Added Qt5 based `Qt5DebugAppender`. - Added prototype of Python bindings using Swig 2.0+. - Autotools based build system has been converted from `Makefile` per - directory to single `Makefile` for the whole project mode. +directory to single `Makefile` for the whole project mode. - Plain text documentation files have been converted to Markdown (with - Pandoc's extensions). +Pandoc's extensions). - `FileAppender` can now create missing directories in log file path, if - this is enabled by `CreateDirs` property. +this is enabled by `CreateDirs` property. - Added `MSTTSAppender` that uses Windows' text-to-speech engine. - `SysLogAppender` can now log into remote `syslog` instance using TCP in - addition to previously supported UDP. +addition to previously supported UDP. - Added Autotest based testsuite running and verifying output of existing - `tests/` directory tests. Improved tests coverage. +`tests/` directory tests. Improved tests coverage. - Many other small and bigger improvements. From 3fd2efa9f93408ac76c37332f0bb1b34b874eed5 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 17 Aug 2014 20:49:48 +0200 Subject: [PATCH 012/165] Initialize log4cplus early if possible. Use GCC constructor function attribute when it is present. --- Makefile.in | 1 + acinclude.m4 | 1 + configure | 55 ++++++ configure.ac | 4 + include/Makefile.in | 1 + include/log4cplus/config.h.in | 6 + include/log4cplus/config.hxx | 7 + include/log4cplus/config/defines.hxx.in | 3 + m4/ax_gcc_func_attribute.m4 | 219 ++++++++++++++++++++++++ src/global-init.cxx | 22 ++- 10 files changed, 312 insertions(+), 7 deletions(-) create mode 100644 m4/ax_gcc_func_attribute.m4 diff --git a/Makefile.in b/Makefile.in index 7b007571c..dea9bb344 100644 --- a/Makefile.in +++ b/Makefile.in @@ -150,6 +150,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_multi_module_support.m4 \ + $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ $(top_srcdir)/tests/configure.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/acinclude.m4 b/acinclude.m4 index 2c3411f25..4d84a2c6e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -19,3 +19,4 @@ m4_include([m4/pkg.m4]) m4_include([m4/ax_pkg_swig.m4]) m4_include([m4/ax_python_devel.m4]) m4_include([m4/ax_swig_multi_module_support.m4]) +m4_include([m4/ax_gcc_func_attribute.m4]) diff --git a/configure b/configure index b94f614c5..83e90abd7 100755 --- a/configure +++ b/configure @@ -8310,6 +8310,61 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((constructor))" >&5 +$as_echo_n "checking for __attribute__((constructor))... " >&6; } +if ${ax_cv_have_func_attribute_constructor+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + int foo( void ) __attribute__((constructor)); + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if test -s conftest.err; then : + ax_cv_have_func_attribute_constructor=no +else + ax_cv_have_func_attribute_constructor=yes +fi +else + ax_cv_have_func_attribute_constructor=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_constructor" >&5 +$as_echo "$ax_cv_have_func_attribute_constructor" >&6; } + + if test yes = $ax_cv_have_func_attribute_constructor; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1 +_ACEOF + +fi + + + + +if test "x$ax_cv_have_func_attribute_constructor" = "xyes"; then : + $as_echo "#define LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1" >>confdefs.h + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 $as_echo_n "checking for library containing strerror... " >&6; } if ${ac_cv_search_strerror+:} false; then : diff --git a/configure.ac b/configure.ac index ad0fa731c..4d13fb5ac 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,10 @@ AH_TEMPLATE([LOG4CPLUS_HAVE_FUNC_SYMBOL]) AS_IF([test "x$ac_cv_have___func___symbol" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE_FUNC_SYMBOL])]) +AX_GCC_FUNC_ATTRIBUTE([constructor]) +AH_TEMPLATE([LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR]) +AS_IF([test "x$ax_cv_have_func_attribute_constructor" = "xyes"], + [AC_DEFINE([LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR])]) dnl Checks for libraries. diff --git a/include/Makefile.in b/include/Makefile.in index dfbfecdb9..27da041ae 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -105,6 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_multi_module_support.m4 \ + $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ $(top_srcdir)/tests/configure.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/include/log4cplus/config.h.in b/include/log4cplus/config.h.in index 5e24fbccc..402a4d35b 100644 --- a/include/log4cplus/config.h.in +++ b/include/log4cplus/config.h.in @@ -39,6 +39,9 @@ /* Define to 1 if you have the `ftime' function. */ #undef HAVE_FTIME +/* Define to 1 if the system has the `constructor' function attribute */ +#undef HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR + /* */ #undef HAVE_GETADDRINFO @@ -283,6 +286,9 @@ /* */ #undef LOG4CPLUS_HAVE_FUNCTION_MACRO +/* */ +#undef LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR + /* */ #undef LOG4CPLUS_HAVE_FUNC_SYMBOL diff --git a/include/log4cplus/config.hxx b/include/log4cplus/config.hxx index 153cf9eef..9d2429be1 100644 --- a/include/log4cplus/config.hxx +++ b/include/log4cplus/config.hxx @@ -154,6 +154,13 @@ # pragma once #endif +#if defined (LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR) +# define LOG4CPLUS_CONSTRUCTOR_FUNC(prio) \ + __attribute__ ((__constructor__ ((prio)))) +#else +# define LOG4CPLUS_CONSTRUCTOR_FUNC(prio) /* empty */ +#endif + #include #if defined(__cplusplus) diff --git a/include/log4cplus/config/defines.hxx.in b/include/log4cplus/config/defines.hxx.in index e730604c3..184fcb2ca 100644 --- a/include/log4cplus/config/defines.hxx.in +++ b/include/log4cplus/config/defines.hxx.in @@ -278,4 +278,7 @@ /* Define to 1 if you have the `OutputDebugString' function. */ #undef LOG4CPLUS_HAVE_OUTPUTDEBUGSTRING +/* Define to 1 if the system has the `constructor' function attribute */ +#undef LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR + #endif // LOG4CPLUS_CONFIG_DEFINES_HXX diff --git a/m4/ax_gcc_func_attribute.m4 b/m4/ax_gcc_func_attribute.m4 new file mode 100644 index 000000000..de11303e7 --- /dev/null +++ b/m4/ax_gcc_func_attribute.m4 @@ -0,0 +1,219 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_gcc_func_attribute.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_FUNC_ATTRIBUTE(ATTRIBUTE) +# +# DESCRIPTION +# +# This macro checks if the compiler supports one of GCC's function +# attributes; many other compilers also provide function attributes with +# the same syntax. Compiler warnings are used to detect supported +# attributes as unsupported ones are ignored by default so quieting +# warnings when using this macro will yield false positives. +# +# The ATTRIBUTE parameter holds the name of the attribute to be checked. +# +# If ATTRIBUTE is supported define HAVE_FUNC_ATTRIBUTE_. +# +# The macro caches its result in the ax_cv_have_func_attribute_ +# variable. +# +# The macro currently supports the following function attributes: +# +# alias +# aligned +# alloc_size +# always_inline +# artificial +# cold +# const +# constructor +# deprecated +# destructor +# dllexport +# dllimport +# error +# externally_visible +# flatten +# format +# format_arg +# gnu_inline +# hot +# ifunc +# leaf +# malloc +# noclone +# noinline +# nonnull +# noreturn +# nothrow +# optimize +# pure +# unused +# used +# visibility +# warning +# warn_unused_result +# weak +# weakref +# +# Unsuppored function attributes will be tested with a prototype returning +# an int and not accepting any arguments and the result of the check might +# be wrong or meaningless so use with care. +# +# LICENSE +# +# Copyright (c) 2013 Gabriele Svelto +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [ + AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1]) + + AC_CACHE_CHECK([for __attribute__(($1))], [ac_var], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ + m4_case([$1], + [alias], [ + int foo( void ) { return 0; } + int bar( void ) __attribute__(($1("foo"))); + ], + [aligned], [ + int foo( void ) __attribute__(($1(32))); + ], + [alloc_size], [ + void *foo(int a) __attribute__(($1(1))); + ], + [always_inline], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [artificial], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [cold], [ + int foo( void ) __attribute__(($1)); + ], + [const], [ + int foo( void ) __attribute__(($1)); + ], + [constructor], [ + int foo( void ) __attribute__(($1)); + ], + [deprecated], [ + int foo( void ) __attribute__(($1(""))); + ], + [destructor], [ + int foo( void ) __attribute__(($1)); + ], + [dllexport], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [dllimport], [ + int foo( void ) __attribute__(($1)); + ], + [error], [ + int foo( void ) __attribute__(($1(""))); + ], + [externally_visible], [ + int foo( void ) __attribute__(($1)); + ], + [flatten], [ + int foo( void ) __attribute__(($1)); + ], + [format], [ + int foo(const char *p, ...) __attribute__(($1(printf, 1, 2))); + ], + [format_arg], [ + char *foo(const char *p) __attribute__(($1(1))); + ], + [gnu_inline], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [hot], [ + int foo( void ) __attribute__(($1)); + ], + [ifunc], [ + int my_foo( void ) { return 0; } + static int (*resolve_foo(void))(void) { return my_foo; } + int foo( void ) __attribute__(($1("resolve_foo"))); + ], + [leaf], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [malloc], [ + void *foo( void ) __attribute__(($1)); + ], + [noclone], [ + int foo( void ) __attribute__(($1)); + ], + [noinline], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [nonnull], [ + int foo(char *p) __attribute__(($1(1))); + ], + [noreturn], [ + void foo( void ) __attribute__(($1)); + ], + [nothrow], [ + int foo( void ) __attribute__(($1)); + ], + [optimize], [ + __attribute__(($1(3))) int foo( void ) { return 0; } + ], + [pure], [ + int foo( void ) __attribute__(($1)); + ], + [unused], [ + int foo( void ) __attribute__(($1)); + ], + [used], [ + int foo( void ) __attribute__(($1)); + ], + [visibility], [ + int foo_def( void ) __attribute__(($1("default"))); + int foo_hid( void ) __attribute__(($1("hidden"))); + int foo_int( void ) __attribute__(($1("internal"))); + int foo_pro( void ) __attribute__(($1("protected"))); + ], + [warning], [ + int foo( void ) __attribute__(($1(""))); + ], + [warn_unused_result], [ + int foo( void ) __attribute__(($1)); + ], + [weak], [ + int foo( void ) __attribute__(($1)); + ], + [weakref], [ + static int foo( void ) { return 0; } + static int bar( void ) __attribute__(($1("foo"))); + ], + [ + m4_warn([syntax], [Unsupported attribute $1, the test may fail]) + int foo( void ) __attribute__(($1)); + ] + )], []) + ], + dnl GCC doesn't exit with an error if an unknown attribute is + dnl provided but only outputs a warning, so accept the attribute + dnl only if no warning were issued. + [AS_IF([test -s conftest.err], + [AS_VAR_SET([ac_var], [no])], + [AS_VAR_SET([ac_var], [yes])])], + [AS_VAR_SET([ac_var], [no])]) + ]) + + AS_IF([test yes = AS_VAR_GET([ac_var])], + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FUNC_ATTRIBUTE_$1), 1, + [Define to 1 if the system has the `$1' function attribute])], []) + + AS_VAR_POPDEF([ac_var]) +]) diff --git a/src/global-init.cxx b/src/global-init.cxx index 73996634a..a16c63d7b 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -50,7 +50,7 @@ LOG4CPLUS_EXPORT tostream & tcerr = std::cerr; #endif // UNICODE -namespace +namespace { @@ -72,7 +72,7 @@ struct DefaultContext enum DCState -{ +{ DC_UNINITIALIZED, DC_INITIALIZED, DC_DESTROYED @@ -82,7 +82,7 @@ enum DCState static DCState default_context_state; static DefaultContext * default_context; - + struct destroy_default_context { ~destroy_default_context () @@ -109,7 +109,7 @@ alloc_dc () throw std::logic_error ("alloc_dc() called in DC_INITIALIZED state."); default_context = new DefaultContext; - + if (default_context_state == DC_DESTROYED) default_context->loglog.error ( LOG4CPLUS_TEXT ("Re-initializing default context after it has") @@ -162,7 +162,7 @@ getTTCCLayoutTimeBase () LogLevelManager & -getLogLevelManager () +getLogLevelManager () { return get_dc ()->log_level_manager; } @@ -175,7 +175,7 @@ getDefaultHierarchy () } -NDC & +NDC & getNDC () { return get_dc ()->ndc; @@ -419,7 +419,7 @@ thread_callback (LPVOID /*hinstDLL*/, DWORD fdwReason, LPVOID /*lpReserved*/) { // Perform actions based on the reason for calling. switch (fdwReason) - { + { case DLL_PROCESS_ATTACH: { // We cannot initialize log4cplus directly here. This is because @@ -540,6 +540,14 @@ struct _static_log4cplus_initializer #else namespace { +static void +_log4cplus_initializer_func () LOG4CPLUS_CONSTRUCTOR_FUNC(65535 / 2); +static void +_log4cplus_initializer_func () +{ + log4cplus::initializeLog4cplus(); +} + struct _static_log4cplus_initializer { _static_log4cplus_initializer () From 73f526fdc917aa0dcf99639adb811c7d508e9ec7 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 17 Aug 2014 22:20:24 +0200 Subject: [PATCH 013/165] Check for init_priority GCC variable attribute and use it. --- Makefile.in | 1 + acinclude.m4 | 1 + configure | 59 ++++++++++ configure.ac | 5 + include/Makefile.in | 1 + include/log4cplus/config.h.in | 6 + include/log4cplus/config.hxx | 9 ++ include/log4cplus/config/defines.hxx.in | 3 + m4/ax_gcc_var_attribute.m4 | 141 ++++++++++++++++++++++++ src/global-init.cxx | 9 +- 10 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 m4/ax_gcc_var_attribute.m4 diff --git a/Makefile.in b/Makefile.in index dea9bb344..f58087229 100644 --- a/Makefile.in +++ b/Makefile.in @@ -151,6 +151,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_multi_module_support.m4 \ $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ + $(top_srcdir)/m4/ax_gcc_var_attribute.m4 \ $(top_srcdir)/tests/configure.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/acinclude.m4 b/acinclude.m4 index 4d84a2c6e..d768a0e68 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -20,3 +20,4 @@ m4_include([m4/ax_pkg_swig.m4]) m4_include([m4/ax_python_devel.m4]) m4_include([m4/ax_swig_multi_module_support.m4]) m4_include([m4/ax_gcc_func_attribute.m4]) +m4_include([m4/ax_gcc_var_attribute.m4]) diff --git a/configure b/configure index 83e90abd7..97c461d1a 100755 --- a/configure +++ b/configure @@ -8365,6 +8365,65 @@ if test "x$ax_cv_have_func_attribute_constructor" = "xyes"; then : fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((init_priority))" >&5 +$as_echo_n "checking for __attribute__((init_priority))... " >&6; } +if ${ax_cv_have_var_attribute_init_priority+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + struct bar { bar() {} ~bar() {} }; + bar b __attribute__((init_priority(65535/2))); + +int +main () +{ + + + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if test -s conftest.err; then : + ax_cv_have_var_attribute_init_priority=no +else + ax_cv_have_var_attribute_init_priority=yes +fi +else + ax_cv_have_var_attribute_init_priority=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_var_attribute_init_priority" >&5 +$as_echo "$ax_cv_have_var_attribute_init_priority" >&6; } + + if test yes = $ax_cv_have_var_attribute_init_priority; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_VAR_ATTRIBUTE_INIT_PRIORITY 1 +_ACEOF + +fi + + + + +if test "x$ax_cv_have_var_attribute_init_priority" = "xyes"; then : + $as_echo "#define LOG4CPLUS_HAVE_VAR_ATTRIBUTE_INIT_PRIORITY 1" >>confdefs.h + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 $as_echo_n "checking for library containing strerror... " >&6; } if ${ac_cv_search_strerror+:} false; then : diff --git a/configure.ac b/configure.ac index 4d13fb5ac..db9d28424 100644 --- a/configure.ac +++ b/configure.ac @@ -392,6 +392,11 @@ AH_TEMPLATE([LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR]) AS_IF([test "x$ax_cv_have_func_attribute_constructor" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR])]) +AX_GCC_VAR_ATTRIBUTE([init_priority]) +AH_TEMPLATE([LOG4CPLUS_HAVE_VAR_ATTRIBUTE_INIT_PRIORITY]) +AS_IF([test "x$ax_cv_have_var_attribute_init_priority" = "xyes"], + [AC_DEFINE([LOG4CPLUS_HAVE_VAR_ATTRIBUTE_INIT_PRIORITY])]) + dnl Checks for libraries. AC_SEARCH_LIBS([strerror], [cposix]) diff --git a/include/Makefile.in b/include/Makefile.in index 27da041ae..102e0d720 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -106,6 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_multi_module_support.m4 \ $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \ + $(top_srcdir)/m4/ax_gcc_var_attribute.m4 \ $(top_srcdir)/tests/configure.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/include/log4cplus/config.h.in b/include/log4cplus/config.h.in index 402a4d35b..2b0cab28b 100644 --- a/include/log4cplus/config.h.in +++ b/include/log4cplus/config.h.in @@ -172,6 +172,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if the system has the `init_priority' variable attribute */ +#undef HAVE_VAR_ATTRIBUTE_INIT_PRIORITY + /* Define to 1 if you have the `vfprintf_s' function. */ #undef HAVE_VFPRINTF_S @@ -430,6 +433,9 @@ /* */ #undef LOG4CPLUS_HAVE_UNISTD_H +/* */ +#undef LOG4CPLUS_HAVE_VAR_ATTRIBUTE_INIT_PRIORITY + /* */ #undef LOG4CPLUS_HAVE_VFPRINTF_S diff --git a/include/log4cplus/config.hxx b/include/log4cplus/config.hxx index 9d2429be1..22d039768 100644 --- a/include/log4cplus/config.hxx +++ b/include/log4cplus/config.hxx @@ -161,6 +161,15 @@ # define LOG4CPLUS_CONSTRUCTOR_FUNC(prio) /* empty */ #endif +#if defined (LOG4CPLUS_HAVE_VAR_ATTRIBUTE_INIT_PRIORITY) +# define LOG4CPLUS_INIT_PRIORITY(prio) \ + __attribute__ ((__init_priority__ ((prio)))) +#else +# define LOG4CPLUS_INIT_PRIORITY(prio) /* empty */ +#endif + +#define LOG4CPLUS_INIT_PRIORITY_BASE (65535 / 2) + #include #if defined(__cplusplus) diff --git a/include/log4cplus/config/defines.hxx.in b/include/log4cplus/config/defines.hxx.in index 184fcb2ca..79a5665d1 100644 --- a/include/log4cplus/config/defines.hxx.in +++ b/include/log4cplus/config/defines.hxx.in @@ -281,4 +281,7 @@ /* Define to 1 if the system has the `constructor' function attribute */ #undef LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR +/* Define to 1 if the system has the `init_priority' variable attribute */ +#undef LOG4CPLUS_HAVE_VAR_ATTRIBUTE_INIT_PRIORITY + #endif // LOG4CPLUS_CONFIG_DEFINES_HXX diff --git a/m4/ax_gcc_var_attribute.m4 b/m4/ax_gcc_var_attribute.m4 new file mode 100644 index 000000000..4f60f6da1 --- /dev/null +++ b/m4/ax_gcc_var_attribute.m4 @@ -0,0 +1,141 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_gcc_var_attribute.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_VAR_ATTRIBUTE(ATTRIBUTE) +# +# DESCRIPTION +# +# This macro checks if the compiler supports one of GCC's variable +# attributes; many other compilers also provide variable attributes with +# the same syntax. Compiler warnings are used to detect supported +# attributes as unsupported ones are ignored by default so quieting +# warnings when using this macro will yield false positives. +# +# The ATTRIBUTE parameter holds the name of the attribute to be checked. +# +# If ATTRIBUTE is supported define HAVE_VAR_ATTRIBUTE_. +# +# The macro caches its result in the ax_cv_have_var_attribute_ +# variable. +# +# The macro currently supports the following variable attributes: +# +# aligned +# cleanup +# common +# nocommon +# deprecated +# mode +# packed +# tls_model +# unused +# used +# vector_size +# weak +# dllimport +# dllexport +# init_priority +# +# Unsuppored variable attributes will be tested against a global integer +# variable and without any arguments given to the attribute itself; the +# result of this check might be wrong or meaningless so use with care. +# +# LICENSE +# +# Copyright (c) 2013 Gabriele Svelto +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_GCC_VAR_ATTRIBUTE], [ + AS_VAR_PUSHDEF([ac_var], [ax_cv_have_var_attribute_$1]) + + AC_CACHE_CHECK([for __attribute__(($1))], [ac_var], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ + m4_case([$1], + [aligned], [ + int foo __attribute__(($1(32))); + ], + [cleanup], [ + int bar(int *t) { return *t; }; + ], + [common], [ + int foo __attribute__(($1)); + ], + [nocommon], [ + int foo __attribute__(($1)); + ], + [deprecated], [ + int foo __attribute__(($1)) = 0; + ], + [mode], [ + long foo __attribute__(($1(word))); + ], + [packed], [ + struct bar { + int baz __attribute__(($1)); + }; + ], + [tls_model], [ + __thread int bar1 __attribute__(($1("global-dynamic"))); + __thread int bar2 __attribute__(($1("local-dynamic"))); + __thread int bar3 __attribute__(($1("initial-exec"))); + __thread int bar4 __attribute__(($1("local-exec"))); + ], + [unused], [ + int foo __attribute__(($1)); + ], + [used], [ + int foo __attribute__(($1)); + ], + [vector_size], [ + int foo __attribute__(($1(16))); + ], + [weak], [ + int foo __attribute__(($1)); + ], + [dllimport], [ + int foo __attribute__(($1)); + ], + [dllexport], [ + int foo __attribute__(($1)); + ], + [init_priority], [ + struct bar { bar() {} ~bar() {} }; + bar b __attribute__(($1(65535/2))); + ], + [ + m4_warn([syntax], [Unsupported attribute $1, the test may fail]) + int foo __attribute__(($1)); + ] + )], [ + m4_case([$1], + [cleanup], [ + int foo __attribute__(($1(bar))) = 0; + foo = foo + 1; + ], + [] + )]) + ], + dnl GCC doesn't exit with an error if an unknown attribute is + dnl provided but only outputs a warning, so accept the attribute + dnl only if no warning were issued. + [AS_IF([test -s conftest.err], + [AS_VAR_SET([ac_var], [no])], + [AS_VAR_SET([ac_var], [yes])])], + [AS_VAR_SET([ac_var], [no])]) + ]) + + AS_IF([test yes = AS_VAR_GET([ac_var])], + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_VAR_ATTRIBUTE_$1), 1, + [Define to 1 if the system has the `$1' variable attribute])], []) + + AS_VAR_POPDEF([ac_var]) +]) diff --git a/src/global-init.cxx b/src/global-init.cxx index a16c63d7b..7d1985f36 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -91,7 +91,8 @@ struct destroy_default_context default_context = 0; default_context_state = DC_DESTROYED; } -} static destroy_default_context_; +} static destroy_default_context_ +LOG4CPLUS_INIT_PRIORITY (LOG4CPLUS_INIT_PRIORITY_BASE + 1); static @@ -541,7 +542,8 @@ struct _static_log4cplus_initializer namespace { static void -_log4cplus_initializer_func () LOG4CPLUS_CONSTRUCTOR_FUNC(65535 / 2); +_log4cplus_initializer_func () + LOG4CPLUS_CONSTRUCTOR_FUNC (LOG4CPLUS_INIT_PRIORITY_BASE); static void _log4cplus_initializer_func () { @@ -563,7 +565,8 @@ struct _static_log4cplus_initializer log4cplus::thread::impl::tls_cleanup ( log4cplus::internal::tls_storage_key); } -} static initializer; +} static initializer +LOG4CPLUS_INIT_PRIORITY (LOG4CPLUS_INIT_PRIORITY_BASE); } // namespace From 16d810f9c1cede017d9c522f957274c1f67c2ebc Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Thu, 21 Aug 2014 21:57:59 +0200 Subject: [PATCH 014/165] Fix log level string constants initialization issue. (SF bug #303) Based on patch by: Ray Logel --- src/global-init.cxx | 4 +- src/loglevel.cxx | 140 ++++++++++++++++++++++++++------------------ 2 files changed, 86 insertions(+), 58 deletions(-) diff --git a/src/global-init.cxx b/src/global-init.cxx index 7d1985f36..99e1bf61a 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -300,7 +300,8 @@ alloc_ptd () } // namespace internal -void initializeFactoryRegistry(); +void initializeFactoryRegistry (); +void initializeLogLevelStrings (); //! Thread local storage clean up function for POSIX threads. @@ -372,6 +373,7 @@ initializeLog4cplus() dc->TTCCLayout_time_base = helpers::Time::gettimeofday (); Logger::getRoot(); initializeFactoryRegistry(); + initializeLogLevelStrings(); initialized = true; } diff --git a/src/loglevel.cxx b/src/loglevel.cxx index d27ec4e8d..5b17d8956 100644 --- a/src/loglevel.cxx +++ b/src/loglevel.cxx @@ -32,39 +32,35 @@ namespace log4cplus namespace { -static tstring const ALL_STRING (LOG4CPLUS_TEXT("ALL")); -static tstring const TRACE_STRING (LOG4CPLUS_TEXT("TRACE")); -static tstring const DEBUG_STRING (LOG4CPLUS_TEXT("DEBUG")); -static tstring const INFO_STRING (LOG4CPLUS_TEXT("INFO")); -static tstring const WARN_STRING (LOG4CPLUS_TEXT("WARN")); -static tstring const ERROR_STRING (LOG4CPLUS_TEXT("ERROR")); -static tstring const FATAL_STRING (LOG4CPLUS_TEXT("FATAL")); -static tstring const OFF_STRING (LOG4CPLUS_TEXT("OFF")); -static tstring const NOTSET_STRING (LOG4CPLUS_TEXT("NOTSET")); -static tstring const UNKNOWN_STRING (LOG4CPLUS_TEXT("UNKNOWN")); - - -struct log_levels_table_rec -{ - LogLevel const ll; - tstring const * const str; -}; - - -#define DEF_LLTAB_REC(x) { x ## _LOG_LEVEL, &(x ## _STRING) } +// The strings here are not simple tstring constants to allow using these +// strings and log4cplus itself in client code during static variables +// initialization. If they are simple tstring constants then, due to undefined +// order of initialization between translation units, they might be +// uninitialized before they are used by the client code. One possible solution +// to this is to use compiler specific attributes and/or pragmas to influence +// initialization order/priority. Another solution is using function local +// static variables, which are initialized on first use. We choose this +// implementation because it is more portable than compiler specific means. + +#define DEF_LL_STRING(_logLevel) \ +static tstring const & _logLevel ## _STRING () \ +{ \ + static tstring const str (LOG4CPLUS_TEXT (#_logLevel)); \ + return str; \ +} -static log_levels_table_rec const log_levels_table[8] = { - DEF_LLTAB_REC (OFF), - DEF_LLTAB_REC (FATAL), - DEF_LLTAB_REC (ERROR), - DEF_LLTAB_REC (WARN), - DEF_LLTAB_REC (INFO), - DEF_LLTAB_REC (DEBUG), - DEF_LLTAB_REC (TRACE), - DEF_LLTAB_REC (ALL), -}; +DEF_LL_STRING (OFF) +DEF_LL_STRING (FATAL) +DEF_LL_STRING (ERROR) +DEF_LL_STRING (WARN) +DEF_LL_STRING (INFO) +DEF_LL_STRING (DEBUG) +DEF_LL_STRING (TRACE) +DEF_LL_STRING (ALL) +DEF_LL_STRING (NOTSET) +DEF_LL_STRING (UNKNOWN) -#undef DEF_LLTAB_REC +#undef DEF_LL_STRING static @@ -72,17 +68,17 @@ tstring const & defaultLogLevelToStringMethod(LogLevel ll) { switch(ll) { - case OFF_LOG_LEVEL: return OFF_STRING; - case FATAL_LOG_LEVEL: return FATAL_STRING; - case ERROR_LOG_LEVEL: return ERROR_STRING; - case WARN_LOG_LEVEL: return WARN_STRING; - case INFO_LOG_LEVEL: return INFO_STRING; - case DEBUG_LOG_LEVEL: return DEBUG_STRING; - case TRACE_LOG_LEVEL: return TRACE_STRING; - //case ALL_LOG_LEVEL: return ALL_STRING; - case NOT_SET_LOG_LEVEL: return NOTSET_STRING; + case OFF_LOG_LEVEL: return OFF_STRING(); + case FATAL_LOG_LEVEL: return FATAL_STRING(); + case ERROR_LOG_LEVEL: return ERROR_STRING(); + case WARN_LOG_LEVEL: return WARN_STRING(); + case INFO_LOG_LEVEL: return INFO_STRING(); + case DEBUG_LOG_LEVEL: return DEBUG_STRING(); + case TRACE_LOG_LEVEL: return TRACE_STRING(); + //case ALL_LOG_LEVEL: return ALL_STRING(); + case NOT_SET_LOG_LEVEL: return NOTSET_STRING(); }; - + return internal::empty_str; } @@ -91,28 +87,58 @@ static LogLevel defaultStringToLogLevelMethod(const tstring& s) { - std::size_t const tbl_size - = sizeof (log_levels_table) / sizeof (log_levels_table[0]); +#if __cplusplus < 201103L + if (s.empty ()) + return NOT_SET_LOG_LEVEL; + + // The above check is only necessary prior to C++11 standard. Since C++11, + // accessing str[0] is always safe as it returns '\0' for empty string. +#endif - for (log_levels_table_rec const * it = log_levels_table; - it != log_levels_table + tbl_size; ++it) + switch (s[0]) { - if (*it->str == s) - return it->ll; +#define DEF_LLMATCH(_chr, _logLevel) \ + case _chr: if (s == _logLevel ## _STRING ()) \ + return _logLevel ## _LOG_LEVEL; break; + + DEF_LLMATCH ('O', OFF); + DEF_LLMATCH ('F', FATAL); + DEF_LLMATCH ('E', ERROR); + DEF_LLMATCH ('W', WARN); + DEF_LLMATCH ('I', INFO); + DEF_LLMATCH ('D', DEBUG); + DEF_LLMATCH ('T', TRACE); + DEF_LLMATCH ('A', ALL); + +#undef DEF_LLMATCH } - + return NOT_SET_LOG_LEVEL; } } // namespace +void +initializeLogLevelStrings () +{ + OFF_STRING(); + FATAL_STRING(); + ERROR_STRING(); + WARN_STRING(); + INFO_STRING(); + DEBUG_STRING(); + TRACE_STRING(); + ALL_STRING(); + NOTSET_STRING(); +} + ////////////////////////////////////////////////////////////////////////////// // LogLevelManager ctors and dtor ////////////////////////////////////////////////////////////////////////////// -LogLevelManager::LogLevelManager() +LogLevelManager::LogLevelManager() { LogLevelToStringMethodRec rec; rec.func = defaultLogLevelToStringMethod; @@ -123,7 +149,7 @@ LogLevelManager::LogLevelManager() } -LogLevelManager::~LogLevelManager() +LogLevelManager::~LogLevelManager() { } @@ -155,11 +181,11 @@ LogLevelManager::toString(LogLevel ll) const return *ret; } - return UNKNOWN_STRING; + return UNKNOWN_STRING(); } -LogLevel +LogLevel LogLevelManager::fromString(const tstring& arg) const { tstring s = helpers::toUpper(arg); @@ -171,7 +197,7 @@ LogLevelManager::fromString(const tstring& arg) const if (ret != NOT_SET_LOG_LEVEL) return ret; } - + helpers::getLogLog ().error ( LOG4CPLUS_TEXT ("Unrecognized log level: ") + arg); @@ -180,7 +206,7 @@ LogLevelManager::fromString(const tstring& arg) const } -void +void LogLevelManager::pushToStringMethod(LogLevelToStringMethod newToString) { LogLevelToStringMethodRec rec; @@ -190,7 +216,7 @@ LogLevelManager::pushToStringMethod(LogLevelToStringMethod newToString) } -void +void LogLevelManager::pushToStringMethod(LogLevelToStringMethod_1_0 newToString) { LogLevelToStringMethodRec rec; @@ -200,11 +226,11 @@ LogLevelManager::pushToStringMethod(LogLevelToStringMethod_1_0 newToString) } -void +void LogLevelManager::pushFromStringMethod(StringToLogLevelMethod newFromString) { fromStringMethods.push_back (newFromString); } - + } // namespace log4cplus From bcacefdfe8aea515ab3e98053b2fc9de61c6a9a0 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Thu, 21 Aug 2014 22:24:12 +0200 Subject: [PATCH 015/165] Bump log4cplus library's libtool revision number. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 97c461d1a..35c8aaf12 100755 --- a/configure +++ b/configure @@ -4470,7 +4470,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=2:0:0 +LT_VERSION=2:1:0 LT_RELEASE=1.2 diff --git a/configure.ac b/configure.ac index db9d28424..e37773d14 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AM_PROG_AR # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=2:0:0 +LT_VERSION=2:1:0 LT_RELEASE=1.2 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) From d264114b10c2c00a1b038c5318908d6de395fa5d Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Thu, 21 Aug 2014 22:26:27 +0200 Subject: [PATCH 016/165] AUTHORS: Mention Ray Logel. --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index f6270e375..c5ab693f9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,3 +24,4 @@ - Konstantin Baumann - Yaqian Shen - Sergey Nikulov +- Ray Logel From b1392a430b4bf3eb849e57dc9a59f55eb0aea9f0 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 24 Aug 2014 22:07:50 +0200 Subject: [PATCH 017/165] loglevel.cxx: Insert to/from string/log level conversion functions to the beginning of vector to favour user defined log levels and conversion functions. --- src/loglevel.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/loglevel.cxx b/src/loglevel.cxx index 5b17d8956..524a9b688 100644 --- a/src/loglevel.cxx +++ b/src/loglevel.cxx @@ -140,12 +140,9 @@ initializeLogLevelStrings () LogLevelManager::LogLevelManager() { - LogLevelToStringMethodRec rec; - rec.func = defaultLogLevelToStringMethod; - rec.use_1_0 = false; - toStringMethods.push_back (rec); + pushToStringMethod (defaultLogLevelToStringMethod); - fromStringMethods.push_back (defaultStringToLogLevelMethod); + pushFromStringMethod (defaultStringToLogLevelMethod); } @@ -212,7 +209,7 @@ LogLevelManager::pushToStringMethod(LogLevelToStringMethod newToString) LogLevelToStringMethodRec rec; rec.func = newToString; rec.use_1_0 = false; - toStringMethods.push_back (rec); + toStringMethods.insert (toStringMethods.begin (), rec); } @@ -222,14 +219,14 @@ LogLevelManager::pushToStringMethod(LogLevelToStringMethod_1_0 newToString) LogLevelToStringMethodRec rec; rec.func_1_0 = newToString; rec.use_1_0 = true; - toStringMethods.push_back (rec); + toStringMethods.insert (toStringMethods.begin (), rec); } void LogLevelManager::pushFromStringMethod(StringToLogLevelMethod newFromString) { - fromStringMethods.push_back (newFromString); + fromStringMethods.insert (fromStringMethods.begin (), newFromString); } From d29ae34fe678b183d0ebe7408945a8b1a91bc642 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 24 Aug 2014 22:53:44 +0200 Subject: [PATCH 018/165] Mention Zhang Shengfa. --- AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index c5ab693f9..1d56f053c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -# Contributors +# Contributors - Tad E. Smith - Michael Catanzariti @@ -25,3 +25,4 @@ - Yaqian Shen - Sergey Nikulov - Ray Logel +- Zhang Shengfa From cfbd87df970cc5d46f293bd7cb3b0de181f60835 Mon Sep 17 00:00:00 2001 From: sfzhang Date: Sat, 23 Aug 2014 02:54:04 +0800 Subject: [PATCH 019/165] add setCurrentThreadName(,2) to modify the thread name --- include/log4cplus/thread/threads.h | 2 ++ src/threads.cxx | 34 ++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/include/log4cplus/thread/threads.h b/include/log4cplus/thread/threads.h index dbd152c5f..82149c4b0 100644 --- a/include/log4cplus/thread/threads.h +++ b/include/log4cplus/thread/threads.h @@ -39,6 +39,8 @@ namespace log4cplus { namespace thread { LOG4CPLUS_EXPORT log4cplus::tstring const & getCurrentThreadName(); LOG4CPLUS_EXPORT log4cplus::tstring const & getCurrentThreadName2(); +LOG4CPLUS_EXPORT void setCurrentThreadName(const log4cplus::tstring & name); +LOG4CPLUS_EXPORT void setCurrentThreadName2(const log4cplus::tstring & name); LOG4CPLUS_EXPORT void yield(); LOG4CPLUS_EXPORT void blockAllSignals(); diff --git a/src/threads.cxx b/src/threads.cxx index abf328d0a..a9755427f 100644 --- a/src/threads.cxx +++ b/src/threads.cxx @@ -94,6 +94,10 @@ yield() #endif } +#if defined(LOG4CPLUS_SINGLE_THREADED) +static log4cplus::tstring thread_name(LOG4CPLUS_TEXT("single")); +static log4cplus::tstring thread_name2(thread_name); +#endif LOG4CPLUS_EXPORT log4cplus::tstring const & @@ -108,7 +112,11 @@ getCurrentThreadName() tmp.str ().swap (name); } #else - static log4cplus::tstring const name (LOG4CPLUS_TEXT ("single")); + log4cplus::tstring & name = thread_name; + if (LOG4CPLUS_UNLIKELY(name.empty())) + { + name = LOG4CPLUS_TEXT("single"); + } #endif return name; @@ -160,13 +168,35 @@ getCurrentThreadName2() } #else - static log4cplus::tstring const name (getCurrentThreadName ()); + log4cplus::tstring & name = thread_name2; + if (LOG4CPLUS_UNLIKELY(name.empty())) + { + name = getCurrentThreadName(); + } #endif return name; } +LOG4CPLUS_EXPORT void setCurrentThreadName(const log4cplus::tstring & name) +{ +#if ! defined (LOG4CPLUS_SINGLE_THREADED) + log4cplus::internal::get_thread_name_str() = name; +#else + thread_name = name; +#endif +} + +LOG4CPLUS_EXPORT void setCurrentThreadName2(const log4cplus::tstring & name) +{ +#if ! defined (LOG4CPLUS_SINGLE_THREADED) + log4cplus::internal::get_thread_name2_str() = name; +#else + thread_name2 = name; +#endif +} + } } // namespace log4cplus { namespace thread { From 31a2d07923da47061a35b9e93623c1e3bc1e680e Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 24 Aug 2014 22:51:37 +0200 Subject: [PATCH 020/165] threads.cxx: Use init priority for thread_name and thread_name2. --- src/threads.cxx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/threads.cxx b/src/threads.cxx index a9755427f..075ed8d0b 100644 --- a/src/threads.cxx +++ b/src/threads.cxx @@ -45,7 +45,7 @@ # include # include #elif defined (LOG4CPLUS_USE_WIN32_THREADS) -# include +# include #endif #include #include @@ -78,7 +78,7 @@ blockAllSignals() sigset_t signal_set; sigfillset (&signal_set); pthread_sigmask (SIG_BLOCK, &signal_set, 0); -#endif +#endif } @@ -95,8 +95,10 @@ yield() } #if defined(LOG4CPLUS_SINGLE_THREADED) -static log4cplus::tstring thread_name(LOG4CPLUS_TEXT("single")); -static log4cplus::tstring thread_name2(thread_name); +static log4cplus::tstring thread_name(LOG4CPLUS_TEXT("single")) + LOG4CPLUS_INIT_PRIORITY (LOG4CPLUS_INIT_PRIORITY_BASE - 1); +static log4cplus::tstring thread_name2(thread_name) + LOG4CPLUS_INIT_PRIORITY (LOG4CPLUS_INIT_PRIORITY_BASE - 1); #endif LOG4CPLUS_EXPORT @@ -141,7 +143,7 @@ get_current_thread_name_alt (log4cplus::tostream * s) #elif defined (__CYGWIN__) unsigned long tid = cygwin::get_current_win32_thread_id (); os << tid; - + #else os << getCurrentThreadName (); @@ -222,7 +224,7 @@ namespace log4cplus { namespace thread { namespace impl { #if defined(LOG4CPLUS_USE_PTHREADS) -void* +void* ThreadStart::threadStartFuncWorker(void * arg) #elif defined(LOG4CPLUS_USE_WIN32_THREADS) unsigned @@ -455,7 +457,7 @@ AbstractThread::~AbstractThread() { } -} } // namespace log4cplus { namespace thread { +} } // namespace log4cplus { namespace thread { #endif // LOG4CPLUS_SINGLE_THREADED From 21f5e0ee3ca73425aa7c3acfc35dff0a8e61b455 Mon Sep 17 00:00:00 2001 From: sfzhang Date: Tue, 26 Aug 2014 01:55:15 +0800 Subject: [PATCH 021/165] allow user to omit variadic arguments in LOG4CPLUS_*_FMT --- include/log4cplus/loggingmacros.h | 76 +++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/include/log4cplus/loggingmacros.h b/include/log4cplus/loggingmacros.h index 22444af94..e73527fd1 100644 --- a/include/log4cplus/loggingmacros.h +++ b/include/log4cplus/loggingmacros.h @@ -237,7 +237,7 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, LOG4CPLUS_RESTORE_DOWHILE_WARNING() #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_MACRO_FMT_BODY(logger, logLevel, logFmt, ...) \ +#define LOG4CPLUS_MACRO_FMT_BODY(logger, logLevel, ...) \ LOG4CPLUS_SUPPRESS_DOWHILE_WARNING() \ do { \ log4cplus::Logger const & _l \ @@ -246,7 +246,7 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, _l.isEnabledFor (log4cplus::logLevel), logLevel)) { \ LOG4CPLUS_MACRO_INSTANTIATE_SNPRINTF_BUF (_snpbuf); \ log4cplus::tchar const * _logEvent \ - = _snpbuf.print (logFmt, __VA_ARGS__); \ + = _snpbuf.print (__VA_ARGS__); \ log4cplus::detail::macro_forced_log (_l, \ log4cplus::logLevel, _logEvent, \ __FILE__, __LINE__, LOG4CPLUS_MACRO_FUNCTION ()); \ @@ -255,7 +255,7 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, LOG4CPLUS_RESTORE_DOWHILE_WARNING() #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_MACRO_FMT_BODY(logger, logLevel, logFmt, logArgs...) \ +#define LOG4CPLUS_MACRO_FMT_BODY(logger, logLevel, logArgs...) \ LOG4CPLUS_SUPPRESS_DOWHILE_WARNING() \ do { \ log4cplus::Logger const & _l \ @@ -264,7 +264,7 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, _l.isEnabledFor (log4cplus::logLevel), logLevel)) { \ LOG4CPLUS_MACRO_INSTANTIATE_SNPRINTF_BUF (_snpbuf); \ log4cplus::tchar const * _logEvent \ - = _snpbuf.print (logFmt, logArgs); \ + = _snpbuf.print (logArgs); \ log4cplus::detail::macro_forced_log (_l, \ log4cplus::logLevel, _logEvent, \ __FILE__, __LINE__, LOG4CPLUS_MACRO_FUNCTION ()); \ @@ -291,11 +291,11 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, TRACE_LOG_LEVEL) #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_TRACE_FMT(logger, logFmt, ...) \ - LOG4CPLUS_MACRO_FMT_BODY (logger, TRACE_LOG_LEVEL, logFmt, __VA_ARGS__) +#define LOG4CPLUS_TRACE_FMT(logger, ...) \ + LOG4CPLUS_MACRO_FMT_BODY (logger, TRACE_LOG_LEVEL, __VA_ARGS__) #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_TRACE_FMT(logger, logFmt, logArgs...) \ - LOG4CPLUS_MACRO_FMT_BODY(logger, TRACE_LOG_LEVEL, logFmt, logArgs) +#define LOG4CPLUS_TRACE_FMT(logger, logArgs...) \ + LOG4CPLUS_MACRO_FMT_BODY(logger, TRACE_LOG_LEVEL, logArgs) #endif #else @@ -322,20 +322,20 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, DEBUG_LOG_LEVEL) #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_DEBUG_FMT(logger, logFmt, ...) \ - LOG4CPLUS_MACRO_FMT_BODY (logger, DEBUG_LOG_LEVEL, logFmt, __VA_ARGS__) +#define LOG4CPLUS_DEBUG_FMT(logger, ...) \ + LOG4CPLUS_MACRO_FMT_BODY (logger, DEBUG_LOG_LEVEL, __VA_ARGS__) #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_DEBUG_FMT(logger, logFmt, logArgs...) \ - LOG4CPLUS_MACRO_FMT_BODY(logger, DEBUG_LOG_LEVEL, logFmt, logArgs) +#define LOG4CPLUS_DEBUG_FMT(logger, logArgs...) \ + LOG4CPLUS_MACRO_FMT_BODY(logger, DEBUG_LOG_LEVEL, logArgs) #endif #else #define LOG4CPLUS_DEBUG(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #define LOG4CPLUS_DEBUG_STR(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_DEBUG_FMT(logger, logFmt, ...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_DEBUG_FMT(logger, ...) LOG4CPLUS_DOWHILE_NOTHING() #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_DEBUG_FMT(logger, logFmt, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_DEBUG_FMT(logger, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() #endif #endif @@ -352,20 +352,20 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, INFO_LOG_LEVEL) #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_INFO_FMT(logger, logFmt, ...) \ - LOG4CPLUS_MACRO_FMT_BODY (logger, INFO_LOG_LEVEL, logFmt, __VA_ARGS__) +#define LOG4CPLUS_INFO_FMT(logger, ...) \ + LOG4CPLUS_MACRO_FMT_BODY (logger, INFO_LOG_LEVEL, __VA_ARGS__) #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_INFO_FMT(logger, logFmt, logArgs...) \ - LOG4CPLUS_MACRO_FMT_BODY(logger, INFO_LOG_LEVEL, logFmt, logArgs) +#define LOG4CPLUS_INFO_FMT(logger, logArgs...) \ + LOG4CPLUS_MACRO_FMT_BODY(logger, INFO_LOG_LEVEL, logArgs) #endif #else #define LOG4CPLUS_INFO(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #define LOG4CPLUS_INFO_STR(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_INFO_FMT(logger, logFmt, ...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_INFO_FMT(logger, ...) LOG4CPLUS_DOWHILE_NOTHING() #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_INFO_FMT(logger, logFmt, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_INFO_FMT(logger, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() #endif #endif @@ -382,20 +382,20 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, WARN_LOG_LEVEL) #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_WARN_FMT(logger, logFmt, ...) \ - LOG4CPLUS_MACRO_FMT_BODY (logger, WARN_LOG_LEVEL, logFmt, __VA_ARGS__) +#define LOG4CPLUS_WARN_FMT(logger, ...) \ + LOG4CPLUS_MACRO_FMT_BODY (logger, WARN_LOG_LEVEL, __VA_ARGS__) #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_WARN_FMT(logger, logFmt, logArgs...) \ - LOG4CPLUS_MACRO_FMT_BODY(logger, WARN_LOG_LEVEL, logFmt, logArgs) +#define LOG4CPLUS_WARN_FMT(logger, logArgs...) \ + LOG4CPLUS_MACRO_FMT_BODY(logger, WARN_LOG_LEVEL, logArgs) #endif #else #define LOG4CPLUS_WARN(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #define LOG4CPLUS_WARN_STR(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_WARN_FMT(logger, logFmt, ...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_WARN_FMT(logger, ...) LOG4CPLUS_DOWHILE_NOTHING() #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_WARN_FMT(logger, logFmt, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_WARN_FMT(logger, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() #endif #endif @@ -412,20 +412,20 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, ERROR_LOG_LEVEL) #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_ERROR_FMT(logger, logFmt, ...) \ - LOG4CPLUS_MACRO_FMT_BODY (logger, ERROR_LOG_LEVEL, logFmt, __VA_ARGS__) +#define LOG4CPLUS_ERROR_FMT(logger, ...) \ + LOG4CPLUS_MACRO_FMT_BODY (logger, ERROR_LOG_LEVEL, __VA_ARGS__) #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_ERROR_FMT(logger, logFmt, logArgs...) \ - LOG4CPLUS_MACRO_FMT_BODY(logger, ERROR_LOG_LEVEL, logFmt, logArgs) +#define LOG4CPLUS_ERROR_FMT(logger, logArgs...) \ + LOG4CPLUS_MACRO_FMT_BODY(logger, ERROR_LOG_LEVEL, logArgs) #endif #else #define LOG4CPLUS_ERROR(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #define LOG4CPLUS_ERROR_STR(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_ERROR_FMT(logger, logFmt, ...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_ERROR_FMT(logger, ...) LOG4CPLUS_DOWHILE_NOTHING() #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_ERROR_FMT(logger, logFmt, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_ERROR_FMT(logger, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() #endif #endif @@ -442,20 +442,20 @@ LOG4CPLUS_EXPORT void macro_forced_log (log4cplus::Logger const &, LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, FATAL_LOG_LEVEL) #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_FATAL_FMT(logger, logFmt, ...) \ - LOG4CPLUS_MACRO_FMT_BODY (logger, FATAL_LOG_LEVEL, logFmt, __VA_ARGS__) +#define LOG4CPLUS_FATAL_FMT(logger, ...) \ + LOG4CPLUS_MACRO_FMT_BODY (logger, FATAL_LOG_LEVEL, __VA_ARGS__) #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_FATAL_FMT(logger, logFmt, logArgs...) \ - LOG4CPLUS_MACRO_FMT_BODY(logger, FATAL_LOG_LEVEL, logFmt, logArgs) +#define LOG4CPLUS_FATAL_FMT(logger, logArgs...) \ + LOG4CPLUS_MACRO_FMT_BODY(logger, FATAL_LOG_LEVEL, logArgs) #endif #else #define LOG4CPLUS_FATAL(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #define LOG4CPLUS_FATAL_STR(logger, logEvent) LOG4CPLUS_DOWHILE_NOTHING() #if defined (LOG4CPLUS_HAVE_C99_VARIADIC_MACROS) -#define LOG4CPLUS_FATAL_FMT(logger, logFmt, ...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_FATAL_FMT(logger, ...) LOG4CPLUS_DOWHILE_NOTHING() #elif defined (LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS) -#define LOG4CPLUS_FATAL_FMT(logger, logFmt, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() +#define LOG4CPLUS_FATAL_FMT(logger, logArgs...) LOG4CPLUS_DOWHILE_NOTHING() #endif #endif From d1f3e74df23dc525303f56e02d20649ff4616590 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Tue, 2 Sep 2014 07:55:17 +0200 Subject: [PATCH 022/165] iOS.cmake: Update from upstream source. --- iOS/iOS.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iOS/iOS.cmake b/iOS/iOS.cmake index c0134645d..df2e3faca 100644 --- a/iOS/iOS.cmake +++ b/iOS/iOS.cmake @@ -28,7 +28,6 @@ # A macro used to find executable programs on the host system, not within the iOS environment. # Thanks to the android-cmake project for providing the command - # Standard settings set (CMAKE_SYSTEM_NAME Darwin) set (CMAKE_SYSTEM_VERSION 1) @@ -48,8 +47,9 @@ endif (CMAKE_UNAME) # Force the compilers to gcc for iOS include (CMakeForceCompiler) -CMAKE_FORCE_C_COMPILER (gcc gcc) -CMAKE_FORCE_CXX_COMPILER (g++ g++) +CMAKE_FORCE_C_COMPILER (/usr/bin/clang Apple) +CMAKE_FORCE_CXX_COMPILER (/usr/bin/clang++ Apple) +set(CMAKE_AR ar CACHE FILEPATH "" FORCE) # Skip the platform compiler checks for cross compiling set (CMAKE_CXX_COMPILER_WORKS TRUE) @@ -70,7 +70,7 @@ set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}") # Hidden visibilty is required for cxx on iOS set (CMAKE_C_FLAGS_INIT "") -set (CMAKE_CXX_FLAGS_INIT "-headerpad_max_install_names -fvisibility=hidden -fvisibility-inlines-hidden") +set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden -isysroot ${CMAKE_OSX_SYSROOT}") set (CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}") set (CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}") From 59b66a003a15d92ecdcd6120edd3b8a77b1afc51 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Tue, 2 Sep 2014 07:46:55 +0200 Subject: [PATCH 023/165] AUTHORS: Do not use ATX header to fix PDF documentation output. --- AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 1d56f053c..e75411a34 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,5 @@ -# Contributors +Contributors +============ - Tad E. Smith - Michael Catanzariti From 96c3e0ff1956c8abb1b0644a8a2848a431a4e81b Mon Sep 17 00:00:00 2001 From: Oskari Timperi Date: Thu, 2 Oct 2014 08:08:23 +0300 Subject: [PATCH 024/165] Add .rc file to include DLL version information on Windows --- src/CMakeLists.txt | 8 ++++++++ src/log4cplus.rc.in | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 src/log4cplus.rc.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c8429892f..91174da28 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,6 +72,14 @@ endif (UNICODE) if (WIN32) add_definitions (-DMINGW_HAS_SECURE_API=1) add_definitions (-D_WIN32_WINNT=${_WIN32_WINNT}) + + if (BUILD_SHARED_LIBS) + set(log4cplus_build_shared 1) + else () + set(log4cplus_build_shared 0) + endif () + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/log4cplus.rc.in ${CMAKE_CURRENT_BINARY_DIR}/log4cplus.rc @ONLY) + list(APPEND log4cplus_sources ${CMAKE_CURRENT_BINARY_DIR}/log4cplus.rc) endif (WIN32) add_library (${log4cplus} ${log4cplus_sources}) diff --git a/src/log4cplus.rc.in b/src/log4cplus.rc.in new file mode 100644 index 000000000..542f71142 --- /dev/null +++ b/src/log4cplus.rc.in @@ -0,0 +1,43 @@ +#include + +#ifdef NDEBUG +#define VER_DEBUG 0 +#else +#define VER_DEBUG VS_FF_DEBUG +#endif + +#if @log4cplus_build_shared@ +#define VER_FILETYPE VFT_DLL +#else +#define VER_FILETYPE VFT_STATIC_LIB +#endif + +#define VER_BINARY @log4cplus_version_major@,@log4cplus_version_minor@,@log4cplus_version_patch@,0 +#define VER_STR "@log4cplus_version_major@.@log4cplus_version_minor@.@log4cplus_version_patch@" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_BINARY +PRODUCTVERSION VER_BINARY +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +FILEFLAGS VER_DEBUG +FILEOS VOS_NT_WINDOWS32 +FILETYPE VER_FILETYPE +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "log4cplus" + VALUE "FileDescription", "log4cplus logging library" + VALUE "FileVersion", VER_STR + VALUE "InternalName", "@log4cplus@" + VALUE "ProductName", "@log4cplus@" + VALUE "ProductVersion", VER_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1200 + END +END From 594e940f4d4c624c12754e74dc36107151b90cb5 Mon Sep 17 00:00:00 2001 From: cfyz Date: Fri, 3 Oct 2014 20:09:00 +0400 Subject: [PATCH 025/165] TimeBasedRollingFileAppender implementation. --- include/log4cplus/fileappender.h | 130 +++++-- src/fileappender.cxx | 591 ++++++++++++++++++++++++++++--- 2 files changed, 642 insertions(+), 79 deletions(-) diff --git a/include/log4cplus/fileappender.h b/include/log4cplus/fileappender.h index 9ae9eb599..310de6948 100644 --- a/include/log4cplus/fileappender.h +++ b/include/log4cplus/fileappender.h @@ -43,8 +43,10 @@ namespace log4cplus { /** - * Appends log events to a file. - * + * Base class for Appenders writing log events to a file. + * It is constructed with uninitialized file object, so all + * classes derived from FileAppenderBase _must_ call init() method. + * *

Properties

*
*
File
@@ -106,18 +108,8 @@ namespace log4cplus * *
*/ - class LOG4CPLUS_EXPORT FileAppender : public Appender { + class FileAppenderBase : public Appender { public: - // Ctors - FileAppender(const log4cplus::tstring& filename, - std::ios_base::openmode mode = std::ios_base::trunc, - bool immediateFlush = true, bool createDirs = false); - FileAppender(const log4cplus::helpers::Properties& properties, - std::ios_base::openmode mode = std::ios_base::trunc); - - // Dtor - virtual ~FileAppender(); - // Methods virtual void close(); @@ -129,9 +121,19 @@ namespace log4cplus virtual std::locale getloc () const; protected: + // Ctors + FileAppenderBase(const log4cplus::tstring& filename, + std::ios_base::openmode mode = std::ios_base::trunc, + bool immediateFlush = true, + bool createDirs = false); + FileAppenderBase(const log4cplus::helpers::Properties& properties, + std::ios_base::openmode mode = std::ios_base::trunc); + + void init(); + virtual void append(const spi::InternalLoggingEvent& event); - void open(std::ios_base::openmode mode); + virtual void open(std::ios_base::openmode mode); bool reopen(); // Data @@ -172,20 +174,41 @@ namespace log4cplus log4cplus::tofstream out; log4cplus::tstring filename; log4cplus::tstring localeName; + log4cplus::tstring lockFileName; + std::ios_base::openmode fileOpenMode; log4cplus::helpers::Time reopen_time; private: - LOG4CPLUS_PRIVATE void init(const log4cplus::tstring& filename, - std::ios_base::openmode mode, - const log4cplus::tstring& lockFileName); - // Disallow copying of instances of this class - FileAppender(const FileAppender&); - FileAppender& operator=(const FileAppender&); + FileAppenderBase(const FileAppenderBase&); + FileAppenderBase& operator=(const FileAppenderBase&); }; + /** + * Appends log events to a file. + * + *

Properties

+ *

It has no properties additional to {@link FileAppenderBase}. + */ + class LOG4CPLUS_EXPORT FileAppender : public FileAppenderBase { + public: + // Ctors + FileAppender(const log4cplus::tstring& filename, + std::ios_base::openmode mode = std::ios_base::trunc, + bool immediateFlush = true, + bool createDirs = false); + FileAppender(const log4cplus::helpers::Properties& properties, + std::ios_base::openmode mode = std::ios_base::trunc); + + // Dtor + virtual ~FileAppender(); + + protected: + void init(); + }; + typedef helpers::SharedObjectPtr SharedFileAppenderPtr; @@ -299,6 +322,73 @@ namespace log4cplus typedef helpers::SharedObjectPtr SharedDailyRollingFileAppenderPtr; + + /** + * TimeBasedRollingFileAppender extends {@link FileAppenderBase} so that the + * underlying file is rolled over at a user chosen frequency while also keeping + * in check a total maximum number of produced files. + * + *

Properties

+ *

Properties additional to {@link FileAppenderBase}'s properties: + * + *

+ * + *
FilenamePattern
+ *
The mandatory fileNamePattern property defines the name of the rolled-over + * (archived) log files. Its value should consist of the name of the file, plus + * a suitably placed %d conversion specifier. The %d conversion specifier may + * contain a date-and-time pattern as specified by the java's SimpleDateFormat. + * The rollover period is inferred from the value of fileNamePattern.
+ * + *
MaxHistory
+ *
The optional maxHistory property controls the maximum number of archive + * files to keep, deleting older files.
+ * + *
CleanHistoryOnStatr
+ *
If set to true, archive removal will be executed on appender start up. + * By default this property is set to false.
+ * + *
+ */ + class LOG4CPLUS_EXPORT TimeBasedRollingFileAppender : public FileAppenderBase { + public: + // Ctors + TimeBasedRollingFileAppender(const tstring& filename = LOG4CPLUS_TEXT(""), + const tstring& filenamePattern = LOG4CPLUS_TEXT("%d.log"), + int maxHistory = 10, + bool cleanHistoryOnStart = false, + bool immediateFlush = true, + bool createDirs = false); + TimeBasedRollingFileAppender(const helpers::Properties& properties); + + // Dtor + ~TimeBasedRollingFileAppender(); + + protected: + void append(const spi::InternalLoggingEvent& event); + void open(std::ios_base::openmode mode); + void close(); + void rollover(bool alreadyLocked = false); + void clean(helpers::Time time); + int getRolloverPeriodDuration() const; + helpers::Time calculateNextRolloverTime(const helpers::Time& t) const; + + // Data + tstring filenamePattern; + DailyRollingFileSchedule schedule; + tstring scheduledFilename; + int maxHistory; + bool cleanHistoryOnStart; + helpers::Time lastHeartBeat; + helpers::Time nextRolloverTime; + + private: + LOG4CPLUS_PRIVATE void init(); + }; + + typedef helpers::SharedObjectPtr + SharedTimeBasedRollingFileAppenderPtr; + } // end namespace log4cplus #endif // LOG4CPLUS_FILE_APPENDER_HEADER_ diff --git a/src/fileappender.cxx b/src/fileappender.cxx index d478ef910..37a531d93 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -214,24 +214,24 @@ catch (std::runtime_error const &) /////////////////////////////////////////////////////////////////////////////// -// FileAppender ctors and dtor +// FileAppenderBase ctors and dtor /////////////////////////////////////////////////////////////////////////////// -FileAppender::FileAppender(const tstring& filename_, +FileAppenderBase::FileAppenderBase(const tstring& filename_, std::ios_base::openmode mode_, bool immediateFlush_, bool createDirs_) : immediateFlush(immediateFlush_) , createDirs (createDirs_) , reopenDelay(1) , bufferSize (0) , buffer (0) + , filename(filename_) , localeName (LOG4CPLUS_TEXT ("DEFAULT")) -{ - init(filename_, mode_, internal::empty_str); -} + , fileOpenMode(mode_) +{ } -FileAppender::FileAppender(const Properties& props, - std::ios_base::openmode mode_) +FileAppenderBase::FileAppenderBase(const Properties& props, + std::ios_base::openmode mode_) : Appender(props) , immediateFlush(true) , createDirs (false) @@ -239,41 +239,35 @@ FileAppender::FileAppender(const Properties& props, , bufferSize (0) , buffer (0) { - bool app = (mode_ & (std::ios_base::app | std::ios_base::ate)) != 0; - tstring const & fn = props.getProperty( LOG4CPLUS_TEXT("File") ); - if (fn.empty()) - { - getErrorHandler()->error( LOG4CPLUS_TEXT("Invalid filename") ); - return; - } - + filename = props.getProperty(LOG4CPLUS_TEXT("File")); + lockFileName = props.getProperty (LOG4CPLUS_TEXT ("LockFile")); + localeName = props.getProperty (LOG4CPLUS_TEXT ("Locale"), LOG4CPLUS_TEXT ("DEFAULT")); props.getBool (immediateFlush, LOG4CPLUS_TEXT("ImmediateFlush")); props.getBool (createDirs, LOG4CPLUS_TEXT("CreateDirs")); - props.getBool (app, LOG4CPLUS_TEXT("Append")); props.getInt (reopenDelay, LOG4CPLUS_TEXT("ReopenDelay")); props.getULong (bufferSize, LOG4CPLUS_TEXT("BufferSize")); - tstring lockFileName = props.getProperty (LOG4CPLUS_TEXT ("LockFile")); - if (useLockFile && lockFileName.empty ()) - { - lockFileName = fn; - lockFileName += LOG4CPLUS_TEXT(".lock"); - } - - localeName = props.getProperty (LOG4CPLUS_TEXT ("Locale"), - LOG4CPLUS_TEXT ("DEFAULT")); - - init(fn, (app ? std::ios::app : std::ios::trunc), lockFileName); + bool app = (mode_ & (std::ios_base::app | std::ios_base::ate)) != 0; + props.getBool (app, LOG4CPLUS_TEXT("Append")); + fileOpenMode = app ? std::ios::app : std::ios::trunc; } - void -FileAppender::init(const tstring& filename_, - std::ios_base::openmode mode_, - const log4cplus::tstring& lockFileName_) +FileAppenderBase::init() { - filename = filename_; + if (useLockFile && lockFileName.empty ()) + { + if (filename.empty()) + { + getErrorHandler()->error(LOG4CPLUS_TEXT + ("UseLockFile is true but neither LockFile nor File are specified")); + return; + } + + lockFileName = filename; + lockFileName += LOG4CPLUS_TEXT(".lock"); + } if (bufferSize != 0) { @@ -287,7 +281,7 @@ FileAppender::init(const tstring& filename_, { try { - lockFile.reset (new helpers::LockFile (lockFileName_)); + lockFile.reset (new helpers::LockFile (lockFileName)); guard.attach_and_lock (*lockFile); } catch (std::runtime_error const &) @@ -298,32 +292,16 @@ FileAppender::init(const tstring& filename_, } } - open(mode_); + open(fileOpenMode); imbue (get_locale_by_name (localeName)); - - if(!out.good()) { - getErrorHandler()->error( LOG4CPLUS_TEXT("Unable to open file: ") - + filename); - return; - } - helpers::getLogLog().debug(LOG4CPLUS_TEXT("Just opened file: ") + filename); -} - - - -FileAppender::~FileAppender() -{ - destructorImpl(); } - - /////////////////////////////////////////////////////////////////////////////// -// FileAppender public methods +// FileAppenderBase public methods /////////////////////////////////////////////////////////////////////////////// -void -FileAppender::close() +void +FileAppenderBase::close() { thread::MutexGuard guard (access_mutex); @@ -335,27 +313,27 @@ FileAppender::close() std::locale -FileAppender::imbue(std::locale const& loc) +FileAppenderBase::imbue(std::locale const& loc) { return out.imbue (loc); } std::locale -FileAppender::getloc () const +FileAppenderBase::getloc () const { return out.getloc (); } /////////////////////////////////////////////////////////////////////////////// -// FileAppender protected methods +// FileAppenderBase protected methods /////////////////////////////////////////////////////////////////////////////// // This method does not need to be locked since it is called by // doAppend() which performs the locking void -FileAppender::append(const spi::InternalLoggingEvent& event) +FileAppenderBase::append(const spi::InternalLoggingEvent& event) { if(!out.good()) { if(!reopen()) { @@ -379,16 +357,22 @@ FileAppender::append(const spi::InternalLoggingEvent& event) } void -FileAppender::open(std::ios_base::openmode mode) +FileAppenderBase::open(std::ios_base::openmode mode) { if (createDirs) internal::make_dirs (filename); out.open(LOG4CPLUS_FSTREAM_PREFERED_FILE_NAME(filename).c_str(), mode); + + if(!out.good()) { + getErrorHandler()->error(LOG4CPLUS_TEXT("Unable to open file: ") + filename); + return; + } + helpers::getLogLog().debug(LOG4CPLUS_TEXT("Just opened file: ") + filename); } bool -FileAppender::reopen() +FileAppenderBase::reopen() { // When append never failed and the file re-open attempt must // be delayed, set the time when reopen should take place. @@ -422,6 +406,50 @@ FileAppender::reopen() return false; } +/////////////////////////////////////////////////////////////////////////////// +// FileAppender ctors and dtor +/////////////////////////////////////////////////////////////////////////////// + +FileAppender::FileAppender( + const tstring& filename_, + std::ios_base::openmode mode_, + bool immediateFlush_, + bool createDirs_) + : FileAppenderBase(filename_, mode_, immediateFlush_, createDirs_) +{ + init(); +} + + +FileAppender::FileAppender( + const Properties& props, + std::ios_base::openmode mode_) + : FileAppenderBase(props, mode_) +{ + init(); +} + +FileAppender::~FileAppender() +{ + destructorImpl(); +} + +/////////////////////////////////////////////////////////////////////////////// +// FileAppender protected methods +/////////////////////////////////////////////////////////////////////////////// + +void +FileAppender::init() +{ + if (filename.empty()) + { + getErrorHandler()->error( LOG4CPLUS_TEXT("Invalid filename") ); + return; + } + + FileAppenderBase::init(); +} + /////////////////////////////////////////////////////////////////////////////// // RollingFileAppender ctors and dtor /////////////////////////////////////////////////////////////////////////////// @@ -909,4 +937,449 @@ DailyRollingFileAppender::getFilename(const Time& t) const return result; } +/////////////////////////////////////////////////////////////////////////////// +// TimeBasedRollingFileAppender utility functions +/////////////////////////////////////////////////////////////////////////////// + +static int +countContiguousChars(const tstring& s, size_t from) +{ + tchar c = s[from]; + int result = 1; + + for (size_t i = from+1; i < s.length(); i++) + { + if (s[i] == c) + result += 1; + else + break; + } + + return result; +} + +static tstring +preprocessDateTimePattern(const tstring& pattern, DailyRollingFileSchedule& schedule) +{ + // Example: "yyyy-MM-dd HH:mm:ss,aux" + // Patterns from java.text.SimpleDateFormat not implemented here: Y, F, k, K, S, X + + tostringstream result; + + bool auxilary = (pattern.find(LOG4CPLUS_TEXT(",aux")) == pattern.length()-4); + bool has_week = false, has_day = false, has_hour = false, has_minute = false; + + for (size_t i = 0; i < pattern.length(); ) + { + tchar c = pattern[i]; + int len = countContiguousChars(pattern, i); + + switch (c) + { + case LOG4CPLUS_TEXT('y'): // Year number + if (len == 2) + result << LOG4CPLUS_TEXT("%y"); + else if (len == 4) + result << LOG4CPLUS_TEXT("%Y"); + break; + case LOG4CPLUS_TEXT('Y'): // Week year + if (len == 2) + result << LOG4CPLUS_TEXT("%g"); + else if (len == 4) + result << LOG4CPLUS_TEXT("%G"); + break; + case LOG4CPLUS_TEXT('M'): // Month in year + if (len == 2) + result << LOG4CPLUS_TEXT("%m"); + else if (len == 3) + result << LOG4CPLUS_TEXT("%b"); + else if (len > 3) + result << LOG4CPLUS_TEXT("%B"); + break; + case LOG4CPLUS_TEXT('w'): // Week in year + if (len == 2) { + result << LOG4CPLUS_TEXT("%W"); + has_week = true; + } + break; + case LOG4CPLUS_TEXT('D'): // Day in year + if (len == 3) { + result << LOG4CPLUS_TEXT("%j"); + has_day = true; + } + break; + case LOG4CPLUS_TEXT('d'): // Day in month + if (len == 2) { + result << LOG4CPLUS_TEXT("%d"); + has_day = true; + } + break; + case LOG4CPLUS_TEXT('E'): // Day name in week + if (len == 3) { + result << LOG4CPLUS_TEXT("%a"); + has_day = true; + } else if (len > 3) { + result << LOG4CPLUS_TEXT("%A"); + has_day = true; + } + break; + case LOG4CPLUS_TEXT('u'): // Day number of week + if (len == 1) { + result << LOG4CPLUS_TEXT("%u"); + has_day = true; + } + break; + case LOG4CPLUS_TEXT('a'): // AM/PM marker + if (len == 2) + result << LOG4CPLUS_TEXT("%p"); + break; + case LOG4CPLUS_TEXT('H'): // Hour in day + if (len == 2) { + result << LOG4CPLUS_TEXT("%H"); + has_hour = true; + } + break; + case LOG4CPLUS_TEXT('h'): // Hour in am/pm (01-12) + if (len == 2) { + result << LOG4CPLUS_TEXT("%I"); + has_hour = true; + } + break; + case LOG4CPLUS_TEXT('m'): // Minute in hour + if (len == 2) { + result << LOG4CPLUS_TEXT("%M"); + has_minute = true; + } + break; + case LOG4CPLUS_TEXT('s'): // Second in minute + if (len == 2) + result << LOG4CPLUS_TEXT("%S"); + break; + case LOG4CPLUS_TEXT('z'): // Time zone name + if (len == 1) + result << LOG4CPLUS_TEXT("%Z"); + break; + case LOG4CPLUS_TEXT('Z'): // Time zone offset + if (len == 1) + result << LOG4CPLUS_TEXT("%z"); + break; + default: + result << c; + } + + i += len; + } + + if (!auxilary) + { + if (has_minute) + schedule = MINUTELY; + else if (has_hour) + schedule = HOURLY; + else if (has_day) + schedule = DAILY; + else if (has_week) + schedule = WEEKLY; + else + schedule = MONTHLY; + } + + return result.str(); +} + +static tstring +preprocessFilenamePattern(const tstring& pattern, DailyRollingFileSchedule& schedule) +{ + tostringstream result; + + for (size_t i = 0; i < pattern.length(); ) + { + tchar c = pattern[i]; + + if (c == LOG4CPLUS_TEXT('%') && + i < pattern.length()-1 && + pattern[i+1] == LOG4CPLUS_TEXT('d')) + { + if (i < pattern.length()-2 && pattern[i+2] == LOG4CPLUS_TEXT('{')) + { + size_t closingBracketPos = pattern.find(LOG4CPLUS_TEXT("}"), i+2); + if (closingBracketPos == std::string::npos) + { + break; // Malformed conversion specifier + } + else + { + result << preprocessDateTimePattern(pattern.substr(i+3, closingBracketPos-(i+3)), schedule); + i = closingBracketPos + 1; + } + } + else + { + // Default conversion specifier + result << preprocessDateTimePattern(LOG4CPLUS_TEXT("yyyy-MM-dd"), schedule); + i += 2; + } + } + else + { + result << c; + i += 1; + } + } + + return result.str(); +} + +/////////////////////////////////////////////////////////////////////////////// +// TimeBasedRollingFileAppender ctors and dtor +/////////////////////////////////////////////////////////////////////////////// + +TimeBasedRollingFileAppender::TimeBasedRollingFileAppender( + const tstring& filename_, + const tstring& filenamePattern_, + int maxHistory_, + bool cleanHistoryOnStart_, + bool immediateFlush_, + bool createDirs_) + : FileAppenderBase(filename_, std::ios_base::app, immediateFlush_, createDirs_) + , filenamePattern(filenamePattern_) + , schedule(DAILY) + , maxHistory(maxHistory_) + , cleanHistoryOnStart(cleanHistoryOnStart_) +{ } + +TimeBasedRollingFileAppender::TimeBasedRollingFileAppender( + const log4cplus::helpers::Properties& properties) + : FileAppenderBase(properties, std::ios_base::app) + , filenamePattern("%d.log") + , schedule(DAILY) + , maxHistory(10) + , cleanHistoryOnStart(false) +{ + filenamePattern = properties.getProperty(LOG4CPLUS_TEXT("FilenamePattern")); + properties.getInt(maxHistory, LOG4CPLUS_TEXT("MaxHistory")); + properties.getBool(cleanHistoryOnStart, LOG4CPLUS_TEXT("CleanHistoryOnStart")); + filenamePattern = preprocessFilenamePattern(filenamePattern, schedule); + + init(); +} + +TimeBasedRollingFileAppender::~TimeBasedRollingFileAppender() +{ + destructorImpl(); +} + +/////////////////////////////////////////////////////////////////////////////// +// TimeBasedRollingFileAppender protected methods +/////////////////////////////////////////////////////////////////////////////// + +void +TimeBasedRollingFileAppender::init() +{ + if (filenamePattern.empty()) + { + getErrorHandler()->error( LOG4CPLUS_TEXT("Invalid filename/filenamePattern values") ); + return; + } + + FileAppenderBase::init(); + + Time now = Time::gettimeofday(); + nextRolloverTime = calculateNextRolloverTime(now); + + if (cleanHistoryOnStart) + { + clean(now + Time(maxHistory*getRolloverPeriodDuration())); + } + + lastHeartBeat = now; +} + +void +TimeBasedRollingFileAppender::append(const spi::InternalLoggingEvent& event) +{ + if(event.getTimestamp() >= nextRolloverTime) { + rollover(true); + } + + FileAppenderBase::append(event); +} + +void +TimeBasedRollingFileAppender::open(std::ios_base::openmode mode) +{ + scheduledFilename = Time::gettimeofday().getFormattedTime(filenamePattern, false); + tstring currentFilename = filename.empty() ? scheduledFilename : filename; + + if (createDirs) + internal::make_dirs (currentFilename); + + out.open(LOG4CPLUS_FSTREAM_PREFERED_FILE_NAME(currentFilename).c_str(), mode); + if(!out.good()) + { + getErrorHandler()->error(LOG4CPLUS_TEXT("Unable to open file: ") + currentFilename); + return; + } + helpers::getLogLog().debug(LOG4CPLUS_TEXT("Just opened file: ") + currentFilename); +} + +void +TimeBasedRollingFileAppender::close() +{ + rollover(); + FileAppenderBase::close(); +} + +void +TimeBasedRollingFileAppender::rollover(bool alreadyLocked) +{ + helpers::LockFileGuard guard; + + if (useLockFile && ! alreadyLocked) + { + try + { + guard.attach_and_lock (*lockFile); + } + catch (std::runtime_error const &) + { + return; + } + } + + // Close the current file + out.close(); + // reset flags since the C++ standard specified that all the flags + // should remain unchanged on a close + out.clear(); + + if (! filename.empty()) + { + helpers::LogLog & loglog = helpers::getLogLog(); + long ret; + +#if defined (_WIN32) + // Try to remove the target first. It seems it is not + // possible to rename over existing file. + ret = file_remove (scheduledFilename); +#endif + + loglog.debug( + LOG4CPLUS_TEXT("Renaming file ") + + filename + + LOG4CPLUS_TEXT(" to ") + + scheduledFilename); + ret = file_rename (filename, scheduledFilename); + loglog_renaming_result (loglog, filename, scheduledFilename, ret); + } + + Time now = Time::gettimeofday(); + clean(now); + + open(std::ios::out | std::ios::trunc); + + nextRolloverTime = calculateNextRolloverTime(now); +} + +void +TimeBasedRollingFileAppender::clean(Time time) +{ + Time interval = Time(31*24*3600); // ~1 month + if (lastHeartBeat.sec() != 0) + { + interval = time - lastHeartBeat; + } + interval += Time(1); + + int periodDuration = getRolloverPeriodDuration(); + int periods = interval.sec() / periodDuration; + + helpers::LogLog & loglog = helpers::getLogLog(); + for (int i = 0; i < periods; i++) + { + int periodToRemove = (-maxHistory - 1) - i; + Time timeToRemove = time + Time(periodToRemove * periodDuration); + tstring filenameToRemove = timeToRemove.getFormattedTime(filenamePattern, false); + loglog.debug(LOG4CPLUS_TEXT("Removing file ") + filenameToRemove); + file_remove(filenameToRemove); + } + + lastHeartBeat = time; +} + +int +TimeBasedRollingFileAppender::getRolloverPeriodDuration() const +{ + switch (schedule) + { + case MONTHLY: + return 31*24*3600; + case WEEKLY: + return 7*24*3600; + default: + helpers::getLogLog ().error ( + LOG4CPLUS_TEXT ("TimeBasedRollingFileAppender::getRolloverPeriodDuration()-") + LOG4CPLUS_TEXT (" invalid schedule value")); + // Fall through. + case DAILY: + return 24*3600; + case HOURLY: + return 3600; + case MINUTELY: + return 60; + } +} + +Time +TimeBasedRollingFileAppender::calculateNextRolloverTime(const Time& t) const +{ + Time result; + struct tm next; + + switch(schedule) + { + case MONTHLY: + t.localtime(&next); + next.tm_mon += 1; + next.tm_mday = 0; // Round up to next month start + next.tm_hour = 0; + next.tm_min = 0; + next.tm_sec = 0; + next.tm_isdst = 0; + if (result.setTime(&next) == -1) { + result = t + Time(getRolloverPeriodDuration()); + } + break; + + case WEEKLY: + t.localtime(&next); + next.tm_mday += (7 - next.tm_wday + 1); // Round up to next week + next.tm_hour = 0; // Round up to next week start + next.tm_min = 0; + next.tm_sec = 0; + next.tm_isdst = 0; + if (result.setTime(&next) == -1) { + result = t + Time(getRolloverPeriodDuration()); + } + break; + + default: + case DAILY: + case HOURLY: + case MINUTELY: + { + int periodDuration = getRolloverPeriodDuration(); + result = t + Time(periodDuration); + time_t seconds = result.sec(); + int remainder = seconds % periodDuration; + result.sec(seconds - remainder); + break; + } + }; + + result.usec(0); + + return result; +} + } // namespace log4cplus From 6999a6015f7d93155a0c36a34409579fe453f341 Mon Sep 17 00:00:00 2001 From: cfyz Date: Fri, 3 Oct 2014 20:41:47 +0400 Subject: [PATCH 026/165] Register TimeBasedRollingFileAppender in factory. --- src/factory.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/factory.cxx b/src/factory.cxx index 7ac02413f..eee5f4fe0 100644 --- a/src/factory.cxx +++ b/src/factory.cxx @@ -175,6 +175,7 @@ void initializeFactoryRegistry() LOG4CPLUS_REG_APPENDER (reg, FileAppender); LOG4CPLUS_REG_APPENDER (reg, RollingFileAppender); LOG4CPLUS_REG_APPENDER (reg, DailyRollingFileAppender); + LOG4CPLUS_REG_APPENDER (reg, TimeBasedRollingFileAppender); LOG4CPLUS_REG_APPENDER (reg, SocketAppender); #if defined(_WIN32) # if defined(LOG4CPLUS_HAVE_NT_EVENT_LOG) From b3d4468b0c0ad2cd1b378b1b858e9a8e6851412d Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 4 Oct 2014 07:56:25 +0200 Subject: [PATCH 027/165] AUTHORS: Mention Oskari Timperi. --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index e75411a34..8cde68c4e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -27,3 +27,4 @@ - Sergey Nikulov - Ray Logel - Zhang Shengfa +- Oskari Timperi From e7185b9b2ab4dd66e652255ae6acd6f51d1d4564 Mon Sep 17 00:00:00 2001 From: Alexander Malinin Date: Wed, 22 Oct 2014 19:32:48 +0400 Subject: [PATCH 028/165] Using standard library method instead of custom function --- src/fileappender.cxx | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index 37a531d93..8e332d101 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -941,23 +941,6 @@ DailyRollingFileAppender::getFilename(const Time& t) const // TimeBasedRollingFileAppender utility functions /////////////////////////////////////////////////////////////////////////////// -static int -countContiguousChars(const tstring& s, size_t from) -{ - tchar c = s[from]; - int result = 1; - - for (size_t i = from+1; i < s.length(); i++) - { - if (s[i] == c) - result += 1; - else - break; - } - - return result; -} - static tstring preprocessDateTimePattern(const tstring& pattern, DailyRollingFileSchedule& schedule) { @@ -972,7 +955,8 @@ preprocessDateTimePattern(const tstring& pattern, DailyRollingFileSchedule& sche for (size_t i = 0; i < pattern.length(); ) { tchar c = pattern[i]; - int len = countContiguousChars(pattern, i); + size_t end_pos = pattern.find_first_not_of(c, i); + int len = (end_pos == tstring::npos ? pattern.length() : end_pos) - i; switch (c) { From ff76b15ff677e75df770ae9cc8c8fa760aa71292 Mon Sep 17 00:00:00 2001 From: Alexander Malinin Date: Wed, 22 Oct 2014 19:45:22 +0400 Subject: [PATCH 029/165] AUTHORS: Mention Alexander Malinin --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index e75411a34..934cc75d4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -27,3 +27,4 @@ - Sergey Nikulov - Ray Logel - Zhang Shengfa +- Alexander Malinin From 8ff9b7d7c42b931c06854c81cee0063ac6abcf4d Mon Sep 17 00:00:00 2001 From: Alexey Morozov Date: Tue, 14 Oct 2014 15:20:28 +0700 Subject: [PATCH 030/165] Move Win32-specific code under corresponding #ifdef --- src/env.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/env.cxx b/src/env.cxx index 684640918..04d26a5d5 100644 --- a/src/env.cxx +++ b/src/env.cxx @@ -185,6 +185,7 @@ remove_empty (Cont & cont, std::size_t special) } +#if defined(_WIN32) static bool is_drive_letter (tchar ch) @@ -192,7 +193,7 @@ is_drive_letter (tchar ch) tchar dl = helpers::toUpper (ch); return LOG4CPLUS_TEXT ('A') <= dl && dl <= LOG4CPLUS_TEXT ('Z'); } - +#endif // _WIN32 #if defined (_WIN32) static @@ -399,9 +400,10 @@ split_path (std::vector & components, std::size_t & special, retry_recognition:; std::size_t const comp_count = components.size (); - std::size_t comp_0_size; #if defined (_WIN32) + std::size_t comp_0_size; + // Special Windows paths recognition: // \\?\UNC\hostname\share\ - long UNC path // \\?\ - UNC path From b350a911a1c59bd51aef2684b4ad06b81d103924 Mon Sep 17 00:00:00 2001 From: Alexey Morozov Date: Tue, 14 Oct 2014 15:21:00 +0700 Subject: [PATCH 031/165] Remove unused typedef --- src/env.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/env.cxx b/src/env.cxx index 04d26a5d5..ff2eb87ec 100644 --- a/src/env.cxx +++ b/src/env.cxx @@ -383,8 +383,6 @@ bool split_path (std::vector & components, std::size_t & special, tstring const & path) { - typedef tstring::const_iterator const_iterator; - components.reserve (10); special = 0; From 0680751bb53ce3aec76a5ce40c78147256f6a987 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Fri, 24 Oct 2014 14:15:53 +0200 Subject: [PATCH 032/165] patternlayout.cxx: Allow negative maximal length in pattern specifier to make trimming of end instead of beginning possible. E.g., allow %.-1p to get initial letters of log level. --- src/patternlayout.cxx | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/src/patternlayout.cxx b/src/patternlayout.cxx index 074785cbf..7c98a82a4 100644 --- a/src/patternlayout.cxx +++ b/src/patternlayout.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -75,7 +76,8 @@ namespace pattern struct FormattingInfo { int minLen; std::size_t maxLen; - bool leftAlign; + bool leftAlign : 1; + bool trimStart : 1; FormattingInfo() { reset(); } void reset(); @@ -104,7 +106,8 @@ class PatternConverter private: int minLen; std::size_t maxLen; - bool leftAlign; + bool leftAlign : 1; + bool trimStart : 1; }; @@ -312,20 +315,22 @@ class PatternParser // FormattingInfo methods: //////////////////////////////////////////////// -void +void FormattingInfo::reset() { minLen = -1; - maxLen = 0x7FFFFFFF; + maxLen = std::numeric_limits::max (); leftAlign = false; + trimStart = true; } -void +void FormattingInfo::dump(helpers::LogLog& loglog) { tostringstream buf; buf << LOG4CPLUS_TEXT("min=") << minLen << LOG4CPLUS_TEXT(", max=") << maxLen - << LOG4CPLUS_TEXT(", leftAlign=") << std::boolalpha << leftAlign; + << LOG4CPLUS_TEXT(", leftAlign=") << std::boolalpha << leftAlign + << LOG4CPLUS_TEXT(", trimStart=") << std::boolalpha << trimStart; loglog.debug(buf.str()); } @@ -341,6 +346,7 @@ PatternConverter::PatternConverter(const FormattingInfo& i) minLen = i.minLen; maxLen = i.maxLen; leftAlign = i.leftAlign; + trimStart = i.trimStart; } @@ -354,7 +360,12 @@ PatternConverter::formatAndAppend( std::size_t len = s.length(); if (len > maxLen) - output << s.substr(len - maxLen); + { + if (trimStart) + output << s.substr(len - maxLen); + else + output << s.substr(0, maxLen); + } else if (static_cast(len) < minLen) { std::ios_base::fmtflags const original_flags = output.flags (); @@ -804,7 +815,9 @@ PatternParser::parse() case DOT_STATE: currentLiteral += c; - if(c >= LOG4CPLUS_TEXT('0') && c <= LOG4CPLUS_TEXT('9')) { + if (c == LOG4CPLUS_TEXT('-')) + formattingInfo.trimStart = false; + else if(c >= LOG4CPLUS_TEXT('0') && c <= LOG4CPLUS_TEXT('9')) { formattingInfo.maxLen = c - LOG4CPLUS_TEXT('0'); state = MAX_STATE; } From 11b97d15567383a7f468f293c42aa5395304d66b Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Fri, 24 Oct 2014 14:23:13 +0200 Subject: [PATCH 033/165] patternlayout.cxx: Whitespace cleanup. --- src/patternlayout.cxx | 120 +++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/src/patternlayout.cxx b/src/patternlayout.cxx index 7c98a82a4..f15551ba2 100644 --- a/src/patternlayout.cxx +++ b/src/patternlayout.cxx @@ -97,7 +97,7 @@ class PatternConverter public: explicit PatternConverter(const FormattingInfo& info); virtual ~PatternConverter() {} - void formatAndAppend(tostream& output, + void formatAndAppend(tostream& output, const spi::InternalLoggingEvent& event); virtual void convert(tstring & result, @@ -153,14 +153,14 @@ class BasicPatternConverter FULL_LOCATION_CONVERTER, FUNCTION_CONVERTER }; BasicPatternConverter(const FormattingInfo& info, Type type); - virtual void convert(tstring & result, + virtual void convert(tstring & result, const spi::InternalLoggingEvent& event); private: // Disable copy BasicPatternConverter(const BasicPatternConverter&); BasicPatternConverter& operator=(BasicPatternConverter&); - + LogLevelManager& llmCache; Type type; }; @@ -190,8 +190,8 @@ class LoggerPatternConverter : public PatternConverter { */ class DatePatternConverter : public PatternConverter { public: - DatePatternConverter(const FormattingInfo& info, - const tstring& pattern, + DatePatternConverter(const FormattingInfo& info, + const tstring& pattern, bool use_gmtime); virtual void convert(tstring & result, const spi::InternalLoggingEvent& event); @@ -207,7 +207,7 @@ class DatePatternConverter : public PatternConverter { */ class EnvPatternConverter : public PatternConverter { public: - EnvPatternConverter(const FormattingInfo& info, + EnvPatternConverter(const FormattingInfo& info, const log4cplus::tstring& env); virtual void convert(tstring & result, const spi::InternalLoggingEvent& event); @@ -289,7 +289,7 @@ class PatternParser private: // Types - enum ParserState { LITERAL_STATE, + enum ParserState { LITERAL_STATE, CONVERTER_STATE, DOT_STATE, MIN_STATE, @@ -425,7 +425,7 @@ BasicPatternConverter::convert(tstring & result, return; case PROCESS_CONVERTER: - helpers::convertIntegerToString(result, internal::get_process_id ()); + helpers::convertIntegerToString(result, internal::get_process_id ()); return; case NDC_CONVERTER: @@ -438,7 +438,7 @@ BasicPatternConverter::convert(tstring & result, case NEWLINE_CONVERTER: result = LOG4CPLUS_TEXT("\n"); - return; + return; case FILE_CONVERTER: result = event.getFile(); @@ -474,7 +474,7 @@ BasicPatternConverter::convert(tstring & result, result = LOG4CPLUS_TEXT(":"); return; } - + case FUNCTION_CONVERTER: result = event.getFunction (); return; @@ -511,7 +511,7 @@ LoggerPatternConverter::convert(tstring & result, // We substract 1 from 'len' when assigning to 'end' to avoid out of // bounds exception in return r.substring(end+1, len). This can happen - // if precision is 1 and the logger name ends with a dot. + // if precision is 1 and the logger name ends with a dot. tstring::size_type end = len - 1; for (int i = precision; i > 0; --i) { @@ -639,10 +639,10 @@ log4cplus::pattern::MDCPatternConverter::convert (tstring & result, result.clear (); MappedDiagnosticContextMap const & mdcMap = event.getMDCCopy(); - - for (MappedDiagnosticContextMap::const_iterator it = mdcMap.begin(); + + for (MappedDiagnosticContextMap::const_iterator it = mdcMap.begin(); it != mdcMap.end(); ++it) - { + { tstring const & name(it->first); tstring const & value(it->second); @@ -650,8 +650,8 @@ log4cplus::pattern::MDCPatternConverter::convert (tstring & result, result += name; result += LOG4CPLUS_TEXT(", "); result += value; - result += LOG4CPLUS_TEXT("}"); - + result += LOG4CPLUS_TEXT("}"); + } } } @@ -702,11 +702,11 @@ PatternParser::PatternParser( -tstring -PatternParser::extractOption() +tstring +PatternParser::extractOption() { - if ( (pos < pattern.length()) - && (pattern[pos] == LOG4CPLUS_TEXT('{'))) + if ( (pos < pattern.length()) + && (pattern[pos] == LOG4CPLUS_TEXT('{'))) { tstring::size_type end = pattern.find_first_of(LOG4CPLUS_TEXT('}'), pos); if (end != tstring::npos) { @@ -728,8 +728,8 @@ PatternParser::extractOption() } -int -PatternParser::extractPrecisionOption() +int +PatternParser::extractPrecisionOption() { tstring opt = extractOption(); int r = 0; @@ -742,7 +742,7 @@ PatternParser::extractPrecisionOption() PatternConverterList -PatternParser::parse() +PatternParser::parse() { tchar c; pos = 0; @@ -756,7 +756,7 @@ PatternParser::parse() continue; } if(c == ESCAPE_CHAR) { - // peek at the next char. + // peek at the next char. switch (pattern[pos]) { case ESCAPE_CHAR: currentLiteral += c; @@ -766,7 +766,7 @@ PatternParser::parse() if(! currentLiteral.empty ()) { list.push_back (new LiteralPatternConverter(currentLiteral)); - //getLogLog().debug("Parsed LITERAL converter: \"" + //getLogLog().debug("Parsed LITERAL converter: \"" // +currentLiteral+"\"."); } currentLiteral.resize(0); @@ -856,23 +856,23 @@ PatternParser::parse() void -PatternParser::finalizeConverter(tchar c) +PatternParser::finalizeConverter(tchar c) { PatternConverter* pc = 0; switch (c) { case LOG4CPLUS_TEXT('b'): pc = new BasicPatternConverter - (formattingInfo, + (formattingInfo, BasicPatternConverter::BASENAME_CONVERTER); //getLogLog().debug("BASENAME converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; - + case LOG4CPLUS_TEXT('c'): - pc = new LoggerPatternConverter(formattingInfo, + pc = new LoggerPatternConverter(formattingInfo, extractPrecisionOption()); //getLogLog().debug( LOG4CPLUS_TEXT("LOGGER converter.") ); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('d'): @@ -890,22 +890,22 @@ PatternParser::finalizeConverter(tchar c) //else { // getLogLog().debug("LOCAL DATE converter."); //} - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); } break; case LOG4CPLUS_TEXT('E'): pc = new EnvPatternConverter(formattingInfo, extractOption()); //getLogLog().debug("Environment converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('F'): pc = new BasicPatternConverter - (formattingInfo, + (formattingInfo, BasicPatternConverter::FILE_CONVERTER); //getLogLog().debug("FILE NAME converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('h'): @@ -920,54 +920,54 @@ PatternParser::finalizeConverter(tchar c) case LOG4CPLUS_TEXT('i'): pc = new BasicPatternConverter - (formattingInfo, + (formattingInfo, BasicPatternConverter::PROCESS_CONVERTER); //getLogLog().debug("PROCESS_CONVERTER converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('l'): pc = new BasicPatternConverter - (formattingInfo, + (formattingInfo, BasicPatternConverter::FULL_LOCATION_CONVERTER); //getLogLog().debug("FULL LOCATION converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('L'): pc = new BasicPatternConverter - (formattingInfo, + (formattingInfo, BasicPatternConverter::LINE_CONVERTER); //getLogLog().debug("LINE NUMBER converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('m'): pc = new BasicPatternConverter - (formattingInfo, + (formattingInfo, BasicPatternConverter::MESSAGE_CONVERTER); //getLogLog().debug("MESSAGE converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('M'): pc = new BasicPatternConverter ( formattingInfo, BasicPatternConverter::FUNCTION_CONVERTER); //getLogLog().debug("METHOD (function name) converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('n'): pc = new BasicPatternConverter - (formattingInfo, + (formattingInfo, BasicPatternConverter::NEWLINE_CONVERTER); //getLogLog().debug("MESSAGE converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('p'): pc = new BasicPatternConverter - (formattingInfo, + (formattingInfo, BasicPatternConverter::LOGLEVEL_CONVERTER); //getLogLog().debug("LOGLEVEL converter."); //formattingInfo.dump(getLogLog()); @@ -981,10 +981,10 @@ PatternParser::finalizeConverter(tchar c) case LOG4CPLUS_TEXT('t'): pc = new BasicPatternConverter - (formattingInfo, + (formattingInfo, BasicPatternConverter::THREAD_CONVERTER); //getLogLog().debug("THREAD converter."); - //formattingInfo.dump(getLogLog()); + //formattingInfo.dump(getLogLog()); break; case LOG4CPLUS_TEXT('T'): @@ -997,7 +997,7 @@ PatternParser::finalizeConverter(tchar c) case LOG4CPLUS_TEXT('x'): pc = new NDCPatternConverter (formattingInfo, ndcMaxDepth); - //getLogLog().debug("NDC converter."); + //getLogLog().debug("NDC converter."); break; case LOG4CPLUS_TEXT('X'): @@ -1046,13 +1046,13 @@ PatternLayout::PatternLayout(const helpers::Properties& properties) bool hasPattern = properties.exists( LOG4CPLUS_TEXT("Pattern") ); bool hasConversionPattern = properties.exists( LOG4CPLUS_TEXT("ConversionPattern") ); - + if(hasPattern) { helpers::getLogLog().warn( LOG4CPLUS_TEXT("PatternLayout- the \"Pattern\" property has been") LOG4CPLUS_TEXT(" deprecated. Use \"ConversionPattern\" instead.")); } - + if(hasConversionPattern) { init(properties.getProperty( LOG4CPLUS_TEXT("ConversionPattern") ), ndcMaxDepth); @@ -1078,8 +1078,8 @@ PatternLayout::init(const tstring& pattern_, unsigned ndcMaxDepth) // Let's validate that our parser didn't give us any NULLs. If it did, // we will convert them to a valid PatternConverter that does nothing so // at least we don't core. - for(PatternConverterList::iterator it=parsedPattern.begin(); - it!=parsedPattern.end(); + for(PatternConverterList::iterator it=parsedPattern.begin(); + it!=parsedPattern.end(); ++it) { if( (*it) == 0 ) { @@ -1092,7 +1092,7 @@ PatternLayout::init(const tstring& pattern_, unsigned ndcMaxDepth) helpers::getLogLog().warn( LOG4CPLUS_TEXT("PatternLayout pattern is empty. Using default...")); parsedPattern.push_back ( - new pattern::BasicPatternConverter(pattern::FormattingInfo(), + new pattern::BasicPatternConverter(pattern::FormattingInfo(), pattern::BasicPatternConverter::MESSAGE_CONVERTER)); } } @@ -1101,8 +1101,8 @@ PatternLayout::init(const tstring& pattern_, unsigned ndcMaxDepth) PatternLayout::~PatternLayout() { - for(PatternConverterList::iterator it=parsedPattern.begin(); - it!=parsedPattern.end(); + for(PatternConverterList::iterator it=parsedPattern.begin(); + it!=parsedPattern.end(); ++it) { delete (*it); @@ -1112,11 +1112,11 @@ PatternLayout::~PatternLayout() void -PatternLayout::formatAndAppend(tostream& output, +PatternLayout::formatAndAppend(tostream& output, const spi::InternalLoggingEvent& event) { - for(PatternConverterList::iterator it=parsedPattern.begin(); - it!=parsedPattern.end(); + for(PatternConverterList::iterator it=parsedPattern.begin(); + it!=parsedPattern.end(); ++it) { (*it)->formatAndAppend(output, event); From f6b0ce4cdcf408dc31277f713a2a6a8a228ae141 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 5 Nov 2014 07:29:59 +0100 Subject: [PATCH 034/165] Wrap string literal in LOG4CPLUS_TEXT(). --- src/fileappender.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index 8e332d101..4987f010c 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -1135,7 +1135,7 @@ TimeBasedRollingFileAppender::TimeBasedRollingFileAppender( TimeBasedRollingFileAppender::TimeBasedRollingFileAppender( const log4cplus::helpers::Properties& properties) : FileAppenderBase(properties, std::ios_base::app) - , filenamePattern("%d.log") + , filenamePattern(LOG4CPLUS_TEXT("%d.log")) , schedule(DAILY) , maxHistory(10) , cleanHistoryOnStart(false) From 9c637ad8284e9ac459afaf3180a55185201de7f0 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 5 Nov 2014 08:10:22 +0100 Subject: [PATCH 035/165] fileappender.h: Fix typo, rewrap long lines, white space cleanup. --- include/log4cplus/fileappender.h | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/include/log4cplus/fileappender.h b/include/log4cplus/fileappender.h index 310de6948..38cc4b66b 100644 --- a/include/log4cplus/fileappender.h +++ b/include/log4cplus/fileappender.h @@ -51,7 +51,7 @@ namespace log4cplus *
*
File
*
This property specifies output file name.
- * + * *
ImmediateFlush
*
When it is set true, output stream will be flushed after * each appended event.
@@ -117,7 +117,7 @@ namespace log4cplus //! provide UTF-8 locale in case UNICODE macro is defined. virtual std::locale imbue(std::locale const& loc); - //! \returns Locale imbued in fstream. + //! \returns Locale imbued in fstream. virtual std::locale getloc () const; protected: @@ -145,7 +145,7 @@ namespace log4cplus * false, then there is a good chance that the last few * logs events are not actually written to persistent media if and * when the application crashes. - * + * * The immediateFlush variable is set to * true by default. */ @@ -160,10 +160,10 @@ namespace log4cplus bool createDirs; /** - * When any append operation fails, reopenDelay says - * for how many seconds the next attempt to re-open the log file and - * resume logging will be delayed. If reopenDelay is zero, - * each failed append operation will cause log file to be re-opened. + * When any append operation fails, reopenDelay says + * for how many seconds the next attempt to re-open the log file and + * resume logging will be delayed. If reopenDelay is zero, + * each failed append operation will cause log file to be re-opened. * By default, reopenDelay is 1 second. */ int reopenDelay; @@ -299,7 +299,7 @@ namespace log4cplus // Dtor virtual ~DailyRollingFileAppender(); - + // Methods virtual void close(); @@ -324,9 +324,9 @@ namespace log4cplus /** - * TimeBasedRollingFileAppender extends {@link FileAppenderBase} so that the - * underlying file is rolled over at a user chosen frequency while also keeping - * in check a total maximum number of produced files. + * TimeBasedRollingFileAppender extends {@link FileAppenderBase} so that + * the underlying file is rolled over at a user chosen frequency while also + * keeping in check a total maximum number of produced files. * *

Properties

*

Properties additional to {@link FileAppenderBase}'s properties: @@ -334,19 +334,20 @@ namespace log4cplus *

* *
FilenamePattern
- *
The mandatory fileNamePattern property defines the name of the rolled-over - * (archived) log files. Its value should consist of the name of the file, plus - * a suitably placed %d conversion specifier. The %d conversion specifier may - * contain a date-and-time pattern as specified by the java's SimpleDateFormat. - * The rollover period is inferred from the value of fileNamePattern.
+ *
The mandatory fileNamePattern property defines the name of the + * rolled-over (archived) log files. Its value should consist of the name + * of the file, plus a suitably placed %d conversion specifier. The %d + * conversion specifier may contain a date-and-time pattern as specified by + * the java's SimpleDateFormat. The rollover period is inferred from the + * value of fileNamePattern.
* *
MaxHistory
- *
The optional maxHistory property controls the maximum number of archive - * files to keep, deleting older files.
+ *
The optional maxHistory property controls the maximum number of + * archive files to keep, deleting older files.
* - *
CleanHistoryOnStatr
- *
If set to true, archive removal will be executed on appender start up. - * By default this property is set to false.
+ *
CleanHistoryOnStart
+ *
If set to true, archive removal will be executed on appender start + * up. By default this property is set to false.
* *
*/ @@ -357,7 +358,7 @@ namespace log4cplus const tstring& filenamePattern = LOG4CPLUS_TEXT("%d.log"), int maxHistory = 10, bool cleanHistoryOnStart = false, - bool immediateFlush = true, + bool immediateFlush = true, bool createDirs = false); TimeBasedRollingFileAppender(const helpers::Properties& properties); @@ -387,9 +388,8 @@ namespace log4cplus }; typedef helpers::SharedObjectPtr - SharedTimeBasedRollingFileAppenderPtr; + SharedTimeBasedRollingFileAppenderPtr; } // end namespace log4cplus #endif // LOG4CPLUS_FILE_APPENDER_HEADER_ - From d3d5d593a10e666c3ab7b9af998f965a1e645e55 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 8 Nov 2014 11:59:46 +0100 Subject: [PATCH 036/165] TTCCLayout: Implement missing configuration features from log4j. --- aclocal.m4 | 3 +- configure | 3 +- configure.ac | 2 +- include/log4cplus/layout.h | 222 ++++++++++++++++++++----------------- src/layout.cxx | 97 ++++++++++++---- 5 files changed, 201 insertions(+), 126 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4e04490eb..261d32320 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -633,7 +633,8 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff --git a/configure b/configure index 35c8aaf12..f6c966982 100755 --- a/configure +++ b/configure @@ -3226,6 +3226,7 @@ END as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + ac_config_commands="$ac_config_commands tests/atconfig" @@ -4470,7 +4471,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=2:1:0 +LT_VERSION=3:1:0 LT_RELEASE=1.2 diff --git a/configure.ac b/configure.ac index e37773d14..4b4de3ada 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AM_PROG_AR # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=2:1:0 +LT_VERSION=3:1:0 LT_RELEASE=1.2 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) diff --git a/include/log4cplus/layout.h b/include/log4cplus/layout.h index ac82ed77f..450b990af 100644 --- a/include/log4cplus/layout.h +++ b/include/log4cplus/layout.h @@ -47,7 +47,7 @@ namespace log4cplus { } - + namespace helpers { @@ -76,12 +76,12 @@ namespace log4cplus { Layout(const helpers::Properties& properties); virtual ~Layout() = 0; - virtual void formatAndAppend(log4cplus::tostream& output, + virtual void formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event) = 0; protected: LogLevelManager& llmCache; - + private: // Disable copy Layout(const Layout&); @@ -108,10 +108,10 @@ namespace log4cplus { SimpleLayout(const log4cplus::helpers::Properties& properties); virtual ~SimpleLayout(); - virtual void formatAndAppend(log4cplus::tostream& output, + virtual void formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event); - private: + private: // Disallow copying of instances of this class SimpleLayout(const SimpleLayout&); SimpleLayout& operator=(const SimpleLayout&); @@ -122,13 +122,16 @@ namespace log4cplus { /** * TTCC layout format consists of time, thread, Logger and nested * diagnostic context information, hence the name. - * + * * The time format depends on the DateFormat used. Use the - * Use_gmtime to specify whether messages should be logged using - * localtime or gmtime. - * + * Use_gmtime to specify whether messages should be logged + * using localtime or gmtime. There are also + * ThreadPrinting, CategoryPrefixing and + * ContextPrinting properties to turn on and off thread name, + * logger name and NDC context printing respectively. + * * Here is an example TTCCLayout output: - * + * * ~~~~ * 1 [0x60004dca0] WARN test.TestThread <> - Thread-3 TestThread.run()- Starting... * 1 [0x60004dca0] TRACE SlowObject - ENTER: SlowObject::doSomething() @@ -139,7 +142,7 @@ namespace log4cplus { * 3 [0x60004b130] INFO SlowObject - Actually doing something...1, 2, 3, testing...DONE * 3 [0x60004cad0] INFO SlowObject - Actually doing something... * ~~~~ - * + * * The first field is the number of milliseconds elapsed since * the start of the program. * @@ -150,31 +153,43 @@ namespace log4cplus { * The third field is the LogLevel. * * The fourth field is the logger to which the statement belongs. - * + * * The fifth field (just before the '-') is the nested * diagnostic context. Note the nested diagnostic context may be * empty as in the first two statements. The text after the '-' * is the message of the statement. - * + * * PatternLayout offers a much more flexible alternative. */ class LOG4CPLUS_EXPORT TTCCLayout : public Layout { public: - // Ctor and dtor - TTCCLayout(bool use_gmtime = false); + TTCCLayout(bool use_gmtime = false, bool thread_printing = true, + bool category_prefixes = true, bool context_printing = true); TTCCLayout(const log4cplus::helpers::Properties& properties); virtual ~TTCCLayout(); - virtual void formatAndAppend(log4cplus::tostream& output, + virtual void formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event); + bool getThreadPrinting() const; + void setThreadPrinting(bool); + + bool getCategoryPrefixing() const; + void setCategoryPrefixing(bool); + + bool getContextPrinting() const; + void setContextPrinting(bool); + protected: log4cplus::tstring dateFormat; bool use_gmtime; - - private: + bool thread_printing; + bool category_prefixing; + bool context_printing; + + private: // Disallow copying of instances of this class TTCCLayout(const TTCCLayout&); TTCCLayout& operator=(const TTCCLayout&); @@ -186,26 +201,26 @@ namespace log4cplus { /** * A flexible layout configurable with pattern string. - * - * The goal of this class is to format a InternalLoggingEvent and return - * the results as a string. The results depend on the conversion + * + * The goal of this class is to format a InternalLoggingEvent and return + * the results as a string. The results depend on the conversion * pattern. - * + * * The conversion pattern is closely related to the conversion * pattern of the printf function in C. A conversion pattern is * composed of literal text and format control expressions called * conversion specifiers. - * + * * You are free to insert any literal text within the conversion * pattern. - * + * * Each conversion specifier starts with a percent sign (%%) and is * followed by optional format modifiers and a conversion * character. The conversion character specifies the type of * data, e.g. Logger, LogLevel, date, thread name. The format * modifiers control such things as field width, padding, left and * right justification. The following is a simple example. - * + * * Let the conversion pattern be `"%-5p [%t]: %m%n"` and assume * that the log4cplus environment was set to use a PatternLayout. Then the * statements @@ -220,9 +235,9 @@ namespace log4cplus { * * ~~~~ * DEBUG [main]: Message 1 - * WARN [main]: Message 2 + * WARN [main]: Message 2 * ~~~~ - * + * * Note that there is no explicit separator between text and * conversion specifiers. The pattern parser knows when it has reached * the end of a conversion specifier when it reads a conversion @@ -231,7 +246,7 @@ namespace log4cplus { * justified to a width of five characters. * * The recognized conversion characters are - * + * * * * @@ -247,30 +262,30 @@ namespace log4cplus { * * * - * + * * * - * - * - * * - * + * + * + * * - * - * - * + * + * + * * * * - * - * @@ -330,16 +345,16 @@ namespace log4cplus { * * * - * + * * * - * - * - * + * + * + * * * * - * - * - * + * + * + * * * * - * + * * * - * + * * * - * + * * * - * + * * * * * - * + * * * * @@ -404,14 +419,14 @@ namespace log4cplus { * LOG4CPLUS_DISABLE_FUNCTION_MACRO macro, %M * expands to an empty string. * - * + * * * - * + * * - * + * * * * @@ -422,10 +437,10 @@ namespace log4cplus { * * - * + * * * - * + * * * - * + * * * @@ -448,38 +463,38 @@ namespace log4cplus { * * * - * + * * + * * * * * - * + * * + * * * * * * + * * - * + * *
Conversion Character
cUsed to output the logger of the logging event. The * logger conversion specifier can be optionally followed by * precision specifier, that is a decimal constant in * brackets. - * + * * If a precision specifier is given, then only the corresponding * number of right most components of the logger name will be * printed. By default the logger name is printed in full. - * + * * For example, for the logger name "a.b.c" the pattern * %c{2} will output "b.c". - * + * *
dUsed to output the date of the logging event in UTC. + *
dUsed to output the date of the logging event in UTC. * * The date conversion specifier may be followed by a date format * specifier enclosed between braces. For example, %%d{%%H:%%M:%%s} - * or %%d{%%d %%b %%Y %%H:%%M:%%s}. If no date format + * or %%d{%%d %%b %%Y %%H:%%M:%%s}. If no date format * specifier is given then %%d{%%d %%m %%Y %%H:%%M:%%s} * is assumed. * @@ -306,9 +321,9 @@ namespace log4cplus { * found in the <ctime> header for more information. *
D
DUsed to output the date of the logging event in local time. * @@ -318,11 +333,11 @@ namespace log4cplus { * *
EUsed to output the value of a given environment variable. The + * + * Used to output the value of a given environment variable. The * name of is supplied as an argument in brackets. If the variable does * exist then empty string will be used. - * + * * For example, the pattern %E{HOME} will output the contents * of the HOME environment variable. *
FUsed to output the file name where the logging request was * issued. - * + * * NOTE Unlike log4j, there is no performance penalty for * calling this method.
h
hUsed to output the hostname of this system (as returned * by gethostname(2)). @@ -349,9 +364,9 @@ namespace log4cplus { * *
H
HUsed to output the fully-qualified domain name of this * system (as returned by gethostbyname(2) for the hostname @@ -362,33 +377,33 @@ namespace log4cplus { * *
lEquivalent to using "%F:%L" - * + * * NOTE: Unlike log4j, there is no performance penalty for * calling this method. - * + * *
LUsed to output the line number from where the logging request * was issued. - * + * * NOTE: Unlike log4j, there is no performance penalty for * calling this method. - * + * *
mUsed to output the application supplied message associated with - * the logging event.Used to output the application supplied message associated with + * the logging event.
nOutputs the platform dependent line separator character or - * characters. + * characters. *
pUsed to output the LogLevel of the logging event.Used to output miliseconds since program start * of the logging event.
tUsed to output the thread ID of the thread that generated * the logging event. (This is either `pthread_t` value returned * by `pthread_self()` on POSIX platforms or thread ID returned @@ -434,7 +449,7 @@ namespace log4cplus { * *
TUsed to output alternative name of the thread that generated the * logging event.
xUsed to output the NDC (nested diagnostic context) associated * with the thread that generated the logging event. - *
XUsed to output the MDC (mapped diagnostic context) * associated with the thread that generated the logging * event. It takes optional key parameter. Without the key * paramter (%%X), it outputs the whole MDC map. With the key * (%%X{key}), it outputs just the key's value. - *
"%%"The sequence "%%" outputs a single percent sign. - *
- * + * * By default the relevant information is output as is. However, * with the aid of format modifiers it is possible to change the * minimum field width, the maximum field width and justification. - * + * * The optional format modifier is placed between the percent sign * and the conversion character. - * + * * The first optional format modifier is the left justification * flag which is just the minus (-) character. Then comes the * optional minimum field width modifier. This is a decimal @@ -491,7 +506,7 @@ namespace log4cplus { * padding character is space. If the data item is larger than the * minimum field width, the field is expanded to accommodate the * data. The value is never truncated. - * + * * This behavior can be changed using the maximum field * width modifier which is designated by a period followed by a * decimal constant. If the data item is longer than the maximum @@ -501,11 +516,11 @@ namespace log4cplus { * ten characters long, then the first two characters of the data item * are dropped. This behavior deviates from the printf function in C * where truncation is done from the end. - * + * * Below are various format modifier examples for the logger * conversion specifier. - * - * + * + * * * * @@ -520,67 +535,67 @@ namespace log4cplus { * * * - * + * * - * + * * - * + * * * * * * - * + * * - * + * * * * * * - * + * * - * + * * * * * * - * + * * - * + * *
Format modifierfalse20noneLeft pad with spaces if the logger name is less than 20 * characters long. *
%-20c true 20 none Right pad with * spaces if the logger name is less than 20 characters long. *
%.30cNAnone30Truncate from the beginning if the logger name is longer than 30 * characters. *
%20.30cfalse2030Left pad with spaces if the logger name is shorter than 20 * characters. However, if logger name is longer than 30 characters, - * then truncate from the beginning. + * then truncate from the beginning. *
%-20.30ctrue2030Right pad with spaces if the logger name is shorter than 20 * characters. However, if logger name is longer than 30 characters, - * then truncate from the beginning. + * then truncate from the beginning. *
- * + * * Below are some examples of conversion patterns. - * + * *
- * - *
"%r [%t] %-5p %c %x - %m%n" + * + *
"%r [%t] %-5p %c %x - %m%n" *
This is essentially the TTCC layout. - * + * *
"%-6r [%15.15t] %-5p %30.30c %x - %m%n" - * + * *
Similar to the TTCC layout except that the relative time is * right padded if less than 6 digits, thread name is right padded if * less than 15 characters and truncated if longer and the logger * name is left padded if shorter than 30 characters and truncated if * longer. - * + * *
- * + * * The above text is largely inspired from Peter A. Darnell and * Philip E. Margolis' highly recommended book "C -- a Software * Engineering Approach", ISBN 0-387-97389-3. @@ -595,7 +610,7 @@ namespace log4cplus { *
ConversionPattern
*
This property specifies conversion pattern.
*
- * + * */ class LOG4CPLUS_EXPORT PatternLayout : public Layout @@ -606,7 +621,7 @@ namespace log4cplus { PatternLayout(const log4cplus::helpers::Properties& properties); virtual ~PatternLayout(); - virtual void formatAndAppend(log4cplus::tostream& output, + virtual void formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event); protected: @@ -616,7 +631,7 @@ namespace log4cplus { log4cplus::tstring pattern; std::vector parsedPattern; - private: + private: // Disallow copying of instances of this class PatternLayout(const PatternLayout&); PatternLayout& operator=(const PatternLayout&); @@ -627,4 +642,3 @@ namespace log4cplus { } // end namespace log4cplus #endif // LOG4CPLUS_LAYOUT_HEADER_ - diff --git a/src/layout.cxx b/src/layout.cxx index de801bd1b..902663193 100644 --- a/src/layout.cxx +++ b/src/layout.cxx @@ -39,10 +39,10 @@ formatRelativeTimestamp (log4cplus::tostream & output, = event.getTimestamp () - getTTCCLayoutTimeBase (); tchar const old_fill = output.fill (); helpers::time_t const sec = rel_time.sec (); - + if (sec != 0) output << sec << std::setfill (LOG4CPLUS_TEXT ('0')) << std::setw (3); - + output << rel_time.usec () / 1000; output.fill (old_fill); } @@ -84,12 +84,12 @@ SimpleLayout::~SimpleLayout() void -SimpleLayout::formatAndAppend(log4cplus::tostream& output, +SimpleLayout::formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event) { - output << llmCache.toString(event.getLogLevel()) + output << llmCache.toString(event.getLogLevel()) << LOG4CPLUS_TEXT(" - ") - << event.getMessage() + << event.getMessage() << LOG4CPLUS_TEXT("\n"); } @@ -99,9 +99,13 @@ SimpleLayout::formatAndAppend(log4cplus::tostream& output, // log4cplus::TTCCLayout ctors and dtor /////////////////////////////////////////////////////////////////////////////// -TTCCLayout::TTCCLayout(bool use_gmtime_) + TTCCLayout::TTCCLayout(bool use_gmtime_, bool thread_printing_, + bool category_prefixing_, bool context_printing_) : dateFormat() , use_gmtime(use_gmtime_) + , thread_printing (thread_printing_) + , category_prefixing (category_prefixing_) + , context_printing (context_printing_) { } @@ -110,9 +114,11 @@ TTCCLayout::TTCCLayout(const log4cplus::helpers::Properties& properties) : Layout(properties) , dateFormat(properties.getProperty (LOG4CPLUS_TEXT("DateFormat"), internal::empty_str)) - , use_gmtime(false) { properties.getBool (use_gmtime, LOG4CPLUS_TEXT("Use_gmtime")); + properties.getBool (thread_printing, LOG4CPLUS_TEXT("ThreadPrinting")); + properties.getBool (category_prefixing, LOG4CPLUS_TEXT("CategoryPrefixing")); + properties.getBool (context_printing, LOG4CPLUS_TEXT("ContextPrinting")); } @@ -126,7 +132,7 @@ TTCCLayout::~TTCCLayout() /////////////////////////////////////////////////////////////////////////////// void -TTCCLayout::formatAndAppend(log4cplus::tostream& output, +TTCCLayout::formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event) { if (dateFormat.empty ()) @@ -135,17 +141,70 @@ TTCCLayout::formatAndAppend(log4cplus::tostream& output, output << event.getTimestamp().getFormattedTime(dateFormat, use_gmtime); - output << LOG4CPLUS_TEXT(" [") - << event.getThread() - << LOG4CPLUS_TEXT("] ") - << llmCache.toString(event.getLogLevel()) - << LOG4CPLUS_TEXT(" ") - << event.getLoggerName() - << LOG4CPLUS_TEXT(" <") - << event.getNDC() - << LOG4CPLUS_TEXT("> - ") - << event.getMessage() - << LOG4CPLUS_TEXT("\n"); + if (getThreadPrinting ()) + output << LOG4CPLUS_TEXT(" [") + << event.getThread() + << LOG4CPLUS_TEXT("] "); + else + output << LOG4CPLUS_TEXT(' '); + + output << llmCache.toString(event.getLogLevel()) + << LOG4CPLUS_TEXT(' '); + + if (getCategoryPrefixing ()) + output << event.getLoggerName() + << LOG4CPLUS_TEXT(' '); + + if (getContextPrinting ()) + output << LOG4CPLUS_TEXT("<") + << event.getNDC() + << LOG4CPLUS_TEXT("> "); + + output << LOG4CPLUS_TEXT("- ") + << event.getMessage() + << LOG4CPLUS_TEXT("\n"); +} + + +bool +TTCCLayout::getThreadPrinting() const +{ + return thread_printing; +} + + +void +TTCCLayout::setThreadPrinting(bool thread_printing_) +{ + thread_printing = thread_printing_; +} + + +bool +TTCCLayout::getCategoryPrefixing() const +{ + return category_prefixing; +} + + +void +TTCCLayout::setCategoryPrefixing(bool category_prefixing_) +{ + category_prefixing = category_prefixing_; +} + + +bool +TTCCLayout::getContextPrinting() const +{ + return context_printing; +} + + +void +TTCCLayout::setContextPrinting(bool context_printing_) +{ + context_printing = context_printing_; } From 93daaaa49dbb29711d6d57374f690731650b9284 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 8 Nov 2014 12:28:35 +0100 Subject: [PATCH 037/165] configurator.h: Use "true" instead of "enabled". --- include/log4cplus/configurator.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/include/log4cplus/configurator.h b/include/log4cplus/configurator.h index 5cbb96f11..0617cc7c0 100644 --- a/include/log4cplus/configurator.h +++ b/include/log4cplus/configurator.h @@ -91,7 +91,7 @@ namespace log4cplus , fUTF32 = (3 << fEncodingShift) #endif }; - + // ctor and dtor PropertyConfigurator(const log4cplus::tstring& propertyFile, Hierarchy& h = Logger::getDefaultHierarchy(), unsigned flags = 0); @@ -230,7 +230,7 @@ namespace log4cplus * log4cplus.appender.A2.MaxFileSize=10MB * log4cplus.appender.A2.MaxBackupIndex=1 * log4cplus.appender.A2.layout=log4cplus::TTCCLayout - * log4cplus.appender.A2.layout.ContextPrinting=enabled + * log4cplus.appender.A2.layout.ContextPrinting=true * log4cplus.appender.A2.layout.DateFormat=ISO8601 * * # Root logger set to DEBUG using the A2 appender defined above. @@ -287,7 +287,7 @@ namespace log4cplus void configureLogger(log4cplus::Logger logger, const log4cplus::tstring& config); void configureAppenders(); void configureAdditivity(); - + virtual Logger getLogger(const log4cplus::tstring& name); virtual void addAppender(Logger &logger, log4cplus::SharedAppenderPtr& appender); @@ -297,10 +297,10 @@ namespace log4cplus // Data Hierarchy& h; log4cplus::tstring propertyFilename; - log4cplus::helpers::Properties properties; + log4cplus::helpers::Properties properties; AppenderMap appenders; unsigned flags; - + private: // Disable copy PropertyConfigurator(const PropertyConfigurator&); @@ -338,19 +338,19 @@ namespace log4cplus //! Property name for disable override. static log4cplus::tstring const DISABLE_OVERRIDE_KEY; - + private: // Disable copy BasicConfigurator(const BasicConfigurator&); BasicConfigurator& operator=(BasicConfigurator&); }; - + #if !defined(LOG4CPLUS_SINGLE_THREADED) // Forward Declarations class ConfigurationWatchDogThread; - - + + class LOG4CPLUS_EXPORT ConfigureAndWatchThread { public: // ctor and dtor @@ -362,7 +362,7 @@ namespace log4cplus // Disallow copying of instances of this class ConfigureAndWatchThread(const ConfigureAndWatchThread&); ConfigureAndWatchThread& operator=(const ConfigureAndWatchThread&); - + // Data ConfigurationWatchDogThread * watchDogThread; }; @@ -371,4 +371,3 @@ namespace log4cplus } // end namespace log4cplus #endif // LOG4CPLUS_CONFIGURATOR_HEADER_ - From 3dff5a134e83fd978a2979d3ac3ef1a6a3303dec Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 8 Nov 2014 14:08:40 +0100 Subject: [PATCH 038/165] SyslogAppender: Recognize "SyslogHost" property in addition to "host". --- aclocal.m4 | 3 +-- configure | 3 +-- configure.ac | 2 +- include/log4cplus/helpers/property.h | 8 ++++---- src/property.cxx | 29 ++++++++++++++++++++-------- src/syslogappender.cxx | 6 +++--- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 261d32320..4e04490eb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -633,8 +633,7 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi -]) +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff --git a/configure b/configure index f6c966982..1a66e8362 100755 --- a/configure +++ b/configure @@ -3226,7 +3226,6 @@ END as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi - ac_config_commands="$ac_config_commands tests/atconfig" @@ -4471,7 +4470,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=3:1:0 +LT_VERSION=4:1:1 LT_RELEASE=1.2 diff --git a/configure.ac b/configure.ac index 4b4de3ada..4f6c779d5 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AM_PROG_AR # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=3:1:0 +LT_VERSION=4:1:1 LT_RELEASE=1.2 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) diff --git a/include/log4cplus/helpers/property.h b/include/log4cplus/helpers/property.h index e97c6d4c5..7dbfcfac7 100644 --- a/include/log4cplus/helpers/property.h +++ b/include/log4cplus/helpers/property.h @@ -89,7 +89,7 @@ namespace log4cplus { /** * Searches for the property with the specified key in this property * list. If the key is not found in this property list, the default - * property list, and its defaults, recursively, are then checked. + * property list, and its defaults, recursively, are then checked. * The method returns null if the property is not found. */ log4cplus::tstring const & getProperty(const log4cplus::tstring& key) const; @@ -98,8 +98,8 @@ namespace log4cplus { /** * Searches for the property with the specified key in this property * list. If the key is not found in this property list, the default - * property list, and its defaults, recursively, are then checked. - * The method returns the default value argument if the property is + * property list, and its defaults, recursively, are then checked. + * The method returns the default value argument if the property is * not found. */ log4cplus::tstring getProperty(const log4cplus::tstring& key, @@ -132,6 +132,7 @@ namespace log4cplus { bool getLong (long & val, log4cplus::tstring const & key) const; bool getULong (unsigned long & val, log4cplus::tstring const & key) const; bool getBool (bool & val, log4cplus::tstring const & key) const; + bool getString (log4cplus::tstring & val, log4cplus::tstring const & key) const; protected: // Types @@ -159,4 +160,3 @@ namespace log4cplus { #endif // LOG4CPLUS_HELPERS_PROPERTY_HEADER_ - diff --git a/src/property.cxx b/src/property.cxx index 5c18f8196..7ba57b637 100644 --- a/src/property.cxx +++ b/src/property.cxx @@ -195,8 +195,8 @@ Properties::Properties(const tstring& inputFile, unsigned f) -void -Properties::init(tistream& input) +void +Properties::init(tistream& input) { if (! input) return; @@ -209,8 +209,8 @@ Properties::init(tistream& input) tstring::size_type const buffLen = buffer.size (); if (buffLen == 0 || buffer[0] == PROPERTIES_COMMENT_CHAR) continue; - - // Check if we have a trailing \r because we are + + // Check if we have a trailing \r because we are // reading a properties file produced on Windows. if (buffer[buffLen-1] == LOG4CPLUS_TEXT('\r')) // Remove trailing 'Windows' \r. @@ -248,7 +248,7 @@ Properties::init(tistream& input) -Properties::~Properties() +Properties::~Properties() { } @@ -274,7 +274,7 @@ Properties::exists(tchar const * key) const tstring const & -Properties::getProperty(const tstring& key) const +Properties::getProperty(const tstring& key) const { return get_property_worker (key); } @@ -299,7 +299,7 @@ Properties::getProperty(const tstring& key, const tstring& defaultVal) const std::vector -Properties::propertyNames() const +Properties::propertyNames() const { std::vector tmp; for (StringMap::const_iterator it=data.begin(); it!=data.end(); ++it) @@ -325,7 +325,7 @@ Properties::removeProperty(const log4cplus::tstring& key) } -Properties +Properties Properties::getPropertySubset(const log4cplus::tstring& prefix) const { Properties ret; @@ -381,6 +381,19 @@ Properties::getBool (bool & val, log4cplus::tstring const & key) const } +bool +Properties::getString (log4cplus::tstring & val, log4cplus::tstring const & key) + const +{ + StringMap::const_iterator it (data.find (key)); + if (it == data.end ()) + return false; + + val = it->second; + return true; +} + + template log4cplus::tstring const & Properties::get_property_worker (StringType const & key) const diff --git a/src/syslogappender.cxx b/src/syslogappender.cxx index b89c2a329..d273ae257 100644 --- a/src/syslogappender.cxx +++ b/src/syslogappender.cxx @@ -255,7 +255,8 @@ SysLogAppender::SysLogAppender(const helpers::Properties & properties) properties.getBool (udp, LOG4CPLUS_TEXT ("udp")); remoteSyslogType = udp ? RSTUdp : RSTTcp; - host = properties.getProperty (LOG4CPLUS_TEXT ("host")); + properties.getString (host, LOG4CPLUS_TEXT ("host")) + || properties.getString (host, LOG4CPLUS_TEXT ("SyslogHost")); if (host.empty ()) { #if defined (LOG4CPLUS_HAVE_SYSLOG_H) @@ -458,7 +459,7 @@ SysLogAppender::appendRemote(const spi::InternalLoggingEvent& event) appender_sp.chstr.insert (appender_sp.chstr.begin (), syslogFrameHeader.begin (), syslogFrameHeader.end ()); } - + bool ret = syslogSocket.write (appender_sp.chstr); if (! ret) { @@ -534,4 +535,3 @@ SysLogAppender::openSocket () } // namespace log4cplus - From cc04567e9f4682e11a3cfd6ba838caf0c2289b60 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Tue, 16 Dec 2014 13:41:56 +0100 Subject: [PATCH 039/165] Revert most of 16d810f9c1cede017d9c522f957274c1f67c2ebc to avoid crashing on startup with log4cplus as static library. --- src/global-init.cxx | 4 +-- src/loglevel.cxx | 81 ++++++++++++++------------------------------- 2 files changed, 26 insertions(+), 59 deletions(-) diff --git a/src/global-init.cxx b/src/global-init.cxx index 99e1bf61a..7d1985f36 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -300,8 +300,7 @@ alloc_ptd () } // namespace internal -void initializeFactoryRegistry (); -void initializeLogLevelStrings (); +void initializeFactoryRegistry(); //! Thread local storage clean up function for POSIX threads. @@ -373,7 +372,6 @@ initializeLog4cplus() dc->TTCCLayout_time_base = helpers::Time::gettimeofday (); Logger::getRoot(); initializeFactoryRegistry(); - initializeLogLevelStrings(); initialized = true; } diff --git a/src/loglevel.cxx b/src/loglevel.cxx index 524a9b688..b849d7f14 100644 --- a/src/loglevel.cxx +++ b/src/loglevel.cxx @@ -32,35 +32,16 @@ namespace log4cplus namespace { -// The strings here are not simple tstring constants to allow using these -// strings and log4cplus itself in client code during static variables -// initialization. If they are simple tstring constants then, due to undefined -// order of initialization between translation units, they might be -// uninitialized before they are used by the client code. One possible solution -// to this is to use compiler specific attributes and/or pragmas to influence -// initialization order/priority. Another solution is using function local -// static variables, which are initialized on first use. We choose this -// implementation because it is more portable than compiler specific means. - -#define DEF_LL_STRING(_logLevel) \ -static tstring const & _logLevel ## _STRING () \ -{ \ - static tstring const str (LOG4CPLUS_TEXT (#_logLevel)); \ - return str; \ -} - -DEF_LL_STRING (OFF) -DEF_LL_STRING (FATAL) -DEF_LL_STRING (ERROR) -DEF_LL_STRING (WARN) -DEF_LL_STRING (INFO) -DEF_LL_STRING (DEBUG) -DEF_LL_STRING (TRACE) -DEF_LL_STRING (ALL) -DEF_LL_STRING (NOTSET) -DEF_LL_STRING (UNKNOWN) - -#undef DEF_LL_STRING +static tstring const ALL_STRING (LOG4CPLUS_TEXT("ALL")); +static tstring const TRACE_STRING (LOG4CPLUS_TEXT("TRACE")); +static tstring const DEBUG_STRING (LOG4CPLUS_TEXT("DEBUG")); +static tstring const INFO_STRING (LOG4CPLUS_TEXT("INFO")); +static tstring const WARN_STRING (LOG4CPLUS_TEXT("WARN")); +static tstring const ERROR_STRING (LOG4CPLUS_TEXT("ERROR")); +static tstring const FATAL_STRING (LOG4CPLUS_TEXT("FATAL")); +static tstring const OFF_STRING (LOG4CPLUS_TEXT("OFF")); +static tstring const NOTSET_STRING (LOG4CPLUS_TEXT("NOTSET")); +static tstring const UNKNOWN_STRING (LOG4CPLUS_TEXT("UNKNOWN")); static @@ -68,15 +49,15 @@ tstring const & defaultLogLevelToStringMethod(LogLevel ll) { switch(ll) { - case OFF_LOG_LEVEL: return OFF_STRING(); - case FATAL_LOG_LEVEL: return FATAL_STRING(); - case ERROR_LOG_LEVEL: return ERROR_STRING(); - case WARN_LOG_LEVEL: return WARN_STRING(); - case INFO_LOG_LEVEL: return INFO_STRING(); - case DEBUG_LOG_LEVEL: return DEBUG_STRING(); - case TRACE_LOG_LEVEL: return TRACE_STRING(); - //case ALL_LOG_LEVEL: return ALL_STRING(); - case NOT_SET_LOG_LEVEL: return NOTSET_STRING(); + case OFF_LOG_LEVEL: return OFF_STRING; + case FATAL_LOG_LEVEL: return FATAL_STRING; + case ERROR_LOG_LEVEL: return ERROR_STRING; + case WARN_LOG_LEVEL: return WARN_STRING; + case INFO_LOG_LEVEL: return INFO_STRING; + case DEBUG_LOG_LEVEL: return DEBUG_STRING; + case TRACE_LOG_LEVEL: return TRACE_STRING; + //case ALL_LOG_LEVEL: return ALL_STRING; + case NOT_SET_LOG_LEVEL: return NOTSET_STRING; }; return internal::empty_str; @@ -98,8 +79,11 @@ defaultStringToLogLevelMethod(const tstring& s) switch (s[0]) { #define DEF_LLMATCH(_chr, _logLevel) \ - case _chr: if (s == _logLevel ## _STRING ()) \ - return _logLevel ## _LOG_LEVEL; break; + case _chr: \ + if (s == _logLevel ## _STRING) \ + return _logLevel ## _LOG_LEVEL; \ + else \ + break; DEF_LLMATCH ('O', OFF); DEF_LLMATCH ('F', FATAL); @@ -119,21 +103,6 @@ defaultStringToLogLevelMethod(const tstring& s) } // namespace -void -initializeLogLevelStrings () -{ - OFF_STRING(); - FATAL_STRING(); - ERROR_STRING(); - WARN_STRING(); - INFO_STRING(); - DEBUG_STRING(); - TRACE_STRING(); - ALL_STRING(); - NOTSET_STRING(); -} - - ////////////////////////////////////////////////////////////////////////////// // LogLevelManager ctors and dtor ////////////////////////////////////////////////////////////////////////////// @@ -178,7 +147,7 @@ LogLevelManager::toString(LogLevel ll) const return *ret; } - return UNKNOWN_STRING(); + return UNKNOWN_STRING; } From 081e455356a473649b02d4d581997cd30db7ee47 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Thu, 18 Dec 2014 16:24:22 +0100 Subject: [PATCH 040/165] appenderattachableimpl.cxx: Remove elements in specific order to avoid differences between platforms in order of destruction, which is unspecified by the standard. --- src/appenderattachableimpl.cxx | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/appenderattachableimpl.cxx b/src/appenderattachableimpl.cxx index 8ec908411..16b92eab1 100644 --- a/src/appenderattachableimpl.cxx +++ b/src/appenderattachableimpl.cxx @@ -74,7 +74,7 @@ AppenderAttachableImpl::addAppender(SharedAppenderPtr newAppender) thread::MutexGuard guard (appender_list_mutex); - ListType::iterator it = + ListType::iterator it = std::find(appenderList.begin(), appenderList.end(), newAppender); if(it == appenderList.end()) { appenderList.push_back(newAppender); @@ -87,19 +87,19 @@ AppenderAttachableImpl::ListType AppenderAttachableImpl::getAllAppenders() { thread::MutexGuard guard (appender_list_mutex); - + return appenderList; } -SharedAppenderPtr +SharedAppenderPtr AppenderAttachableImpl::getAppender(const log4cplus::tstring& name) { thread::MutexGuard guard (appender_list_mutex); - for(ListType::iterator it=appenderList.begin(); - it!=appenderList.end(); + for(ListType::iterator it=appenderList.begin(); + it!=appenderList.end(); ++it) { if((*it)->getName() == name) { @@ -112,17 +112,26 @@ AppenderAttachableImpl::getAppender(const log4cplus::tstring& name) -void +void AppenderAttachableImpl::removeAllAppenders() { thread::MutexGuard guard (appender_list_mutex); - appenderList.erase(appenderList.begin(), appenderList.end()); + // Clear appenders in specific order because the order of destruction of + // std::vector elements is surprisingly unspecified and it breaks our + // tests' expectations. + + for (ListType::iterator it = appenderList.begin (), + end = appenderList.end (); + it != end; ++it) + *it = SharedAppenderPtr (); + + appenderList.clear (); } -void +void AppenderAttachableImpl::removeAppender(SharedAppenderPtr appender) { if(appender == NULL) { @@ -141,7 +150,7 @@ AppenderAttachableImpl::removeAppender(SharedAppenderPtr appender) -void +void AppenderAttachableImpl::removeAppender(const log4cplus::tstring& name) { removeAppender(getAppender(name)); @@ -149,7 +158,7 @@ AppenderAttachableImpl::removeAppender(const log4cplus::tstring& name) -int +int AppenderAttachableImpl::appendLoopOnAppenders(const spi::InternalLoggingEvent& event) const { int count = 0; From 7da1ac27049c0e4fa39ee517a29dc8b7e0e28db1 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Thu, 18 Dec 2014 16:29:35 +0100 Subject: [PATCH 041/165] appender_test/main.cxx: Work around non-determinism in output. Remove using namespace. --- tests/appender_test/expout | 2 +- tests/appender_test/main.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/appender_test/expout b/tests/appender_test/expout index 712e8c9f5..8a7c57567 100644 --- a/tests/appender_test/expout +++ b/tests/appender_test/expout @@ -27,7 +27,7 @@ log4cplus: Entering ConsoleAppender::close().. log4cplus: Destroying appender named [Sixth]. log4cplus: Destroying appender named [Seventh]. log4cplus:ERROR Derived Appender did not call destructorImpl(). +log4cplus: Destroying appender named [Second]. log4cplus: Entering ConsoleAppender::close().. log4cplus: Destroying appender named [First]. -log4cplus: Destroying appender named [Second]. Exiting main()... diff --git a/tests/appender_test/main.cxx b/tests/appender_test/main.cxx index e22bb8c63..f36b8c595 100644 --- a/tests/appender_test/main.cxx +++ b/tests/appender_test/main.cxx @@ -45,7 +45,6 @@ main() log4cplus::initialize (); LogLog::getLogLog()->setInternalDebugging(true); { - AppenderAttachableImpl aai; try { SharedObjectPtr append_1( new ConsoleAppender(false, true)); @@ -83,6 +82,7 @@ main() DEBUG_LOG_LEVEL, LOG4CPLUS_TEXT("This is a test..."), __FILE__, __LINE__, "main"); + AppenderAttachableImpl aai; aai.addAppender(append_1); aai.addAppender(append_2); aai.addAppender(append_1); From 4ccff2d56d054d4d28ad971c0ec7c9d8e25a2935 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Fri, 2 Jan 2015 01:46:07 +0100 Subject: [PATCH 042/165] Fix comment typo. --- src/socket.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.cxx b/src/socket.cxx index a4328333c..ff7d731d3 100644 --- a/src/socket.cxx +++ b/src/socket.cxx @@ -1,5 +1,5 @@ // Module: Log4CPLUS -// File: socket-win32.cxx +// File: socket.cxx // Created: 4/2003 // Author: Tad E. Smith // From 88a528db1a7f43175fb2d2ea93a38df7c5a26e10 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Fri, 2 Jan 2015 14:30:35 +0100 Subject: [PATCH 043/165] Check for constructor attribute with and without priority support. --- configure | 56 +++++++++++++++++++++++++ configure.ac | 5 +++ include/log4cplus/config.h.in | 7 ++++ include/log4cplus/config.hxx | 5 ++- include/log4cplus/config/defines.hxx.in | 4 ++ m4/ax_gcc_func_attribute.m4 | 4 ++ 6 files changed, 80 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 1a66e8362..8950b0d1c 100755 --- a/configure +++ b/configure @@ -8311,6 +8311,62 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((constructor_priority))" >&5 +$as_echo_n "checking for __attribute__((constructor_priority))... " >&6; } +if ${ax_cv_have_func_attribute_constructor_priority+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + int foo( void ) __attribute__((__constructor__(65535/2))); + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if test -s conftest.err; then : + ax_cv_have_func_attribute_constructor_priority=no +else + ax_cv_have_func_attribute_constructor_priority=yes +fi +else + ax_cv_have_func_attribute_constructor_priority=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_constructor_priority" >&5 +$as_echo "$ax_cv_have_func_attribute_constructor_priority" >&6; } + + if test yes = $ax_cv_have_func_attribute_constructor_priority; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR_PRIORITY 1 +_ACEOF + +fi + + + + +if test "x$ax_cv_have_func_attribute_constructor_priority" = "xyes"; then : + $as_echo "#define LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR_PRIORITY 1" >>confdefs.h + +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((constructor))" >&5 $as_echo_n "checking for __attribute__((constructor))... " >&6; } if ${ax_cv_have_func_attribute_constructor+:} false; then : diff --git a/configure.ac b/configure.ac index 4f6c779d5..93cc55be0 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,11 @@ AH_TEMPLATE([LOG4CPLUS_HAVE_FUNC_SYMBOL]) AS_IF([test "x$ac_cv_have___func___symbol" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE_FUNC_SYMBOL])]) +AX_GCC_FUNC_ATTRIBUTE([constructor_priority]) +AH_TEMPLATE([LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR_PRIORITY]) +AS_IF([test "x$ax_cv_have_func_attribute_constructor_priority" = "xyes"], + [AC_DEFINE([LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR_PRIORITY])]) + AX_GCC_FUNC_ATTRIBUTE([constructor]) AH_TEMPLATE([LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR]) AS_IF([test "x$ax_cv_have_func_attribute_constructor" = "xyes"], diff --git a/include/log4cplus/config.h.in b/include/log4cplus/config.h.in index 2b0cab28b..a2da94a51 100644 --- a/include/log4cplus/config.h.in +++ b/include/log4cplus/config.h.in @@ -42,6 +42,10 @@ /* Define to 1 if the system has the `constructor' function attribute */ #undef HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR +/* Define to 1 if the system has the `constructor_priority' function attribute + */ +#undef HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR_PRIORITY + /* */ #undef HAVE_GETADDRINFO @@ -292,6 +296,9 @@ /* */ #undef LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR +/* */ +#undef LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR_PRIORITY + /* */ #undef LOG4CPLUS_HAVE_FUNC_SYMBOL diff --git a/include/log4cplus/config.hxx b/include/log4cplus/config.hxx index 22d039768..0f5427fa2 100644 --- a/include/log4cplus/config.hxx +++ b/include/log4cplus/config.hxx @@ -154,9 +154,12 @@ # pragma once #endif -#if defined (LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR) +#if defined (LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR_PRIORITY) # define LOG4CPLUS_CONSTRUCTOR_FUNC(prio) \ __attribute__ ((__constructor__ ((prio)))) +#elif defined (LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR) +# define LOG4CPLUS_CONSTRUCTOR_FUNC(prio) \ + __attribute__ ((__constructor__)) #else # define LOG4CPLUS_CONSTRUCTOR_FUNC(prio) /* empty */ #endif diff --git a/include/log4cplus/config/defines.hxx.in b/include/log4cplus/config/defines.hxx.in index 79a5665d1..db1fb64a7 100644 --- a/include/log4cplus/config/defines.hxx.in +++ b/include/log4cplus/config/defines.hxx.in @@ -278,6 +278,10 @@ /* Define to 1 if you have the `OutputDebugString' function. */ #undef LOG4CPLUS_HAVE_OUTPUTDEBUGSTRING +/* Define to 1 if the system has the `constructor' function attribute + with priority */ +#undef LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR_PRIORITY + /* Define to 1 if the system has the `constructor' function attribute */ #undef LOG4CPLUS_HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR diff --git a/m4/ax_gcc_func_attribute.m4 b/m4/ax_gcc_func_attribute.m4 index de11303e7..5ffe071d1 100644 --- a/m4/ax_gcc_func_attribute.m4 +++ b/m4/ax_gcc_func_attribute.m4 @@ -31,6 +31,7 @@ # cold # const # constructor +# constructor_priority for constructor attribute with priority # deprecated # destructor # dllexport @@ -103,6 +104,9 @@ AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [ [const], [ int foo( void ) __attribute__(($1)); ], + [constructor_priority], [ + int foo( void ) __attribute__((__constructor__(65535/2))); + ], [constructor], [ int foo( void ) __attribute__(($1)); ], From 1b0c5860fc6db5895c32fbd0dc3c801c51b8fdcb Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 3 Jan 2015 20:02:06 +0100 Subject: [PATCH 044/165] scripts/update_copyrights.sh: Fix for too many files. --- scripts/update_copyrights.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/update_copyrights.sh b/scripts/update_copyrights.sh index aa0ac8145..aab1c99ca 100755 --- a/scripts/update_copyrights.sh +++ b/scripts/update_copyrights.sh @@ -1,10 +1,16 @@ #!/bin/sh -FILES=`find . \( \( -not -path './objdir*' \) -and \( -name '*.h' -o -name '*.hxx' -o -name '*.cxx' \) \)` +find_files() { + find . \( \( \! -path './objdir*' \) \ + \( -name '*.h' -o -name '*.hxx' -o -name '*.cxx' \) \) +} + +find_files | while read file ; do +echo "modifying file $file"; perl -wn -i.bak -e ' use strict; -my $YEAR = 2013; +my $YEAR = 2015; my $sep = qr/[\s,;]/; if (/copyright/i) @@ -27,4 +33,6 @@ else { print; } -' $FILES +' $file; +done + From 2fcb7efdf60cc827ea10f056b8133f3caabe7aa0 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 3 Jan 2015 20:03:43 +0100 Subject: [PATCH 045/165] Update copyright years to include 2015. --- include/log4cplus/appender.h | 2 +- include/log4cplus/asyncappender.h | 2 +- include/log4cplus/boost/deviceappender.hxx | 2 +- include/log4cplus/clfsappender.h | 2 +- include/log4cplus/clogger.h | 2 +- include/log4cplus/config.hxx | 2 +- include/log4cplus/config/macosx.h | 2 +- include/log4cplus/config/win32.h | 2 +- include/log4cplus/config/windowsh-inc.h | 2 +- include/log4cplus/configurator.h | 2 +- include/log4cplus/consoleappender.h | 2 +- include/log4cplus/fileappender.h | 2 +- include/log4cplus/fstreams.h | 2 +- include/log4cplus/helpers/appenderattachableimpl.h | 2 +- include/log4cplus/helpers/connectorthread.h | 2 +- include/log4cplus/helpers/fileinfo.h | 2 +- include/log4cplus/helpers/lockfile.h | 2 +- include/log4cplus/helpers/loglog.h | 2 +- include/log4cplus/helpers/logloguser.h | 2 +- include/log4cplus/helpers/pointer.h | 2 +- include/log4cplus/helpers/property.h | 2 +- include/log4cplus/helpers/queue.h | 2 +- include/log4cplus/helpers/sleep.h | 2 +- include/log4cplus/helpers/snprintf.h | 2 +- include/log4cplus/helpers/socket.h | 2 +- include/log4cplus/helpers/socketbuffer.h | 2 +- include/log4cplus/helpers/stringhelper.h | 2 +- include/log4cplus/helpers/thread-config.h | 2 +- include/log4cplus/helpers/timehelper.h | 2 +- include/log4cplus/hierarchy.h | 2 +- include/log4cplus/hierarchylocker.h | 2 +- include/log4cplus/internal/cygwin-win32.h | 2 +- include/log4cplus/internal/env.h | 2 +- include/log4cplus/internal/internal.h | 2 +- include/log4cplus/internal/socket.h | 2 +- include/log4cplus/layout.h | 2 +- include/log4cplus/log4judpappender.h | 2 +- include/log4cplus/logger.h | 2 +- include/log4cplus/loggingmacros.h | 2 +- include/log4cplus/loglevel.h | 2 +- include/log4cplus/mdc.h | 2 +- include/log4cplus/msttsappender.h | 2 +- include/log4cplus/ndc.h | 2 +- include/log4cplus/nteventlogappender.h | 2 +- include/log4cplus/nullappender.h | 2 +- include/log4cplus/qt4debugappender.h | 2 +- include/log4cplus/qt5debugappender.h | 2 +- include/log4cplus/socketappender.h | 2 +- include/log4cplus/spi/appenderattachable.h | 2 +- include/log4cplus/spi/factory.h | 2 +- include/log4cplus/spi/filter.h | 2 +- include/log4cplus/spi/loggerfactory.h | 2 +- include/log4cplus/spi/loggerimpl.h | 2 +- include/log4cplus/spi/loggingevent.h | 2 +- include/log4cplus/spi/objectregistry.h | 2 +- include/log4cplus/spi/rootlogger.h | 2 +- include/log4cplus/streams.h | 2 +- include/log4cplus/syslogappender.h | 2 +- include/log4cplus/tchar.h | 2 +- include/log4cplus/thread/impl/syncprims-cxx11.h | 2 +- include/log4cplus/thread/impl/syncprims-impl.h | 2 +- include/log4cplus/thread/impl/syncprims-pmsm.h | 2 +- include/log4cplus/thread/impl/syncprims-pthreads.h | 2 +- include/log4cplus/thread/impl/syncprims-win32.h | 2 +- include/log4cplus/thread/impl/threads-impl.h | 2 +- include/log4cplus/thread/impl/tls.h | 2 +- include/log4cplus/thread/syncprims-pub-impl.h | 2 +- include/log4cplus/thread/syncprims.h | 2 +- include/log4cplus/thread/threads.h | 2 +- include/log4cplus/tracelogger.h | 2 +- include/log4cplus/tstring.h | 2 +- include/log4cplus/version.h | 2 +- include/log4cplus/win32consoleappender.h | 2 +- include/log4cplus/win32debugappender.h | 2 +- qt4debugappender/qt4debugappender.cxx | 2 +- qt5debugappender/qt5debugappender.cxx | 2 +- simpleserver/loggingserver.cxx | 2 +- src/appender.cxx | 2 +- src/appenderattachableimpl.cxx | 2 +- src/asyncappender.cxx | 2 +- src/clfsappender.cxx | 2 +- src/clogger.cxx | 2 +- src/configurator.cxx | 2 +- src/connectorthread.cxx | 2 +- src/consoleappender.cxx | 2 +- src/cygwin-win32.cxx | 2 +- src/env.cxx | 2 +- src/factory.cxx | 2 +- src/fileappender.cxx | 2 +- src/fileinfo.cxx | 2 +- src/filter.cxx | 2 +- src/global-init.cxx | 2 +- src/hierarchy.cxx | 2 +- src/hierarchylocker.cxx | 2 +- src/layout.cxx | 2 +- src/lockfile.cxx | 2 +- src/log4judpappender.cxx | 2 +- src/logger.cxx | 2 +- src/loggerimpl.cxx | 2 +- src/loggingevent.cxx | 2 +- src/loggingmacros.cxx | 2 +- src/loglevel.cxx | 2 +- src/loglog.cxx | 2 +- src/logloguser.cxx | 2 +- src/mdc.cxx | 2 +- src/msttsappender.cxx | 2 +- src/ndc.cxx | 2 +- src/nteventlogappender.cxx | 2 +- src/nullappender.cxx | 2 +- src/objectregistry.cxx | 2 +- src/patternlayout.cxx | 2 +- src/pointer.cxx | 2 +- src/property.cxx | 2 +- src/queue.cxx | 2 +- src/rootlogger.cxx | 2 +- src/sleep.cxx | 2 +- src/snprintf.cxx | 2 +- src/socket-unix.cxx | 2 +- src/socket-win32.cxx | 2 +- src/socket.cxx | 2 +- src/socketappender.cxx | 2 +- src/socketbuffer.cxx | 2 +- src/stringhelper-clocale.cxx | 2 +- src/stringhelper-cxxlocale.cxx | 2 +- src/stringhelper-iconv.cxx | 2 +- src/stringhelper.cxx | 2 +- src/syncprims.cxx | 2 +- src/syslogappender.cxx | 2 +- src/threads.cxx | 2 +- src/timehelper.cxx | 2 +- src/tls.cxx | 2 +- src/version.cxx | 2 +- src/win32consoleappender.cxx | 2 +- src/win32debugappender.cxx | 2 +- 134 files changed, 134 insertions(+), 134 deletions(-) diff --git a/include/log4cplus/appender.h b/include/log4cplus/appender.h index 5eca94c77..ae99887db 100644 --- a/include/log4cplus/appender.h +++ b/include/log4cplus/appender.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/asyncappender.h b/include/log4cplus/asyncappender.h index af9d5e536..ca30a8048 100644 --- a/include/log4cplus/asyncappender.h +++ b/include/log4cplus/asyncappender.h @@ -5,7 +5,7 @@ // Author: Vaclav Haisman // // -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/boost/deviceappender.hxx b/include/log4cplus/boost/deviceappender.hxx index e31fc7902..77e17b4e7 100644 --- a/include/log4cplus/boost/deviceappender.hxx +++ b/include/log4cplus/boost/deviceappender.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/clfsappender.h b/include/log4cplus/clfsappender.h index ca46b69c2..59d336dad 100644 --- a/include/log4cplus/clfsappender.h +++ b/include/log4cplus/clfsappender.h @@ -5,7 +5,7 @@ // Author: Vaclav Zeman // // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/clogger.h b/include/log4cplus/clogger.h index a340d1bec..fc84e34e3 100644 --- a/include/log4cplus/clogger.h +++ b/include/log4cplus/clogger.h @@ -6,7 +6,7 @@ * Author: Jens Rehsack * * - * Copyright 2011-2013 Jens Rehsack & Tad E. Smith + * Copyright 2011-2015 Jens Rehsack & Tad E. Smith * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/log4cplus/config.hxx b/include/log4cplus/config.hxx index 0f5427fa2..7b96a1a81 100644 --- a/include/log4cplus/config.hxx +++ b/include/log4cplus/config.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/config/macosx.h b/include/log4cplus/config/macosx.h index 448090c71..638f9de89 100644 --- a/include/log4cplus/config/macosx.h +++ b/include/log4cplus/config/macosx.h @@ -5,7 +5,7 @@ // Author: Christopher R. Bailey // // -// Copyright 2003-2013 Christopher R. Bailey +// Copyright 2003-2015 Christopher R. Bailey // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/config/win32.h b/include/log4cplus/config/win32.h index 790d631f9..75af8bf01 100644 --- a/include/log4cplus/config/win32.h +++ b/include/log4cplus/config/win32.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/config/windowsh-inc.h b/include/log4cplus/config/windowsh-inc.h index b71a8e105..f28eb8535 100644 --- a/include/log4cplus/config/windowsh-inc.h +++ b/include/log4cplus/config/windowsh-inc.h @@ -5,7 +5,7 @@ // Author: Vaclav Zeman // // -// Copyright (C) 2010-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/configurator.h b/include/log4cplus/configurator.h index 0617cc7c0..d569242a8 100644 --- a/include/log4cplus/configurator.h +++ b/include/log4cplus/configurator.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/consoleappender.h b/include/log4cplus/consoleappender.h index e31bdad5b..2326cbd83 100644 --- a/include/log4cplus/consoleappender.h +++ b/include/log4cplus/consoleappender.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/fileappender.h b/include/log4cplus/fileappender.h index 38cc4b66b..29c9c1f29 100644 --- a/include/log4cplus/fileappender.h +++ b/include/log4cplus/fileappender.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/fstreams.h b/include/log4cplus/fstreams.h index d0c0831d5..c3de83dcc 100644 --- a/include/log4cplus/fstreams.h +++ b/include/log4cplus/fstreams.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/appenderattachableimpl.h b/include/log4cplus/helpers/appenderattachableimpl.h index 4cfaf3f21..9c6db0118 100644 --- a/include/log4cplus/helpers/appenderattachableimpl.h +++ b/include/log4cplus/helpers/appenderattachableimpl.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/connectorthread.h b/include/log4cplus/helpers/connectorthread.h index 4284b2ee8..eb6bd77d2 100644 --- a/include/log4cplus/helpers/connectorthread.h +++ b/include/log4cplus/helpers/connectorthread.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2013-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/helpers/fileinfo.h b/include/log4cplus/helpers/fileinfo.h index 725c940d8..07f276627 100644 --- a/include/log4cplus/helpers/fileinfo.h +++ b/include/log4cplus/helpers/fileinfo.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/helpers/lockfile.h b/include/log4cplus/helpers/lockfile.h index 9277dd7a6..2b752f799 100644 --- a/include/log4cplus/helpers/lockfile.h +++ b/include/log4cplus/helpers/lockfile.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/helpers/loglog.h b/include/log4cplus/helpers/loglog.h index 336f18fda..823e52a58 100644 --- a/include/log4cplus/helpers/loglog.h +++ b/include/log4cplus/helpers/loglog.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/logloguser.h b/include/log4cplus/helpers/logloguser.h index 11b3f5ed0..2becc15c2 100644 --- a/include/log4cplus/helpers/logloguser.h +++ b/include/log4cplus/helpers/logloguser.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/pointer.h b/include/log4cplus/helpers/pointer.h index e53f38770..50b3636b1 100644 --- a/include/log4cplus/helpers/pointer.h +++ b/include/log4cplus/helpers/pointer.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/property.h b/include/log4cplus/helpers/property.h index 7dbfcfac7..6d9077818 100644 --- a/include/log4cplus/helpers/property.h +++ b/include/log4cplus/helpers/property.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2002-2013 Tad E. Smith +// Copyright 2002-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/queue.h b/include/log4cplus/helpers/queue.h index eefaf2f0e..3da0df244 100644 --- a/include/log4cplus/helpers/queue.h +++ b/include/log4cplus/helpers/queue.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/helpers/sleep.h b/include/log4cplus/helpers/sleep.h index f3c56363e..dab17f68e 100644 --- a/include/log4cplus/helpers/sleep.h +++ b/include/log4cplus/helpers/sleep.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/snprintf.h b/include/log4cplus/helpers/snprintf.h index f0dc9490c..032b8b000 100644 --- a/include/log4cplus/helpers/snprintf.h +++ b/include/log4cplus/helpers/snprintf.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2010-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/helpers/socket.h b/include/log4cplus/helpers/socket.h index eb52d84c0..9b65d1115 100644 --- a/include/log4cplus/helpers/socket.h +++ b/include/log4cplus/helpers/socket.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/socketbuffer.h b/include/log4cplus/helpers/socketbuffer.h index f8b961326..1cdab06cd 100644 --- a/include/log4cplus/helpers/socketbuffer.h +++ b/include/log4cplus/helpers/socketbuffer.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/stringhelper.h b/include/log4cplus/helpers/stringhelper.h index 8dd4ff206..9c3d4c86b 100644 --- a/include/log4cplus/helpers/stringhelper.h +++ b/include/log4cplus/helpers/stringhelper.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/thread-config.h b/include/log4cplus/helpers/thread-config.h index 4f9e06367..747819334 100644 --- a/include/log4cplus/helpers/thread-config.h +++ b/include/log4cplus/helpers/thread-config.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/helpers/timehelper.h b/include/log4cplus/helpers/timehelper.h index 06b3281b7..6ea44908e 100644 --- a/include/log4cplus/helpers/timehelper.h +++ b/include/log4cplus/helpers/timehelper.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/hierarchy.h b/include/log4cplus/hierarchy.h index 2c023a961..392c2a79f 100644 --- a/include/log4cplus/hierarchy.h +++ b/include/log4cplus/hierarchy.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/hierarchylocker.h b/include/log4cplus/hierarchylocker.h index ed2766470..caec7c32d 100644 --- a/include/log4cplus/hierarchylocker.h +++ b/include/log4cplus/hierarchylocker.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/internal/cygwin-win32.h b/include/log4cplus/internal/cygwin-win32.h index 11e3b8893..12e1203c2 100644 --- a/include/log4cplus/internal/cygwin-win32.h +++ b/include/log4cplus/internal/cygwin-win32.h @@ -4,7 +4,7 @@ // Created: 7/2011 // Author: Vaclav Zeman // -// Copyright (C) 2011-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2011-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/internal/env.h b/include/log4cplus/internal/env.h index ffedde8df..ee245ee36 100644 --- a/include/log4cplus/internal/env.h +++ b/include/log4cplus/internal/env.h @@ -5,7 +5,7 @@ // Author: Vaclav Haisman // // -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/internal/internal.h b/include/log4cplus/internal/internal.h index 2d102f8ca..c0f1106e7 100644 --- a/include/log4cplus/internal/internal.h +++ b/include/log4cplus/internal/internal.h @@ -5,7 +5,7 @@ // Author: Vaclav Haisman // // -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/internal/socket.h b/include/log4cplus/internal/socket.h index e1402e3a2..f62c3b8ac 100644 --- a/include/log4cplus/internal/socket.h +++ b/include/log4cplus/internal/socket.h @@ -5,7 +5,7 @@ // Author: Vaclav Haisman // // -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/layout.h b/include/log4cplus/layout.h index 450b990af..dc26f199f 100644 --- a/include/log4cplus/layout.h +++ b/include/log4cplus/layout.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/log4judpappender.h b/include/log4cplus/log4judpappender.h index 51302c723..0a09152f5 100644 --- a/include/log4cplus/log4judpappender.h +++ b/include/log4cplus/log4judpappender.h @@ -5,7 +5,7 @@ // Author: Siva Chandran P // // -// Copyright 2012-2013 Siva Chandran P +// Copyright 2012-2015 Siva Chandran P // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/logger.h b/include/log4cplus/logger.h index 416c92966..f114c25ec 100644 --- a/include/log4cplus/logger.h +++ b/include/log4cplus/logger.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/loggingmacros.h b/include/log4cplus/loggingmacros.h index e73527fd1..08e9cd660 100644 --- a/include/log4cplus/loggingmacros.h +++ b/include/log4cplus/loggingmacros.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/loglevel.h b/include/log4cplus/loglevel.h index d7e0db2cb..c06f955f9 100644 --- a/include/log4cplus/loglevel.h +++ b/include/log4cplus/loglevel.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/mdc.h b/include/log4cplus/mdc.h index ff23774d5..f08b388e2 100644 --- a/include/log4cplus/mdc.h +++ b/include/log4cplus/mdc.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/msttsappender.h b/include/log4cplus/msttsappender.h index e443f7b5e..b3a1fd6f5 100644 --- a/include/log4cplus/msttsappender.h +++ b/include/log4cplus/msttsappender.h @@ -5,7 +5,7 @@ // Author: Vaclav Zeman // // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/ndc.h b/include/log4cplus/ndc.h index faac5fff0..90df808dc 100644 --- a/include/log4cplus/ndc.h +++ b/include/log4cplus/ndc.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/nteventlogappender.h b/include/log4cplus/nteventlogappender.h index 9ea3a8974..8d0c8e67d 100644 --- a/include/log4cplus/nteventlogappender.h +++ b/include/log4cplus/nteventlogappender.h @@ -4,7 +4,7 @@ // Created: 4/2003 // Author: Michael CATANZARITI // -// Copyright 2003-2013 Michael CATANZARITI +// Copyright 2003-2015 Michael CATANZARITI // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/nullappender.h b/include/log4cplus/nullappender.h index 15456fc4b..4da62d515 100644 --- a/include/log4cplus/nullappender.h +++ b/include/log4cplus/nullappender.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/qt4debugappender.h b/include/log4cplus/qt4debugappender.h index 8908a6ed9..d47384de8 100644 --- a/include/log4cplus/qt4debugappender.h +++ b/include/log4cplus/qt4debugappender.h @@ -5,7 +5,7 @@ // Author: Vaclav Zeman // // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/qt5debugappender.h b/include/log4cplus/qt5debugappender.h index fc58dbf64..cbb30ee2c 100644 --- a/include/log4cplus/qt5debugappender.h +++ b/include/log4cplus/qt5debugappender.h @@ -5,7 +5,7 @@ // Author: Vaclav Zeman // // -// Copyright (C) 2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2013-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/socketappender.h b/include/log4cplus/socketappender.h index 9eda8ce4f..237f28928 100644 --- a/include/log4cplus/socketappender.h +++ b/include/log4cplus/socketappender.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/spi/appenderattachable.h b/include/log4cplus/spi/appenderattachable.h index 986bf9b4d..6249c0076 100644 --- a/include/log4cplus/spi/appenderattachable.h +++ b/include/log4cplus/spi/appenderattachable.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/spi/factory.h b/include/log4cplus/spi/factory.h index 3979a2b31..ad155b5fc 100644 --- a/include/log4cplus/spi/factory.h +++ b/include/log4cplus/spi/factory.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2002-2013 Tad E. Smith +// Copyright 2002-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/spi/filter.h b/include/log4cplus/spi/filter.h index 1febd23fb..850397cb0 100644 --- a/include/log4cplus/spi/filter.h +++ b/include/log4cplus/spi/filter.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 1999-2013 Tad E. Smith +// Copyright 1999-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/spi/loggerfactory.h b/include/log4cplus/spi/loggerfactory.h index ad735f1d6..ba4410970 100644 --- a/include/log4cplus/spi/loggerfactory.h +++ b/include/log4cplus/spi/loggerfactory.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/spi/loggerimpl.h b/include/log4cplus/spi/loggerimpl.h index 2ea3eb6b7..f873a9c02 100644 --- a/include/log4cplus/spi/loggerimpl.h +++ b/include/log4cplus/spi/loggerimpl.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/spi/loggingevent.h b/include/log4cplus/spi/loggingevent.h index 7c751f694..161814b16 100644 --- a/include/log4cplus/spi/loggingevent.h +++ b/include/log4cplus/spi/loggingevent.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/spi/objectregistry.h b/include/log4cplus/spi/objectregistry.h index 2ac227af3..2ab17ddcb 100644 --- a/include/log4cplus/spi/objectregistry.h +++ b/include/log4cplus/spi/objectregistry.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/spi/rootlogger.h b/include/log4cplus/spi/rootlogger.h index 6c466c261..d78679687 100644 --- a/include/log4cplus/spi/rootlogger.h +++ b/include/log4cplus/spi/rootlogger.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/streams.h b/include/log4cplus/streams.h index df33c4d0d..cc4532e64 100644 --- a/include/log4cplus/streams.h +++ b/include/log4cplus/streams.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/syslogappender.h b/include/log4cplus/syslogappender.h index 108262e15..eaeba25e3 100644 --- a/include/log4cplus/syslogappender.h +++ b/include/log4cplus/syslogappender.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/tchar.h b/include/log4cplus/tchar.h index 217fc76d8..f9e9f60dc 100644 --- a/include/log4cplus/tchar.h +++ b/include/log4cplus/tchar.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/thread/impl/syncprims-cxx11.h b/include/log4cplus/thread/impl/syncprims-cxx11.h index 1ad1714d1..862c89bb3 100755 --- a/include/log4cplus/thread/impl/syncprims-cxx11.h +++ b/include/log4cplus/thread/impl/syncprims-cxx11.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2013-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/thread/impl/syncprims-impl.h b/include/log4cplus/thread/impl/syncprims-impl.h index 07657e71a..33835931b 100644 --- a/include/log4cplus/thread/impl/syncprims-impl.h +++ b/include/log4cplus/thread/impl/syncprims-impl.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/thread/impl/syncprims-pmsm.h b/include/log4cplus/thread/impl/syncprims-pmsm.h index 34b315db5..8f1220ad3 100644 --- a/include/log4cplus/thread/impl/syncprims-pmsm.h +++ b/include/log4cplus/thread/impl/syncprims-pmsm.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/thread/impl/syncprims-pthreads.h b/include/log4cplus/thread/impl/syncprims-pthreads.h index 71b56cffe..3a8f7dff0 100644 --- a/include/log4cplus/thread/impl/syncprims-pthreads.h +++ b/include/log4cplus/thread/impl/syncprims-pthreads.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/thread/impl/syncprims-win32.h b/include/log4cplus/thread/impl/syncprims-win32.h index 35cc42303..d3e5fa257 100644 --- a/include/log4cplus/thread/impl/syncprims-win32.h +++ b/include/log4cplus/thread/impl/syncprims-win32.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/thread/impl/threads-impl.h b/include/log4cplus/thread/impl/threads-impl.h index 88b40b24a..92cc37023 100644 --- a/include/log4cplus/thread/impl/threads-impl.h +++ b/include/log4cplus/thread/impl/threads-impl.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/thread/impl/tls.h b/include/log4cplus/thread/impl/tls.h index 5a390aeb7..1179886b0 100644 --- a/include/log4cplus/thread/impl/tls.h +++ b/include/log4cplus/thread/impl/tls.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/thread/syncprims-pub-impl.h b/include/log4cplus/thread/syncprims-pub-impl.h index 15e045cd9..a6a819117 100644 --- a/include/log4cplus/thread/syncprims-pub-impl.h +++ b/include/log4cplus/thread/syncprims-pub-impl.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/thread/syncprims.h b/include/log4cplus/thread/syncprims.h index d3ccb24e3..1f69cb542 100644 --- a/include/log4cplus/thread/syncprims.h +++ b/include/log4cplus/thread/syncprims.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/thread/threads.h b/include/log4cplus/thread/threads.h index 82149c4b0..ec932674a 100644 --- a/include/log4cplus/thread/threads.h +++ b/include/log4cplus/thread/threads.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/tracelogger.h b/include/log4cplus/tracelogger.h index d2ba93d7e..68b990b70 100644 --- a/include/log4cplus/tracelogger.h +++ b/include/log4cplus/tracelogger.h @@ -5,7 +5,7 @@ // Author: Vaclav Haisman // // -// Copyright 2009-2013 Tad E. Smith +// Copyright 2009-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/tstring.h b/include/log4cplus/tstring.h index 587aaa15e..1d4f04505 100644 --- a/include/log4cplus/tstring.h +++ b/include/log4cplus/tstring.h @@ -5,7 +5,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/log4cplus/version.h b/include/log4cplus/version.h index 419a87957..b562a75d2 100644 --- a/include/log4cplus/version.h +++ b/include/log4cplus/version.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/win32consoleappender.h b/include/log4cplus/win32consoleappender.h index c98eb5553..9f9b72bc0 100644 --- a/include/log4cplus/win32consoleappender.h +++ b/include/log4cplus/win32consoleappender.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/include/log4cplus/win32debugappender.h b/include/log4cplus/win32debugappender.h index 50059d475..3424c0ed9 100644 --- a/include/log4cplus/win32debugappender.h +++ b/include/log4cplus/win32debugappender.h @@ -5,7 +5,7 @@ // Author: Eduardo Francos, Odalio SARL // // -// Copyright 2003-2013 Odalio SARL +// Copyright 2003-2015 Odalio SARL // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/qt4debugappender/qt4debugappender.cxx b/qt4debugappender/qt4debugappender.cxx index e9f6304af..71a646a2a 100644 --- a/qt4debugappender/qt4debugappender.cxx +++ b/qt4debugappender/qt4debugappender.cxx @@ -4,7 +4,7 @@ // Author: Vaclav Zeman // // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/qt5debugappender/qt5debugappender.cxx b/qt5debugappender/qt5debugappender.cxx index dc7d7b1ab..4f58935b9 100644 --- a/qt5debugappender/qt5debugappender.cxx +++ b/qt5debugappender/qt5debugappender.cxx @@ -4,7 +4,7 @@ // Author: Vaclav Zeman // // -// Copyright (C) 2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2013-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/simpleserver/loggingserver.cxx b/simpleserver/loggingserver.cxx index 31c0d8aae..8a94dbbd3 100644 --- a/simpleserver/loggingserver.cxx +++ b/simpleserver/loggingserver.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/appender.cxx b/src/appender.cxx index 56f6f9f02..c47df0962 100644 --- a/src/appender.cxx +++ b/src/appender.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/appenderattachableimpl.cxx b/src/appenderattachableimpl.cxx index 16b92eab1..c4a1fbc90 100644 --- a/src/appenderattachableimpl.cxx +++ b/src/appenderattachableimpl.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/asyncappender.cxx b/src/asyncappender.cxx index eddf0f0ec..4d06af829 100644 --- a/src/asyncappender.cxx +++ b/src/asyncappender.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/clfsappender.cxx b/src/clfsappender.cxx index a17c353c7..6e21cb02b 100644 --- a/src/clfsappender.cxx +++ b/src/clfsappender.cxx @@ -4,7 +4,7 @@ // Author: Vaclav Zeman // // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/clogger.cxx b/src/clogger.cxx index 6d22a17a9..aaf8aa715 100644 --- a/src/clogger.cxx +++ b/src/clogger.cxx @@ -4,7 +4,7 @@ // Author: Jens Rehsack // // -// Copyright 2011-2013 Jens Rehsack & Tad E. Smith +// Copyright 2011-2015 Jens Rehsack & Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/configurator.cxx b/src/configurator.cxx index dcaf74ad6..0e79f177b 100644 --- a/src/configurator.cxx +++ b/src/configurator.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/connectorthread.cxx b/src/connectorthread.cxx index a63e10bb1..c237a6b12 100644 --- a/src/connectorthread.cxx +++ b/src/connectorthread.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2013-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/consoleappender.cxx b/src/consoleappender.cxx index ff8b01c3e..5ea535d56 100644 --- a/src/consoleappender.cxx +++ b/src/consoleappender.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/cygwin-win32.cxx b/src/cygwin-win32.cxx index fdc57a82b..a1c8ff482 100644 --- a/src/cygwin-win32.cxx +++ b/src/cygwin-win32.cxx @@ -3,7 +3,7 @@ // Created: 7/2011 // Author: Vaclav Zeman // -// Copyright (C) 2011-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2011-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/env.cxx b/src/env.cxx index ff2eb87ec..e1368b85f 100644 --- a/src/env.cxx +++ b/src/env.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/factory.cxx b/src/factory.cxx index eee5f4fe0..6f29a1eae 100644 --- a/src/factory.cxx +++ b/src/factory.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2002-2013 Tad E. Smith +// Copyright 2002-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/fileappender.cxx b/src/fileappender.cxx index 4987f010c..ba4362674 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/fileinfo.cxx b/src/fileinfo.cxx index 36f57e23f..92fcf791e 100644 --- a/src/fileinfo.cxx +++ b/src/fileinfo.cxx @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/filter.cxx b/src/filter.cxx index 55de56c3a..abf640a53 100644 --- a/src/filter.cxx +++ b/src/filter.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/global-init.cxx b/src/global-init.cxx index 7d1985f36..afbf9b499 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/hierarchy.cxx b/src/hierarchy.cxx index d7b116cdc..ece892c88 100644 --- a/src/hierarchy.cxx +++ b/src/hierarchy.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/hierarchylocker.cxx b/src/hierarchylocker.cxx index b7e77a79a..3badc2d12 100644 --- a/src/hierarchylocker.cxx +++ b/src/hierarchylocker.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/layout.cxx b/src/layout.cxx index 902663193..b2a944e59 100644 --- a/src/layout.cxx +++ b/src/layout.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/lockfile.cxx b/src/lockfile.cxx index bd5431798..2be99965c 100644 --- a/src/lockfile.cxx +++ b/src/lockfile.cxx @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/log4judpappender.cxx b/src/log4judpappender.cxx index 30b09cd17..2f5bd98c5 100644 --- a/src/log4judpappender.cxx +++ b/src/log4judpappender.cxx @@ -4,7 +4,7 @@ // Author: Siva Chandran P // // -// Copyright 2012-2013 Siva Chandran P +// Copyright 2012-2015 Siva Chandran P // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/logger.cxx b/src/logger.cxx index 68f129e76..ef4635085 100644 --- a/src/logger.cxx +++ b/src/logger.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/loggerimpl.cxx b/src/loggerimpl.cxx index 7dacda03d..1fab341ed 100644 --- a/src/loggerimpl.cxx +++ b/src/loggerimpl.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/loggingevent.cxx b/src/loggingevent.cxx index 9f113c47a..4ca916554 100644 --- a/src/loggingevent.cxx +++ b/src/loggingevent.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/loggingmacros.cxx b/src/loggingmacros.cxx index 527133016..7f90a23ff 100644 --- a/src/loggingmacros.cxx +++ b/src/loggingmacros.cxx @@ -4,7 +4,7 @@ // Author: Vaclav Haisman // // -// Copyright 2010-2013 Vaclav Haisman +// Copyright 2010-2015 Vaclav Haisman // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/loglevel.cxx b/src/loglevel.cxx index b849d7f14..8fae1c56d 100644 --- a/src/loglevel.cxx +++ b/src/loglevel.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/loglog.cxx b/src/loglog.cxx index ed2ddeecb..4b4a5c850 100644 --- a/src/loglog.cxx +++ b/src/loglog.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/logloguser.cxx b/src/logloguser.cxx index e97052fef..0ec6c10b4 100644 --- a/src/logloguser.cxx +++ b/src/logloguser.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/mdc.cxx b/src/mdc.cxx index faec501ff..e703e9ba1 100644 --- a/src/mdc.cxx +++ b/src/mdc.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/msttsappender.cxx b/src/msttsappender.cxx index 10fd16d00..99c204664 100644 --- a/src/msttsappender.cxx +++ b/src/msttsappender.cxx @@ -4,7 +4,7 @@ // Author: Vaclav Zeman // // -// Copyright (C) 2012-2013, Vaclav Zeman. All rights reserved. +// Copyright (C) 2012-2015, Vaclav Zeman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/ndc.cxx b/src/ndc.cxx index a8fdfe88d..5f34cafaa 100644 --- a/src/ndc.cxx +++ b/src/ndc.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/nteventlogappender.cxx b/src/nteventlogappender.cxx index eb71270e8..467b9bd37 100644 --- a/src/nteventlogappender.cxx +++ b/src/nteventlogappender.cxx @@ -3,7 +3,7 @@ // Created: 4/2003 // Author: Michael CATANZARITI // -// Copyright 2003-2013 Michael CATANZARITI +// Copyright 2003-2015 Michael CATANZARITI // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/nullappender.cxx b/src/nullappender.cxx index 5a6fd05ca..4e9ac3890 100644 --- a/src/nullappender.cxx +++ b/src/nullappender.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/objectregistry.cxx b/src/objectregistry.cxx index b952273f6..3d7d1d80b 100644 --- a/src/objectregistry.cxx +++ b/src/objectregistry.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/patternlayout.cxx b/src/patternlayout.cxx index f15551ba2..cd0ece7c3 100644 --- a/src/patternlayout.cxx +++ b/src/patternlayout.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/pointer.cxx b/src/pointer.cxx index 6827e5f6e..6c2f520ed 100644 --- a/src/pointer.cxx +++ b/src/pointer.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/property.cxx b/src/property.cxx index 7ba57b637..e3d0e2d99 100644 --- a/src/property.cxx +++ b/src/property.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2002-2013 Tad E. Smith +// Copyright 2002-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/queue.cxx b/src/queue.cxx index a45d365e2..08e8896a7 100644 --- a/src/queue.cxx +++ b/src/queue.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/rootlogger.cxx b/src/rootlogger.cxx index 799f70c5b..77a521b94 100644 --- a/src/rootlogger.cxx +++ b/src/rootlogger.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/sleep.cxx b/src/sleep.cxx index 094be8896..65910c5a3 100644 --- a/src/sleep.cxx +++ b/src/sleep.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/snprintf.cxx b/src/snprintf.cxx index 3c9e13426..8b9866b5b 100644 --- a/src/snprintf.cxx +++ b/src/snprintf.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/socket-unix.cxx b/src/socket-unix.cxx index 22bd49d7b..8580e2749 100644 --- a/src/socket-unix.cxx +++ b/src/socket-unix.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/socket-win32.cxx b/src/socket-win32.cxx index 53c8f524c..aad3e25d1 100644 --- a/src/socket-win32.cxx +++ b/src/socket-win32.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/socket.cxx b/src/socket.cxx index ff7d731d3..bfaea4054 100644 --- a/src/socket.cxx +++ b/src/socket.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/socketappender.cxx b/src/socketappender.cxx index 16da4e183..a36aba09b 100644 --- a/src/socketappender.cxx +++ b/src/socketappender.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/socketbuffer.cxx b/src/socketbuffer.cxx index 297c78d18..eba95ad53 100644 --- a/src/socketbuffer.cxx +++ b/src/socketbuffer.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/stringhelper-clocale.cxx b/src/stringhelper-clocale.cxx index f04d195f4..63e4b4efc 100644 --- a/src/stringhelper-clocale.cxx +++ b/src/stringhelper-clocale.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/stringhelper-cxxlocale.cxx b/src/stringhelper-cxxlocale.cxx index c57bff5fc..ae38891c4 100644 --- a/src/stringhelper-cxxlocale.cxx +++ b/src/stringhelper-cxxlocale.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/stringhelper-iconv.cxx b/src/stringhelper-iconv.cxx index 2e4d6c67e..25f3766a8 100644 --- a/src/stringhelper-iconv.cxx +++ b/src/stringhelper-iconv.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/stringhelper.cxx b/src/stringhelper.cxx index 24863912c..5252f38c4 100644 --- a/src/stringhelper.cxx +++ b/src/stringhelper.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/syncprims.cxx b/src/syncprims.cxx index bd6da2322..fdda272de 100644 --- a/src/syncprims.cxx +++ b/src/syncprims.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/syslogappender.cxx b/src/syslogappender.cxx index d273ae257..c3848bb52 100644 --- a/src/syslogappender.cxx +++ b/src/syslogappender.cxx @@ -3,7 +3,7 @@ // Created: 6/2001 // Author: Tad E. Smith // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/threads.cxx b/src/threads.cxx index 075ed8d0b..60e7ea92a 100644 --- a/src/threads.cxx +++ b/src/threads.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2001-2013 Tad E. Smith +// Copyright 2001-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/timehelper.cxx b/src/timehelper.cxx index 4c9b16a68..5fc325d5f 100644 --- a/src/timehelper.cxx +++ b/src/timehelper.cxx @@ -4,7 +4,7 @@ // Author: Tad E. Smith // // -// Copyright 2003-2013 Tad E. Smith +// Copyright 2003-2015 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/tls.cxx b/src/tls.cxx index 66d787772..0b07950ed 100644 --- a/src/tls.cxx +++ b/src/tls.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/version.cxx b/src/version.cxx index cd00b9e2e..6a7577048 100644 --- a/src/version.cxx +++ b/src/version.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/win32consoleappender.cxx b/src/win32consoleappender.cxx index 0fb1a3acd..c9f4d5b52 100644 --- a/src/win32consoleappender.cxx +++ b/src/win32consoleappender.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2013, Vaclav Haisman. All rights reserved. +// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. // // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: diff --git a/src/win32debugappender.cxx b/src/win32debugappender.cxx index 0ef36194b..c552dc774 100644 --- a/src/win32debugappender.cxx +++ b/src/win32debugappender.cxx @@ -4,7 +4,7 @@ // Author: Eduardo Francos, Odalio SARL // // -// Copyright 2003-2013 Odalio SARL +// Copyright 2003-2015 Odalio SARL // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From a09a73efb7d9e5b58294422dcd73e37fba9b3f6b Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 3 Jan 2015 20:07:34 +0100 Subject: [PATCH 046/165] Import improved .gitignore from master. --- .gitignore | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6ef03647b..7cc0be609 100644 --- a/.gitignore +++ b/.gitignore @@ -2,14 +2,35 @@ *.ncb *.suo *.sdf +*.opensdf .#* *~ +*.bak ipch/ autom4te.cache/ objdir*/ Win32/ x64/ +.idea + +# LaTeX/PDF produciton byproducts +*.aux +*.log +*.tex +*.toc +*.xwm +*.pdf +*.ref_rename_step + +# Compiler produced temporaries +*.s +*.ii + +# Patches +*.patch +*.diff + # # From Github's C++.gitignore: # @@ -35,4 +56,3 @@ x64/ *.exe *.out *.app -/msvc10/log4cplus.opensdf From 5e759821682ca4e04644953d4f484df82fb519a1 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 4 Jan 2015 02:30:03 +0100 Subject: [PATCH 047/165] ChangeLog: Prepare for 1.2.0-RC3. --- ChangeLog | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a1eadba4..8d8324583 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +log4cplus 1.2.0-RC3 +------------------- + + - Fixed various issues related to unspecified behaviors which manifested + when log4cplus was compiled using Clang. + + - SysLogAppender now recognize `SyslogHost` property as synonym for `host` + property. + + - Improved compatibility of TTCCLayout with log4j's. Added + `ThreadPrinting`, `CategoryPrefixing` and `ContextPrinting` configuration + properties. + + - Allow negative maximal length in pattern specifier to make trimming of + end instead of beginning possible. E.g., allow `%.-1p` to get initial + letters of log level. + + - New appender TimeBasedRollingFileAppender. (Alexander Malinin) + + - `LOG4CPLUS_*_FMT()` macros can now be invoked with just formatting + string, without additional arguments. (Zhang Shengfa) + + - Insert to/from string/log level conversion functions to the beginning of + vector to favour user defined log levels and conversion functions. + log4cplus 1.2.0-RC2 ------------------- @@ -13,7 +38,7 @@ builds. log4cplus 1.2.0-RC1 ------------------- - + - TraceLogger and associated `LOG4CPLUS_TRACE_*()` macros now record function name in generated event. From e9431cabfb9ff73b17406a181e1f5467a567aade Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sun, 4 Jan 2015 15:38:23 +0100 Subject: [PATCH 048/165] Bump SO version. --- configure | 2 +- configure.ac | 2 +- cygport/log4cplus.cygport | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 8950b0d1c..07b430595 100755 --- a/configure +++ b/configure @@ -4470,7 +4470,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=4:1:1 +LT_VERSION=5:1:0 LT_RELEASE=1.2 diff --git a/configure.ac b/configure.ac index 93cc55be0..70efd0127 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AM_PROG_AR # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=4:1:1 +LT_VERSION=5:1:0 LT_RELEASE=1.2 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) diff --git a/cygport/log4cplus.cygport b/cygport/log4cplus.cygport index 8da5d82bb..d6be0a9a1 100644 --- a/cygport/log4cplus.cygport +++ b/cygport/log4cplus.cygport @@ -12,12 +12,12 @@ SRC_URI="mirror://sourceforge/log4cplus/log4cplus-stable/${PV%-rc*}/${P}.tar.xz" PATCH_URI="configure.ac-relax-libtool-version.patch configure.ac-disable-__thread-keyword.patch" -PKG_NAMES="lib${PN}1.2_2 lib${PN}qt4debugappender1.2_2 +PKG_NAMES="lib${PN}1.2_5 lib${PN}qt4debugappender1.2_5 lib${PN}-devel lib${PN}qt4debugappender-devel" -liblog4cplus1_2_2_SUMMARY="${SUMMARY} (runtime)" -liblog4cplus1_2_2_CONTENTS="usr/bin/cyglog4cplus-1-2-2.dll" -liblog4cplusqt4debugappender1_2_2_SUMMARY="${SUMMARY} (Qt4 runtime)" -liblog4cplusqt4debugappender1_2_2_CONTENTS="usr/bin/cyglog4cplusqt4*-1-2-2.dll" +liblog4cplus1_2_5_SUMMARY="${SUMMARY} (runtime)" +liblog4cplus1_2_5_CONTENTS="usr/bin/cyglog4cplus-1-2-5.dll" +liblog4cplusqt4debugappender1_2_5_SUMMARY="${SUMMARY} (Qt4 runtime)" +liblog4cplusqt4debugappender1_2_5_CONTENTS="usr/bin/cyglog4cplusqt4*-1-2-5.dll" liblog4cplus_devel_SUMMARY="${SUMMARY} (development)" liblog4cplus_devel_CONTENTS="--exclude=*qt4* usr/include/ usr/lib/ usr/share/doc/" liblog4cplusqt4debugappender_devel_SUMMARY="${SUMMARY} (Qt4 development)" From fbb3f71bce1f9c1eabbe1c0cb1bb2250dbebe528 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 14 Jan 2015 07:24:54 +0100 Subject: [PATCH 049/165] Update Android CMake support to revision 98d85aeb99921aca6ec8a5313c00e7b6a4a989dd of https://github.com/taka-no-me/android-cmake. --- android/android.toolchain.cmake | 698 ++++++++++++++------------------ 1 file changed, 304 insertions(+), 394 deletions(-) diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake index dfbd1218c..07100ee33 100644 --- a/android/android.toolchain.cmake +++ b/android/android.toolchain.cmake @@ -29,28 +29,19 @@ # POSSIBILITY OF SUCH DAMAGE. # ------------------------------------------------------------------------------ -# Android CMake toolchain file, for use with the Android NDK r5-r9 -# Requires cmake 2.6.3 or newer (2.8.5 or newer is recommended). +# Android CMake toolchain file, for use with the Android NDK r5-r10d +# Requires cmake 2.6.3 or newer (2.8.9 or newer is recommended). # See home page: https://github.com/taka-no-me/android-cmake # -# The file is mantained by the OpenCV project. The latest version can be get at -# http://code.opencv.org/projects/opencv/repository/revisions/master/changes/android/android.toolchain.cmake -# # Usage Linux: # $ export ANDROID_NDK=/absolute/path/to/the/android-ndk # $ mkdir build && cd build # $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake .. # $ make -j8 # -# Usage Linux (using standalone toolchain): -# $ export ANDROID_STANDALONE_TOOLCHAIN=/absolute/path/to/android-toolchain -# $ mkdir build && cd build -# $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake .. -# $ make -j8 -# # Usage Windows: # You need native port of make to build your project. -# Android NDK r7 (or newer) already has make.exe on board. +# Android NDK r7 (and newer) already has make.exe on board. # For older NDK you have to install it separately. # For example, this one: http://gnuwin32.sourceforge.net/packages/make.htm # @@ -66,50 +57,63 @@ # ANDROID_NDK=/opt/android-ndk - path to the NDK root. # Can be set as environment variable. Can be set only at first cmake run. # -# ANDROID_STANDALONE_TOOLCHAIN=/opt/android-toolchain - path to the -# standalone toolchain. This option is not used if full NDK is found -# (ignored if ANDROID_NDK is set). -# Can be set as environment variable. Can be set only at first cmake run. -# # ANDROID_ABI=armeabi-v7a - specifies the target Application Binary # Interface (ABI). This option nearly matches to the APP_ABI variable # used by ndk-build tool from Android NDK. # # Possible targets are: -# "armeabi" - matches to the NDK ABI with the same name. -# See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation. -# "armeabi-v7a" - matches to the NDK ABI with the same name. -# See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation. +# "armeabi" - ARMv5TE based CPU with software floating point operations +# "armeabi-v7a" - ARMv7 based devices with hardware FPU instructions +# this ABI target is used by default # "armeabi-v7a with NEON" - same as armeabi-v7a, but # sets NEON as floating-point unit # "armeabi-v7a with VFPV3" - same as armeabi-v7a, but -# sets VFPV3 as floating-point unit (has 32 registers instead of 16). -# "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP. -# "x86" - matches to the NDK ABI with the same name. -# See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation. -# "mips" - matches to the NDK ABI with the same name. -# See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation. +# sets VFPV3 as floating-point unit (has 32 registers instead of 16) +# "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP +# "x86" - IA-32 instruction set +# "mips" - MIPS32 instruction set +# +# 64-bit ABIs for NDK r10 and newer: +# "arm64-v8a" - ARMv8 AArch64 instruction set +# "x86_64" - Intel64 instruction set (r1) +# "mips64" - MIPS64 instruction set (r6) # # ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for. # Option is read-only when standalone toolchain is used. +# Note: building for "android-L" requires explicit configuration. # -# ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.6 - the name of compiler +# ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 - the name of compiler # toolchain to be used. The list of possible values depends on the NDK -# version. For NDK r8c the possible values are: +# version. For NDK r10c the possible values are: # -# * arm-linux-androideabi-4.4.3 +# * aarch64-linux-android-4.9 +# * aarch64-linux-android-clang3.4 +# * aarch64-linux-android-clang3.5 # * arm-linux-androideabi-4.6 -# * arm-linux-androideabi-clang3.1 -# * mipsel-linux-android-4.4.3 +# * arm-linux-androideabi-4.8 +# * arm-linux-androideabi-4.9 (default) +# * arm-linux-androideabi-clang3.4 +# * arm-linux-androideabi-clang3.5 +# * mips64el-linux-android-4.9 +# * mips64el-linux-android-clang3.4 +# * mips64el-linux-android-clang3.5 # * mipsel-linux-android-4.6 -# * mipsel-linux-android-clang3.1 -# * x86-4.4.3 +# * mipsel-linux-android-4.8 +# * mipsel-linux-android-4.9 +# * mipsel-linux-android-clang3.4 +# * mipsel-linux-android-clang3.5 # * x86-4.6 -# * x86-clang3.1 +# * x86-4.8 +# * x86-4.9 +# * x86-clang3.4 +# * x86-clang3.5 +# * x86_64-4.9 +# * x86_64-clang3.4 +# * x86_64-clang3.5 # # ANDROID_FORCE_ARM_BUILD=OFF - set ON to generate 32-bit ARM instructions -# instead of Thumb. Is not available for "x86" (inapplicable) and -# "armeabi-v6 with VFP" (is forced to be ON) ABIs. +# instead of Thumb. Is not available for "armeabi-v6 with VFP" +# (is forced to be ON) ABI. # # ANDROID_NO_UNDEFINED=ON - set ON to show all undefined symbols as linker # errors even if they are not used. @@ -118,13 +122,6 @@ # libraries. Automatically turned for NDK r5x and r6x due to GLESv2 # problems. # -# LIBRARY_OUTPUT_PATH_ROOT=${CMAKE_SOURCE_DIR} - where to output binary -# files. See additional details below. -# -# ANDROID_SET_OBSOLETE_VARIABLES=ON - if set, then toolchain defines some -# obsolete variables which were used by previous versions of this file for -# backward compatibility. -# # ANDROID_STL=gnustl_static - specify the runtime to use. # # Possible values are: @@ -181,128 +178,10 @@ # ANDROID and BUILD_ANDROID will be set to true, you may test any of these # variables to make necessary Android-specific configuration changes. # -# Also ARMEABI or ARMEABI_V7A or X86 or MIPS will be set true, mutually -# exclusive. NEON option will be set true if VFP is set to NEON. -# -# LIBRARY_OUTPUT_PATH_ROOT should be set in cache to determine where Android -# libraries will be installed. -# Default is ${CMAKE_SOURCE_DIR}, and the android libs will always be -# under the ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME} -# (depending on the target ABI). This is convenient for Android packaging. +# Also ARMEABI or ARMEABI_V7A or X86 or MIPS or ARM64_V8A or X86_64 or MIPS64 +# will be set true, mutually exclusive. NEON option will be set true +# if VFP is set to NEON. # -# Change Log: -# - initial version December 2010 -# - April 2011 -# [+] added possibility to build with NDK (without standalone toolchain) -# [+] support cross-compilation on Windows (native, no cygwin support) -# [+] added compiler option to force "char" type to be signed -# [+] added toolchain option to compile to 32-bit ARM instructions -# [+] added toolchain option to disable SWIG search -# [+] added platform "armeabi-v7a with VFPV3" -# [~] ARM_TARGETS renamed to ARM_TARGET -# [+] EXECUTABLE_OUTPUT_PATH is set by toolchain (required on Windows) -# [~] Fixed bug with ANDROID_API_LEVEL variable -# [~] turn off SWIG search if it is not found first time -# - May 2011 -# [~] ANDROID_LEVEL is renamed to ANDROID_API_LEVEL -# [+] ANDROID_API_LEVEL is detected by toolchain if not specified -# [~] added guard to prevent changing of output directories on the first -# cmake pass -# [~] toolchain exits with error if ARM_TARGET is not recognized -# - June 2011 -# [~] default NDK path is updated for version r5c -# [+] variable CMAKE_SYSTEM_PROCESSOR is set based on ARM_TARGET -# [~] toolchain install directory is added to linker paths -# [-] removed SWIG-related stuff from toolchain -# [+] added macro find_host_package, find_host_program to search -# packages/programs on the host system -# [~] fixed path to STL library -# - July 2011 -# [~] fixed options caching -# [~] search for all supported NDK versions -# [~] allowed spaces in NDK path -# - September 2011 -# [~] updated for NDK r6b -# - November 2011 -# [*] rewritten for NDK r7 -# [+] x86 toolchain support (experimental) -# [+] added "armeabi-v6 with VFP" ABI for ARMv6 processors. -# [~] improved compiler and linker flags management -# [+] support different build flags for Release and Debug configurations -# [~] by default compiler flags the same as used by ndk-build (but only -# where reasonable) -# [~] ANDROID_NDK_TOOLCHAIN_ROOT is splitted to ANDROID_STANDALONE_TOOLCHAIN -# and ANDROID_TOOLCHAIN_ROOT -# [~] ARM_TARGET is renamed to ANDROID_ABI -# [~] ARMEABI_NDK_NAME is renamed to ANDROID_NDK_ABI_NAME -# [~] ANDROID_API_LEVEL is renamed to ANDROID_NATIVE_API_LEVEL -# - January 2012 -# [+] added stlport_static support (experimental) -# [+] added special check for cygwin -# [+] filtered out hidden files (starting with .) while globbing inside NDK -# [+] automatically applied GLESv2 linkage fix for NDK revisions 5-6 -# [+] added ANDROID_GET_ABI_RAWNAME to get NDK ABI names by CMake flags -# - February 2012 -# [+] updated for NDK r7b -# [~] fixed cmake try_compile() command -# [~] Fix for missing install_name_tool on OS X -# - March 2012 -# [~] fixed incorrect C compiler flags -# [~] fixed CMAKE_SYSTEM_PROCESSOR change on ANDROID_ABI change -# [+] improved toolchain loading speed -# [+] added assembler language support (.S) -# [+] allowed preset search paths and extra search suffixes -# - April 2012 -# [+] updated for NDK r7c -# [~] fixed most of problems with compiler/linker flags and caching -# [+] added option ANDROID_FUNCTION_LEVEL_LINKING -# - May 2012 -# [+] updated for NDK r8 -# [+] added mips architecture support -# - August 2012 -# [+] updated for NDK r8b -# [~] all intermediate files generated by toolchain are moved to CMakeFiles -# [~] libstdc++ and libsupc are removed from explicit link libraries -# [+] added CCache support (via NDK_CCACHE environment or cmake variable) -# [+] added gold linker support for NDK r8b -# [~] fixed mips linker flags for NDK r8b -# - September 2012 -# [+] added NDK release name detection (see ANDROID_NDK_RELEASE) -# [+] added support for all C++ runtimes from NDK -# (system, gabi++, stlport, gnustl) -# [+] improved warnings on known issues of NDKs -# [~] use gold linker as default if available (NDK r8b) -# [~] globally turned off rpath -# [~] compiler options are aligned with NDK r8b -# - October 2012 -# [~] fixed C++ linking: explicitly link with math library (OpenCV #2426) -# - November 2012 -# [+] updated for NDK r8c -# [+] added support for clang compiler -# - December 2012 -# [+] suppress warning about unused CMAKE_TOOLCHAIN_FILE variable -# [+] adjust API level to closest compatible as NDK does -# [~] fixed ccache full path search -# [+] updated for NDK r8d -# [~] compiler options are aligned with NDK r8d -# - March 2013 -# [+] updated for NDK r8e (x86 version) -# [+] support x86_64 version of NDK -# - April 2013 -# [+] support non-release NDK layouts (from Linaro git and Android git) -# [~] automatically detect if explicit link to crtbegin_*.o is needed -# - June 2013 -# [~] fixed stl include path for standalone toolchain made by NDK >= r8c -# - July 2013 -# [+] updated for NDK r9 -# - November 2013 -# [+] updated for NDK r9b -# - December 2013 -# [+] updated for NDK r9c -# - January 2014 -# [~] fix copying of shared STL -# - April 2014 -# [+] updated for NDK r9d # ------------------------------------------------------------------------------ cmake_minimum_required( VERSION 2.6.3 ) @@ -313,146 +192,146 @@ if( DEFINED CMAKE_CROSSCOMPILING ) endif() if( CMAKE_TOOLCHAIN_FILE ) - # touch toolchain variable only to suppress "unused variable" warning + # touch toolchain variable to suppress "unused variable" warning endif() +# inherit settings in recursive loads get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if( _CMAKE_IN_TRY_COMPILE ) include( "${CMAKE_CURRENT_SOURCE_DIR}/../android.toolchain.config.cmake" OPTIONAL ) endif() # this one is important -set( CMAKE_SYSTEM_NAME Linux ) +if( CMAKE_VERSION VERSION_GREATER "3.0.99" ) + set( CMAKE_SYSTEM_NAME Android ) +else() + set( CMAKE_SYSTEM_NAME Linux ) +endif() + # this one not so much set( CMAKE_SYSTEM_VERSION 1 ) -# rpath makes low sence for Android +# rpath makes low sense for Android +set( CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "" ) set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." ) -set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) -if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS) +# NDK search paths +set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r10d -r10c -r10b -r10 -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) +if( NOT DEFINED ANDROID_NDK_SEARCH_PATHS ) if( CMAKE_HOST_WIN32 ) file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS ) - set( ANDROID_NDK_SEARCH_PATHS "${ANDROID_NDK_SEARCH_PATHS}/android-ndk" "$ENV{SystemDrive}/NVPACK/android-ndk" ) + set( ANDROID_NDK_SEARCH_PATHS "${ANDROID_NDK_SEARCH_PATHS}" "$ENV{SystemDrive}/NVPACK" ) else() file( TO_CMAKE_PATH "$ENV{HOME}" ANDROID_NDK_SEARCH_PATHS ) - set( ANDROID_NDK_SEARCH_PATHS /opt/android-ndk "${ANDROID_NDK_SEARCH_PATHS}/NVPACK/android-ndk" ) + set( ANDROID_NDK_SEARCH_PATHS /opt "${ANDROID_NDK_SEARCH_PATHS}/NVPACK" ) endif() endif() -if(NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH) +if( NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH ) set( ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH /opt/android-toolchain ) endif() +# known ABIs set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" ) +set( ANDROID_SUPPORTED_ABIS_arm64 "arm64-v8a" ) set( ANDROID_SUPPORTED_ABIS_x86 "x86" ) -set( ANDROID_SUPPORTED_ABIS_mipsel "mips" ) +set( ANDROID_SUPPORTED_ABIS_x86_64 "x86_64" ) +set( ANDROID_SUPPORTED_ABIS_mips "mips" ) +set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" ) +# API level defaults set( ANDROID_DEFAULT_NDK_API_LEVEL 8 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_mips 9 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL_mips64 21 ) macro( __LIST_FILTER listvar regex ) - if( ${listvar} ) - foreach( __val ${${listvar}} ) - if( __val MATCHES "${regex}" ) - list( REMOVE_ITEM ${listvar} "${__val}" ) - endif() - endforeach() - endif() + if( ${listvar} ) + foreach( __val ${${listvar}} ) + if( __val MATCHES "${regex}" ) + list( REMOVE_ITEM ${listvar} "${__val}" ) + endif() + endforeach() + endif() endmacro() macro( __INIT_VARIABLE var_name ) - set( __test_path 0 ) - foreach( __var ${ARGN} ) - if( __var STREQUAL "PATH" ) - set( __test_path 1 ) - break() - endif() - endforeach() - if( __test_path AND NOT EXISTS "${${var_name}}" ) - unset( ${var_name} CACHE ) - endif() - if( "${${var_name}}" STREQUAL "" ) - set( __values 0 ) + set( __test_path 0 ) foreach( __var ${ARGN} ) - if( __var STREQUAL "VALUES" ) - set( __values 1 ) - elseif( NOT __var STREQUAL "PATH" ) - set( __obsolete 0 ) - if( __var MATCHES "^OBSOLETE_.*$" ) - string( REPLACE "OBSOLETE_" "" __var "${__var}" ) - set( __obsolete 1 ) - endif() - if( __var MATCHES "^ENV_.*$" ) - string( REPLACE "ENV_" "" __var "${__var}" ) - set( __value "$ENV{${__var}}" ) - elseif( DEFINED ${__var} ) - set( __value "${${__var}}" ) - else() - if( __values ) - set( __value "${__var}" ) - else() - set( __value "" ) - endif() - endif() - if( NOT "${__value}" STREQUAL "" ) - if( __test_path ) - if( EXISTS "${__value}" ) - file( TO_CMAKE_PATH "${__value}" ${var_name} ) - if( __obsolete AND NOT _CMAKE_IN_TRY_COMPILE ) - message( WARNING "Using value of obsolete variable ${__var} as initial value for ${var_name}. Please note, that ${__var} can be completely removed in future versions of the toolchain." ) - endif() - break() - endif() - else() - set( ${var_name} "${__value}" ) - if( __obsolete AND NOT _CMAKE_IN_TRY_COMPILE ) - message( WARNING "Using value of obsolete variable ${__var} as initial value for ${var_name}. Please note, that ${__var} can be completely removed in future versions of the toolchain." ) - endif() + if( __var STREQUAL "PATH" ) + set( __test_path 1 ) break() - endif() endif() - endif() endforeach() - unset( __value ) - unset( __values ) - unset( __obsolete ) - elseif( __test_path ) - file( TO_CMAKE_PATH "${${var_name}}" ${var_name} ) - endif() - unset( __test_path ) + + if( __test_path AND NOT EXISTS "${${var_name}}" ) + unset( ${var_name} CACHE ) + endif() + + if( " ${${var_name}}" STREQUAL " " ) + set( __values 0 ) + foreach( __var ${ARGN} ) + if( __var STREQUAL "VALUES" ) + set( __values 1 ) + elseif( NOT __var STREQUAL "PATH" ) + if( __var MATCHES "^ENV_.*$" ) + string( REPLACE "ENV_" "" __var "${__var}" ) + set( __value "$ENV{${__var}}" ) + elseif( DEFINED ${__var} ) + set( __value "${${__var}}" ) + elseif( __values ) + set( __value "${__var}" ) + else() + set( __value "" ) + endif() + + if( NOT " ${__value}" STREQUAL " " AND (NOT __test_path OR EXISTS "${__value}") ) + set( ${var_name} "${__value}" ) + break() + endif() + endif() + endforeach() + unset( __value ) + unset( __values ) + endif() + + if( __test_path ) + file( TO_CMAKE_PATH "${${var_name}}" ${var_name} ) + endif() + unset( __test_path ) endmacro() macro( __DETECT_NATIVE_API_LEVEL _var _path ) - SET( __ndkApiLevelRegex "^[\t ]*#define[\t ]+__ANDROID_API__[\t ]+([0-9]+)[\t ]*$" ) - FILE( STRINGS ${_path} __apiFileContent REGEX "${__ndkApiLevelRegex}" ) - if( NOT __apiFileContent ) - message( SEND_ERROR "Could not get Android native API level. Probably you have specified invalid level value, or your copy of NDK/toolchain is broken." ) - endif() - string( REGEX REPLACE "${__ndkApiLevelRegex}" "\\1" ${_var} "${__apiFileContent}" ) - unset( __apiFileContent ) - unset( __ndkApiLevelRegex ) + set( __ndkApiLevelRegex "^[\t ]*#define[\t ]+__ANDROID_API__[\t ]+([0-9]+)[\t ]*.*$" ) + file( STRINGS ${_path} __apiFileContent REGEX "${__ndkApiLevelRegex}" ) + if( NOT __apiFileContent ) + message( SEND_ERROR "Could not get Android native API level. Probably you have specified invalid level value, or your copy of NDK/toolchain is broken." ) + endif() + string( REGEX REPLACE "${__ndkApiLevelRegex}" "\\1" ${_var} "${__apiFileContent}" ) + unset( __apiFileContent ) + unset( __ndkApiLevelRegex ) endmacro() macro( __DETECT_TOOLCHAIN_MACHINE_NAME _var _root ) if( EXISTS "${_root}" ) - file( GLOB __gccExePath RELATIVE "${_root}/bin/" "${_root}/bin/*-gcc${TOOL_OS_SUFFIX}" ) - __LIST_FILTER( __gccExePath "^[.].*" ) - list( LENGTH __gccExePath __gccExePathsCount ) - if( NOT __gccExePathsCount EQUAL 1 AND NOT _CMAKE_IN_TRY_COMPILE ) - message( WARNING "Could not determine machine name for compiler from ${_root}" ) - set( ${_var} "" ) + file( GLOB __gccExePath RELATIVE "${_root}/bin/" "${_root}/bin/*-gcc${TOOL_OS_SUFFIX}" ) + __LIST_FILTER( __gccExePath "^[.].*" ) + list( LENGTH __gccExePath __gccExePathsCount ) + if( NOT __gccExePathsCount EQUAL 1 AND NOT _CMAKE_IN_TRY_COMPILE ) + message( WARNING "Could not determine machine name for compiler from ${_root}" ) + set( ${_var} "" ) + else() + get_filename_component( __gccExeName "${__gccExePath}" NAME_WE ) + string( REPLACE "-gcc" "" ${_var} "${__gccExeName}" ) + endif() + unset( __gccExePath ) + unset( __gccExePathsCount ) + unset( __gccExeName ) else() - get_filename_component( __gccExeName "${__gccExePath}" NAME_WE ) - string( REPLACE "-gcc" "" ${_var} "${__gccExeName}" ) + set( ${_var} "" ) endif() - unset( __gccExePath ) - unset( __gccExePathsCount ) - unset( __gccExeName ) - else() - set( ${_var} "" ) - endif() endmacro() @@ -500,17 +379,19 @@ if( NOT ANDROID_NDK_HOST_X64 ) endif() # see if we have path to Android NDK -__INIT_VARIABLE( ANDROID_NDK PATH ENV_ANDROID_NDK ) +if( NOT ANDROID_NDK AND NOT ANDROID_STANDALONE_TOOLCHAIN ) + __INIT_VARIABLE( ANDROID_NDK PATH ENV_ANDROID_NDK ) +endif() if( NOT ANDROID_NDK ) # see if we have path to Android standalone toolchain - __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN OBSOLETE_ANDROID_NDK_TOOLCHAIN_ROOT OBSOLETE_ENV_ANDROID_NDK_TOOLCHAIN_ROOT ) + __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN ) if( NOT ANDROID_STANDALONE_TOOLCHAIN ) #try to find Android NDK in one of the the default locations set( __ndkSearchPaths ) foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} ) foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} ) - list( APPEND __ndkSearchPaths "${__ndkSearchPath}${suffix}" ) + list( APPEND __ndkSearchPaths "${__ndkSearchPath}/android-ndk${suffix}" ) endforeach() endforeach() __INIT_VARIABLE( ANDROID_NDK PATH VALUES ${__ndkSearchPaths} ) @@ -537,12 +418,15 @@ if( ANDROID_NDK ) set( ANDROID_NDK "${ANDROID_NDK}" CACHE INTERNAL "Path of the Android NDK" FORCE ) set( BUILD_WITH_ANDROID_NDK True ) if( EXISTS "${ANDROID_NDK}/RELEASE.TXT" ) - file( STRINGS "${ANDROID_NDK}/RELEASE.TXT" ANDROID_NDK_RELEASE_FULL LIMIT_COUNT 1 REGEX r[0-9]+[a-z]? ) - string( REGEX MATCH r[0-9]+[a-z]? ANDROID_NDK_RELEASE "${ANDROID_NDK_RELEASE_FULL}" ) + file( STRINGS "${ANDROID_NDK}/RELEASE.TXT" ANDROID_NDK_RELEASE_FULL LIMIT_COUNT 1 REGEX "r[0-9]+[a-z]?" ) + string( REGEX MATCH "r([0-9]+)([a-z]?)" ANDROID_NDK_RELEASE "${ANDROID_NDK_RELEASE_FULL}" ) else() set( ANDROID_NDK_RELEASE "r1x" ) set( ANDROID_NDK_RELEASE_FULL "unreleased" ) endif() + string( REGEX REPLACE "r([0-9]+)([a-z]?)" "\\1*1000" ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE}" ) + string( FIND " abcdefghijklmnopqastuvwxyz" "${CMAKE_MATCH_2}" __ndkReleaseLetterNum ) + math( EXPR ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE_NUM}+${__ndkReleaseLetterNum}" ) elseif( ANDROID_STANDALONE_TOOLCHAIN ) get_filename_component( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" ABSOLUTE ) # try to detect change @@ -565,7 +449,7 @@ else() or export ANDROID_STANDALONE_TOOLCHAIN=~/my-android-toolchain or put the toolchain or NDK in the default path: - sudo ln -s ~/my-android-ndk ${ANDROID_NDK_SEARCH_PATH} + sudo ln -s ~/my-android-ndk ${ANDROID_NDK_SEARCH_PATH}/android-ndk sudo ln -s ~/my-android-toolchain ${ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH}" ) endif() @@ -623,12 +507,18 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) if( NOT __availableToolchainMachines ) message( FATAL_ERROR "Could not determine machine name of your toolchain. Probably your Android standalone toolchain is broken." ) endif() - if( __availableToolchainMachines MATCHES i686 ) + if( __availableToolchainMachines MATCHES x86_64 ) + set( __availableToolchainArchs "x86_64" ) + elseif( __availableToolchainMachines MATCHES i686 ) set( __availableToolchainArchs "x86" ) + elseif( __availableToolchainMachines MATCHES aarch64 ) + set( __availableToolchainArchs "arm64" ) elseif( __availableToolchainMachines MATCHES arm ) set( __availableToolchainArchs "arm" ) + elseif( __availableToolchainMachines MATCHES mips64el ) + set( __availableToolchainArchs "mips64" ) elseif( __availableToolchainMachines MATCHES mipsel ) - set( __availableToolchainArchs "mipsel" ) + set( __availableToolchainArchs "mips" ) endif() execute_process( COMMAND "${ANDROID_STANDALONE_TOOLCHAIN}/bin/${__availableToolchainMachines}-gcc${TOOL_OS_SUFFIX}" -dumpversion OUTPUT_VARIABLE __availableToolchainCompilerVersions OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -644,24 +534,44 @@ endif() macro( __GLOB_NDK_TOOLCHAINS __availableToolchainsVar __availableToolchainsLst __toolchain_subpath ) foreach( __toolchain ${${__availableToolchainsLst}} ) if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}${__toolchain_subpath}" ) - string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" ) + SET( __toolchainVersionRegex "^TOOLCHAIN_VERSION[\t ]+:=[\t ]+(.*)$" ) + FILE( STRINGS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}/setup.mk" __toolchainVersionStr REGEX "${__toolchainVersionRegex}" ) + if( __toolchainVersionStr ) + string( REGEX REPLACE "${__toolchainVersionRegex}" "\\1" __toolchainVersionStr "${__toolchainVersionStr}" ) + string( REGEX REPLACE "-clang3[.][0-9]$" "-${__toolchainVersionStr}" __gcc_toolchain "${__toolchain}" ) + else() + string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" ) + endif() + unset( __toolchainVersionStr ) + unset( __toolchainVersionRegex ) else() set( __gcc_toolchain "${__toolchain}" ) endif() __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK_TOOLCHAINS_PATH}/${__gcc_toolchain}${__toolchain_subpath}" ) if( __machine ) string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9x]+)?$" __version "${__gcc_toolchain}" ) - if( __machine MATCHES i686 ) + if( __machine MATCHES x86_64 ) + set( __arch "x86_64" ) + elseif( __machine MATCHES i686 ) set( __arch "x86" ) + elseif( __machine MATCHES aarch64 ) + set( __arch "arm64" ) elseif( __machine MATCHES arm ) set( __arch "arm" ) + elseif( __machine MATCHES mips64el ) + set( __arch "mips64" ) elseif( __machine MATCHES mipsel ) - set( __arch "mipsel" ) + set( __arch "mips" ) + else() + set( __arch "" ) + endif() + #message("machine: !${__machine}!\narch: !${__arch}!\nversion: !${__version}!\ntoolchain: !${__toolchain}!\n") + if (__arch) + list( APPEND __availableToolchainMachines "${__machine}" ) + list( APPEND __availableToolchainArchs "${__arch}" ) + list( APPEND __availableToolchainCompilerVersions "${__version}" ) + list( APPEND ${__availableToolchainsVar} "${__toolchain}" ) endif() - list( APPEND __availableToolchainMachines "${__machine}" ) - list( APPEND __availableToolchainArchs "${__arch}" ) - list( APPEND __availableToolchainCompilerVersions "${__version}" ) - list( APPEND ${__availableToolchainsVar} "${__toolchain}" ) endif() unset( __gcc_toolchain ) endforeach() @@ -721,7 +631,7 @@ if( NOT ANDROID_SUPPORTED_ABIS ) endif() # choose target ABI -__INIT_VARIABLE( ANDROID_ABI OBSOLETE_ARM_TARGET OBSOLETE_ARM_TARGETS VALUES ${ANDROID_SUPPORTED_ABIS} ) +__INIT_VARIABLE( ANDROID_ABI VALUES ${ANDROID_SUPPORTED_ABIS} ) # verify that target ABI is supported list( FIND ANDROID_SUPPORTED_ABIS "${ANDROID_ABI}" __androidAbiIdx ) if( __androidAbiIdx EQUAL -1 ) @@ -737,28 +647,45 @@ if( ANDROID_ABI STREQUAL "x86" ) set( X86 true ) set( ANDROID_NDK_ABI_NAME "x86" ) set( ANDROID_ARCH_NAME "x86" ) - set( ANDROID_ARCH_FULLNAME "x86" ) set( ANDROID_LLVM_TRIPLE "i686-none-linux-android" ) set( CMAKE_SYSTEM_PROCESSOR "i686" ) +elseif( ANDROID_ABI STREQUAL "x86_64" ) + set( X86 true ) + set( X86_64 true ) + set( ANDROID_NDK_ABI_NAME "x86_64" ) + set( ANDROID_ARCH_NAME "x86_64" ) + set( CMAKE_SYSTEM_PROCESSOR "x86_64" ) + set( ANDROID_LLVM_TRIPLE "x86_64-none-linux-android" ) +elseif( ANDROID_ABI STREQUAL "mips64" ) + set( MIPS64 true ) + set( ANDROID_NDK_ABI_NAME "mips64" ) + set( ANDROID_ARCH_NAME "mips64" ) + set( ANDROID_LLVM_TRIPLE "mips64el-none-linux-android" ) + set( CMAKE_SYSTEM_PROCESSOR "mips64" ) elseif( ANDROID_ABI STREQUAL "mips" ) set( MIPS true ) set( ANDROID_NDK_ABI_NAME "mips" ) set( ANDROID_ARCH_NAME "mips" ) - set( ANDROID_ARCH_FULLNAME "mipsel" ) set( ANDROID_LLVM_TRIPLE "mipsel-none-linux-android" ) set( CMAKE_SYSTEM_PROCESSOR "mips" ) +elseif( ANDROID_ABI STREQUAL "arm64-v8a" ) + set( ARM64_V8A true ) + set( ANDROID_NDK_ABI_NAME "arm64-v8a" ) + set( ANDROID_ARCH_NAME "arm64" ) + set( ANDROID_LLVM_TRIPLE "aarch64-none-linux-android" ) + set( CMAKE_SYSTEM_PROCESSOR "aarch64" ) + set( VFPV3 true ) + set( NEON true ) elseif( ANDROID_ABI STREQUAL "armeabi" ) set( ARMEABI true ) set( ANDROID_NDK_ABI_NAME "armeabi" ) set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_ARCH_FULLNAME "arm" ) set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" ) set( CMAKE_SYSTEM_PROCESSOR "armv5te" ) elseif( ANDROID_ABI STREQUAL "armeabi-v6 with VFP" ) set( ARMEABI_V6 true ) set( ANDROID_NDK_ABI_NAME "armeabi" ) set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_ARCH_FULLNAME "arm" ) set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" ) set( CMAKE_SYSTEM_PROCESSOR "armv6" ) # need always fallback to older platform @@ -767,14 +694,12 @@ elseif( ANDROID_ABI STREQUAL "armeabi-v7a") set( ARMEABI_V7A true ) set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_ARCH_FULLNAME "arm" ) set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) elseif( ANDROID_ABI STREQUAL "armeabi-v7a with VFPV3" ) set( ARMEABI_V7A true ) set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_ARCH_FULLNAME "arm" ) set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) set( VFPV3 true ) @@ -782,7 +707,6 @@ elseif( ANDROID_ABI STREQUAL "armeabi-v7a with NEON" ) set( ARMEABI_V7A true ) set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_ARCH_FULLNAME "arm" ) set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) set( VFPV3 true ) @@ -798,7 +722,7 @@ if( CMAKE_BINARY_DIR AND EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMa endif() if( ANDROID_ARCH_NAME STREQUAL "arm" AND NOT ARMEABI_V6 ) - __INIT_VARIABLE( ANDROID_FORCE_ARM_BUILD OBSOLETE_FORCE_ARM VALUES OFF ) + __INIT_VARIABLE( ANDROID_FORCE_ARM_BUILD VALUES OFF ) set( ANDROID_FORCE_ARM_BUILD ${ANDROID_FORCE_ARM_BUILD} CACHE BOOL "Use 32-bit ARM instructions instead of Thumb-1" FORCE ) mark_as_advanced( ANDROID_FORCE_ARM_BUILD ) else() @@ -816,7 +740,7 @@ if( ANDROID_TOOLCHAIN_NAME ) To configure the toolchain set CMake variable ANDROID_TOOLCHAIN_NAME to one of the following values:\n${toolchains_list}\n" ) endif() list( GET __availableToolchainArchs ${__toolchainIdx} __toolchainArch ) - if( NOT __toolchainArch STREQUAL ANDROID_ARCH_FULLNAME ) + if( NOT __toolchainArch STREQUAL ANDROID_ARCH_NAME ) message( SEND_ERROR "Selected toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is not able to compile binaries for the \"${ANDROID_ARCH_NAME}\" platform." ) endif() else() @@ -827,7 +751,7 @@ else() math( EXPR __availableToolchainsCount "${__availableToolchainsCount}-1" ) foreach( __idx RANGE ${__availableToolchainsCount} ) list( GET __availableToolchainArchs ${__idx} __toolchainArch ) - if( __toolchainArch STREQUAL ANDROID_ARCH_FULLNAME ) + if( __toolchainArch STREQUAL ANDROID_ARCH_NAME ) list( GET __availableToolchainCompilerVersions ${__idx} __toolchainVersion ) string( REPLACE "x" "99" __toolchainVersion "${__toolchainVersion}") if( __toolchainVersion VERSION_GREATER __toolchainMaxVersion ) @@ -856,15 +780,16 @@ unset( __availableToolchainCompilerVersions ) # choose native API level __INIT_VARIABLE( ANDROID_NATIVE_API_LEVEL ENV_ANDROID_NATIVE_API_LEVEL ANDROID_API_LEVEL ENV_ANDROID_API_LEVEL ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME} ANDROID_DEFAULT_NDK_API_LEVEL ) -string( REGEX MATCH "[0-9]+" ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" ) +string( REPLACE "android-" "" ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" ) +string( STRIP "${ANDROID_NATIVE_API_LEVEL}" ANDROID_NATIVE_API_LEVEL ) # adjust API level set( __real_api_level ${ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME}} ) foreach( __level ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) - if( NOT __level GREATER ANDROID_NATIVE_API_LEVEL AND NOT __level LESS __real_api_level ) + if( (__level LESS ANDROID_NATIVE_API_LEVEL OR __level STREQUAL ANDROID_NATIVE_API_LEVEL) AND NOT __level LESS __real_api_level ) set( __real_api_level ${__level} ) endif() endforeach() -if( __real_api_level AND NOT ANDROID_NATIVE_API_LEVEL EQUAL __real_api_level ) +if( __real_api_level AND NOT ANDROID_NATIVE_API_LEVEL STREQUAL __real_api_level ) message( STATUS "Adjusting Android API level 'android-${ANDROID_NATIVE_API_LEVEL}' to 'android-${__real_api_level}'") set( ANDROID_NATIVE_API_LEVEL ${__real_api_level} ) endif() @@ -876,12 +801,13 @@ if( __levelIdx EQUAL -1 ) else() if( BUILD_WITH_ANDROID_NDK ) __DETECT_NATIVE_API_LEVEL( __realApiLevel "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}/usr/include/android/api-level.h" ) - if( NOT __realApiLevel EQUAL ANDROID_NATIVE_API_LEVEL ) + if( NOT __realApiLevel EQUAL ANDROID_NATIVE_API_LEVEL AND NOT __realApiLevel GREATER 9000 ) message( SEND_ERROR "Specified Android API level (${ANDROID_NATIVE_API_LEVEL}) does not match to the level found (${__realApiLevel}). Probably your copy of NDK is broken." ) endif() unset( __realApiLevel ) endif() set( ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "Android API level for native code" FORCE ) + set( CMAKE_ANDROID_API ${ANDROID_NATIVE_API_LEVEL} ) if( CMAKE_VERSION VERSION_GREATER "2.8" ) list( SORT ANDROID_SUPPORTED_NATIVE_API_LEVELS ) set_property( CACHE ANDROID_NATIVE_API_LEVEL PROPERTY STRINGS ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) @@ -893,23 +819,14 @@ unset( __levelIdx ) # remember target ABI set( ANDROID_ABI "${ANDROID_ABI}" CACHE STRING "The target ABI for Android. If arm, then armeabi-v7a is recommended for hardware floating point." FORCE ) if( CMAKE_VERSION VERSION_GREATER "2.8" ) - list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_FULLNAME} ) - set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_FULLNAME}} ) + list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME} ) + set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME}} ) endif() # runtime choice (STL, rtti, exceptions) if( NOT ANDROID_STL ) - # honor legacy ANDROID_USE_STLPORT - if( DEFINED ANDROID_USE_STLPORT ) - if( ANDROID_USE_STLPORT ) - set( ANDROID_STL stlport_static ) - endif() - message( WARNING "You are using an obsolete variable ANDROID_USE_STLPORT to select the STL variant. Use -DANDROID_STL=stlport_static instead." ) - endif() - if( NOT ANDROID_STL ) set( ANDROID_STL gnustl_static ) - endif() endif() set( ANDROID_STL "${ANDROID_STL}" CACHE STRING "C++ runtime" ) set( ANDROID_STL_FORCE_FEATURES ON CACHE BOOL "automatically configure rtti and exceptions support based on C++ runtime" ) @@ -1036,7 +953,7 @@ if( "${ANDROID_TOOLCHAIN_NAME}" STREQUAL "standalone-clang" ) string( REGEX MATCH "[0-9]+[.][0-9]+" ANDROID_CLANG_VERSION "${ANDROID_CLANG_VERSION}") elseif( "${ANDROID_TOOLCHAIN_NAME}" MATCHES "-clang3[.][0-9]?$" ) string( REGEX MATCH "3[.][0-9]$" ANDROID_CLANG_VERSION "${ANDROID_TOOLCHAIN_NAME}") - string( REGEX REPLACE "-clang${ANDROID_CLANG_VERSION}$" "-4.6" ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" ) + string( REGEX REPLACE "-clang${ANDROID_CLANG_VERSION}$" "-${ANDROID_COMPILER_VERSION}" ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" ) if( NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}/bin/clang${TOOL_OS_SUFFIX}" ) message( FATAL_ERROR "Could not find the Clang compiler driver" ) endif() @@ -1069,7 +986,7 @@ if( BUILD_WITH_ANDROID_NDK ) set( ANDROID_EXCEPTIONS ON ) set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" ) elseif( ANDROID_STL MATCHES "gabi" ) - if( ANDROID_NDK_RELEASE STRLESS "r7" ) + if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 message( FATAL_ERROR "gabi++ is not awailable in your NDK. You have to upgrade to NDK r7 or newer to use gabi++.") endif() set( ANDROID_RTTI ON ) @@ -1077,12 +994,12 @@ if( BUILD_WITH_ANDROID_NDK ) set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/gabi++/include" ) set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gabi++/libs/${ANDROID_NDK_ABI_NAME}/libgabi++_static.a" ) elseif( ANDROID_STL MATCHES "stlport" ) - if( NOT ANDROID_NDK_RELEASE STRLESS "r8d" ) + if( NOT ANDROID_NDK_RELEASE_NUM LESS 8004 ) # before r8d set( ANDROID_EXCEPTIONS ON ) else() set( ANDROID_EXCEPTIONS OFF ) endif() - if( ANDROID_NDK_RELEASE STRLESS "r7" ) + if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 set( ANDROID_RTTI OFF ) else() set( ANDROID_RTTI ON ) @@ -1103,7 +1020,7 @@ if( BUILD_WITH_ANDROID_NDK ) else() set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" ) endif() - set( ANDROID_STL_INCLUDE_DIRS "${__libstl}/include" "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/include" ) + set( ANDROID_STL_INCLUDE_DIRS "${__libstl}/include" "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/include" "${__libstl}/include/backward" ) if( EXISTS "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" ) set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" ) else() @@ -1205,10 +1122,14 @@ endif() include( CMakeForceCompiler ) CMAKE_FORCE_C_COMPILER( "${CMAKE_C_COMPILER}" GNU ) if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_C_COMPILER_ID Clang) + set( CMAKE_C_COMPILER_ID Clang ) endif() set( CMAKE_C_PLATFORM_ID Linux ) -set( CMAKE_C_SIZEOF_DATA_PTR 4 ) +if( X86_64 OR MIPS64 OR ARM64_V8A ) + set( CMAKE_C_SIZEOF_DATA_PTR 8 ) +else() + set( CMAKE_C_SIZEOF_DATA_PTR 4 ) +endif() set( CMAKE_C_HAS_ISYSROOT 1 ) set( CMAKE_C_COMPILER_ABI ELF ) CMAKE_FORCE_CXX_COMPILER( "${CMAKE_CXX_COMPILER}" GNU ) @@ -1216,7 +1137,7 @@ if( ANDROID_COMPILER_IS_CLANG ) set( CMAKE_CXX_COMPILER_ID Clang) endif() set( CMAKE_CXX_PLATFORM_ID Linux ) -set( CMAKE_CXX_SIZEOF_DATA_PTR 4 ) +set( CMAKE_CXX_SIZEOF_DATA_PTR ${CMAKE_C_SIZEOF_DATA_PTR} ) set( CMAKE_CXX_HAS_ISYSROOT 1 ) set( CMAKE_CXX_COMPILER_ABI ELF ) set( CMAKE_CXX_SOURCE_FILE_EXTENSIONS cc cp cxx cpp CPP c++ C ) @@ -1228,6 +1149,14 @@ set( CMAKE_ASM_COMPILER_FORCED TRUE ) set( CMAKE_COMPILER_IS_GNUASM 1) set( CMAKE_ASM_SOURCE_FILE_EXTENSIONS s S asm ) +foreach( lang C CXX ASM ) + if( ANDROID_COMPILER_IS_CLANG ) + set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_CLANG_VERSION} ) + else() + set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_COMPILER_VERSION} ) + endif() +endforeach() + # flags and definitions remove_definitions( -DANDROID ) add_definitions( -DANDROID ) @@ -1257,8 +1186,15 @@ else() endif() # NDK flags -if( ARMEABI OR ARMEABI_V7A ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fpic -funwind-tables" ) +if (ARM64_V8A ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) + set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" ) + set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -fno-strict-aliasing" ) + if( NOT ANDROID_COMPILER_IS_CLANG ) + set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" ) + endif() +elseif( ARMEABI OR ARMEABI_V7A) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) if( NOT ANDROID_FORCE_ARM_BUILD AND NOT ARMEABI_V6 ) set( ANDROID_CXX_FLAGS_RELEASE "-mthumb -fomit-frame-pointer -fno-strict-aliasing" ) set( ANDROID_CXX_FLAGS_DEBUG "-marm -fno-omit-frame-pointer -fno-strict-aliasing" ) @@ -1273,17 +1209,15 @@ if( ARMEABI OR ARMEABI_V7A ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" ) endif() endif() -elseif( X86 ) +elseif( X86 OR X86_64 ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) if( NOT ANDROID_COMPILER_IS_CLANG ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" ) - else() - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fPIC" ) endif() set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" ) set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -fno-strict-aliasing" ) -elseif( MIPS ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fpic -fno-strict-aliasing -finline-functions -ffunction-sections -funwind-tables -fmessage-length=0" ) +elseif( MIPS OR MIPS64 ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fno-strict-aliasing -finline-functions -funwind-tables -fmessage-length=0" ) set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer" ) set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer" ) if( NOT ANDROID_COMPILER_IS_CLANG ) @@ -1361,14 +1295,14 @@ if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" ) endif() # variables controlling optional build flags -if (ANDROID_NDK_RELEASE STRLESS "r7") +if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 # libGLESv2.so in NDK's prior to r7 refers to missing external symbols. # So this flag option is required for all projects using OpenGL from native. __INIT_VARIABLE( ANDROID_SO_UNDEFINED VALUES ON ) else() __INIT_VARIABLE( ANDROID_SO_UNDEFINED VALUES OFF ) endif() -__INIT_VARIABLE( ANDROID_NO_UNDEFINED OBSOLETE_NO_UNDEFINED VALUES ON ) +__INIT_VARIABLE( ANDROID_NO_UNDEFINED VALUES ON ) __INIT_VARIABLE( ANDROID_FUNCTION_LEVEL_LINKING VALUES ON ) __INIT_VARIABLE( ANDROID_GOLD_LINKER VALUES ON ) __INIT_VARIABLE( ANDROID_NOEXECSTACK VALUES ON ) @@ -1376,8 +1310,8 @@ __INIT_VARIABLE( ANDROID_RELRO VALUES ON ) set( ANDROID_NO_UNDEFINED ${ANDROID_NO_UNDEFINED} CACHE BOOL "Show all undefined symbols as linker errors" ) set( ANDROID_SO_UNDEFINED ${ANDROID_SO_UNDEFINED} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" ) -set( ANDROID_FUNCTION_LEVEL_LINKING ${ANDROID_FUNCTION_LEVEL_LINKING} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" ) -set( ANDROID_GOLD_LINKER ${ANDROID_GOLD_LINKER} CACHE BOOL "Enables gold linker (only avaialble for NDK r8b for ARM and x86 architectures on linux-86 and darwin-x86 hosts)" ) +set( ANDROID_FUNCTION_LEVEL_LINKING ${ANDROID_FUNCTION_LEVEL_LINKING} CACHE BOOL "Put each function in separate section and enable garbage collection of unused input sections at link time" ) +set( ANDROID_GOLD_LINKER ${ANDROID_GOLD_LINKER} CACHE BOOL "Enables gold linker" ) set( ANDROID_NOEXECSTACK ${ANDROID_NOEXECSTACK} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" ) set( ANDROID_RELRO ${ANDROID_RELRO} CACHE BOOL "Enables RELRO - a memory corruption mitigation technique" ) mark_as_advanced( ANDROID_NO_UNDEFINED ANDROID_SO_UNDEFINED ANDROID_FUNCTION_LEVEL_LINKING ANDROID_GOLD_LINKER ANDROID_NOEXECSTACK ANDROID_RELRO ) @@ -1412,9 +1346,9 @@ if( ANDROID_FUNCTION_LEVEL_LINKING ) endif() if( ANDROID_COMPILER_VERSION VERSION_EQUAL "4.6" ) - if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE STRGREATER "r8b") AND (ARMEABI OR ARMEABI_V7A OR X86) ) + if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE_NUM GREATER 8002) AND (ARMEABI OR ARMEABI_V7A OR X86) ) set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=gold" ) - elseif( ANDROID_NDK_RELEASE STRGREATER "r8b") + elseif( ANDROID_NDK_RELEASE_NUM GREATER 8002 ) # after r8b set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=bfd" ) elseif( ANDROID_NDK_RELEASE STREQUAL "r8b" AND ARMEABI AND NOT _CMAKE_IN_TRY_COMPILE ) message( WARNING "The default bfd linker from arm GCC 4.6 toolchain can fail with 'unresolvable R_ARM_THM_CALL relocation' error message. See https://code.google.com/p/android/issues/detail?id=35342 @@ -1438,13 +1372,7 @@ if( ANDROID_RELRO ) endif() if( ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "-Qunused-arguments ${ANDROID_CXX_FLAGS}" ) - if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD ) - set( ANDROID_CXX_FLAGS_RELEASE "-target thumbv7-none-linux-androideabi ${ANDROID_CXX_FLAGS_RELEASE}" ) - set( ANDROID_CXX_FLAGS_DEBUG "-target ${ANDROID_LLVM_TRIPLE} ${ANDROID_CXX_FLAGS_DEBUG}" ) - else() - set( ANDROID_CXX_FLAGS "-target ${ANDROID_LLVM_TRIPLE} ${ANDROID_CXX_FLAGS}" ) - endif() + set( ANDROID_CXX_FLAGS "-target ${ANDROID_LLVM_TRIPLE} -Qunused-arguments ${ANDROID_CXX_FLAGS}" ) if( BUILD_WITH_ANDROID_NDK ) set( ANDROID_CXX_FLAGS "-gcc-toolchain ${ANDROID_TOOLCHAIN_ROOT} ${ANDROID_CXX_FLAGS}" ) endif() @@ -1484,6 +1412,16 @@ if( MIPS AND BUILD_WITH_ANDROID_NDK AND ANDROID_NDK_RELEASE STREQUAL "r8" ) set( CMAKE_EXE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.x ${CMAKE_EXE_LINKER_FLAGS}" ) endif() +# pie/pic +if( NOT (ANDROID_NATIVE_API_LEVEL LESS 16) AND (NOT DEFINED ANDROID_APP_PIE OR ANDROID_APP_PIE) AND (CMAKE_VERSION VERSION_GREATER 2.8.8) ) + set( CMAKE_POSITION_INDEPENDENT_CODE TRUE ) + set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie") +else() + set( CMAKE_POSITION_INDEPENDENT_CODE FALSE ) + set( CMAKE_CXX_FLAGS "-fpic ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-fpic ${CMAKE_C_FLAGS}" ) +endif() + # configure rtti if( DEFINED ANDROID_RTTI AND ANDROID_STL_FORCE_FEATURES ) if( ANDROID_RTTI ) @@ -1547,27 +1485,31 @@ if( ANDROID_EXPLICIT_CRT_LINK ) endif() # setup output directories -set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "root for library output, set this to change where android libs are installed to" ) set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" ) -if(NOT _CMAKE_IN_TRY_COMPILE) - if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" ) - set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" ) - else() - set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" ) - endif() - set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" ) +if( DEFINED LIBRARY_OUTPUT_PATH_ROOT + OR EXISTS "${CMAKE_SOURCE_DIR}/AndroidManifest.xml" + OR (EXISTS "${CMAKE_SOURCE_DIR}/../AndroidManifest.xml" AND EXISTS "${CMAKE_SOURCE_DIR}/../jni/") ) + set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "Root for binaries output, set this to change where Android libs are installed to" ) + if( NOT _CMAKE_IN_TRY_COMPILE ) + if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" ) + set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" ) + else() + set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" ) + endif() + set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for Android libs" ) + endif() endif() # copy shaed stl library to build directory -if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" ) - get_filename_component( __libstlname "${__libstl}" NAME ) - execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess ) - if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}") - message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" ) - endif() - unset( __fileCopyProcess ) - unset( __libstlname ) +if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" AND DEFINED LIBRARY_OUTPUT_PATH ) + get_filename_component( __libstlname "${__libstl}" NAME ) + execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess ) + if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}") + message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" ) + endif() + unset( __fileCopyProcess ) + unset( __libstlname ) endif() @@ -1628,25 +1570,10 @@ macro( find_host_program ) endmacro() -macro( ANDROID_GET_ABI_RAWNAME TOOLCHAIN_FLAG VAR ) - if( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI" ) - set( ${VAR} "armeabi" ) - elseif( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI_V7A" ) - set( ${VAR} "armeabi-v7a" ) - elseif( "${TOOLCHAIN_FLAG}" STREQUAL "X86" ) - set( ${VAR} "x86" ) - elseif( "${TOOLCHAIN_FLAG}" STREQUAL "MIPS" ) - set( ${VAR} "mips" ) - else() - set( ${VAR} "unknown" ) - endif() -endmacro() - - # export toolchain settings for the try_compile() command -if( NOT PROJECT_NAME STREQUAL "CMAKE_TRY_COMPILE" ) +if( NOT _CMAKE_IN_TRY_COMPILE ) set( __toolchain_config "") - foreach( __var NDK_CCACHE LIBRARY_OUTPUT_PATH_ROOT ANDROID_FORBID_SYGWIN ANDROID_SET_OBSOLETE_VARIABLES + foreach( __var NDK_CCACHE LIBRARY_OUTPUT_PATH_ROOT ANDROID_FORBID_SYGWIN ANDROID_NDK_HOST_X64 ANDROID_NDK ANDROID_NDK_LAYOUT @@ -1665,9 +1592,10 @@ if( NOT PROJECT_NAME STREQUAL "CMAKE_TRY_COMPILE" ) ANDROID_RELRO ANDROID_LIBM_PATH ANDROID_EXPLICIT_CRT_LINK + ANDROID_APP_PIE ) if( DEFINED ${__var} ) - if( "${__var}" MATCHES " ") + if( ${__var} MATCHES " ") set( __toolchain_config "${__toolchain_config}set( ${__var} \"${${__var}}\" CACHE INTERNAL \"\" )\n" ) else() set( __toolchain_config "${__toolchain_config}set( ${__var} ${${__var}} CACHE INTERNAL \"\" )\n" ) @@ -1692,19 +1620,9 @@ if( CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_HOST_WIN32 ) endif() -# set some obsolete variables for backward compatibility -set( ANDROID_SET_OBSOLETE_VARIABLES ON CACHE BOOL "Define obsolete Andrid-specific cmake variables" ) -mark_as_advanced( ANDROID_SET_OBSOLETE_VARIABLES ) -if( ANDROID_SET_OBSOLETE_VARIABLES ) - set( ANDROID_API_LEVEL ${ANDROID_NATIVE_API_LEVEL} ) - set( ARM_TARGET "${ANDROID_ABI}" ) - set( ARMEABI_NDK_NAME "${ANDROID_NDK_ABI_NAME}" ) -endif() - - # Variables controlling behavior or set by cmake toolchain: -# ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips" -# ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14 (depends on NDK version) +# ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips", "arm64-v8a", "x86_64", "mips64" +# ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14,15,16,17,18,19,21 (depends on NDK version) # ANDROID_STL : gnustl_static/gnustl_shared/stlport_static/stlport_shared/gabi++_static/gabi++_shared/system_re/system/none # ANDROID_FORBID_SYGWIN : ON/OFF # ANDROID_NO_UNDEFINED : ON/OFF @@ -1715,47 +1633,42 @@ endif() # ANDROID_RELRO : ON/OFF # ANDROID_FORCE_ARM_BUILD : ON/OFF # ANDROID_STL_FORCE_FEATURES : ON/OFF -# ANDROID_SET_OBSOLETE_VARIABLES : ON/OFF +# ANDROID_LIBM_PATH : path to libm.so (set to something like $(TOP)/out/target/product//obj/lib/libm.so) to workaround unresolved `sincos` # Can be set only at the first run: -# ANDROID_NDK -# ANDROID_STANDALONE_TOOLCHAIN +# ANDROID_NDK : path to your NDK install +# NDK_CCACHE : path to your ccache executable # ANDROID_TOOLCHAIN_NAME : the NDK name of compiler toolchain # ANDROID_NDK_HOST_X64 : try to use x86_64 toolchain (default for x64 host systems) # ANDROID_NDK_LAYOUT : the inner NDK structure (RELEASE, LINARO, ANDROID) # LIBRARY_OUTPUT_PATH_ROOT : -# NDK_CCACHE : -# Obsolete: -# ANDROID_API_LEVEL : superseded by ANDROID_NATIVE_API_LEVEL -# ARM_TARGET : superseded by ANDROID_ABI -# ARM_TARGETS : superseded by ANDROID_ABI (can be set only) -# ANDROID_NDK_TOOLCHAIN_ROOT : superseded by ANDROID_STANDALONE_TOOLCHAIN (can be set only) -# ANDROID_USE_STLPORT : superseded by ANDROID_STL=stlport_static -# ANDROID_LEVEL : superseded by ANDROID_NATIVE_API_LEVEL (completely removed) +# ANDROID_STANDALONE_TOOLCHAIN # # Primary read-only variables: # ANDROID : always TRUE # ARMEABI : TRUE for arm v6 and older devices # ARMEABI_V6 : TRUE for arm v6 # ARMEABI_V7A : TRUE for arm v7a +# ARM64_V8A : TRUE for arm64-v8a # NEON : TRUE if NEON unit is enabled # VFPV3 : TRUE if VFP version 3 is enabled # X86 : TRUE if configured for x86 +# X86_64 : TRUE if configured for x86_64 # MIPS : TRUE if configured for mips -# BUILD_ANDROID : always TRUE +# MIPS64 : TRUE if configured for mips64 # BUILD_WITH_ANDROID_NDK : TRUE if NDK is used # BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used # ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform -# ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86" or "mips" depending on ANDROID_ABI -# ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e, r9, r9b, r9c, r9d; set only for NDK -# ANDROID_ARCH_NAME : "arm" or "x86" or "mips" depending on ANDROID_ABI +# ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86", "mips", "arm64-v8a", "x86_64", "mips64" depending on ANDROID_ABI +# ANDROID_NDK_RELEASE : from r5 to r10d; set only for NDK +# ANDROID_NDK_RELEASE_NUM : numeric ANDROID_NDK_RELEASE version (1000*major+minor) +# ANDROID_ARCH_NAME : "arm", "x86", "mips", "arm64", "x86_64", "mips64" depending on ANDROID_ABI # ANDROID_SYSROOT : path to the compiler sysroot # TOOL_OS_SUFFIX : "" or ".exe" depending on host platform # ANDROID_COMPILER_IS_CLANG : TRUE if clang compiler is used -# Obsolete: -# ARMEABI_NDK_NAME : superseded by ANDROID_NDK_ABI_NAME # # Secondary (less stable) read-only variables: -# ANDROID_COMPILER_VERSION : GCC version used +# ANDROID_COMPILER_VERSION : GCC version used (not Clang version) +# ANDROID_CLANG_VERSION : version of clang compiler if clang is used # ANDROID_CXX_FLAGS : C/C++ compiler flags required by Android platform # ANDROID_SUPPORTED_ABIS : list of currently allowed values for ANDROID_ABI # ANDROID_TOOLCHAIN_MACHINE_NAME : "arm-linux-androideabi", "arm-eabi" or "i686-android-linux" @@ -1766,13 +1679,10 @@ endif() # ANDROID_RTTI : if rtti is enabled by the runtime # ANDROID_EXCEPTIONS : if exceptions are enabled by the runtime # ANDROID_GCC_TOOLCHAIN_NAME : read-only, differs from ANDROID_TOOLCHAIN_NAME only if clang is used -# ANDROID_CLANG_VERSION : version of clang compiler if clang is used -# ANDROID_LIBM_PATH : path to libm.so (set to something like $(TOP)/out/target/product//obj/lib/libm.so) to workaround unresolved `sincos` # # Defaults: # ANDROID_DEFAULT_NDK_API_LEVEL # ANDROID_DEFAULT_NDK_API_LEVEL_${ARCH} # ANDROID_NDK_SEARCH_PATHS -# ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH # ANDROID_SUPPORTED_ABIS_${ARCH} # ANDROID_SUPPORTED_NDK_VERSIONS From f0f9a2792452638191a3f71c8cdc5c21ae326edf Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Tue, 6 Jan 2015 23:50:34 +0100 Subject: [PATCH 050/165] Add log4cplus.h header including commonly used headers. Implement Initializer class to ease initialization/shutdown of log4cplus. --- include/Makefile.am | 1 + include/Makefile.in | 1 + include/log4cplus/log4cplus.h | 78 ++++ src/CMakeLists.txt | 1 + src/global-init.cxx | 31 ++ tests/headers.at | 1 + tests/testsuite | 647 ++++++++++++++++++---------------- 7 files changed, 460 insertions(+), 300 deletions(-) create mode 100644 include/log4cplus/log4cplus.h diff --git a/include/Makefile.am b/include/Makefile.am index 2e4960ee2..08253fda8 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -37,6 +37,7 @@ nobase_log4cplusinc_HEADERS = \ log4cplus/internal/internal.h \ log4cplus/internal/socket.h \ log4cplus/layout.h \ + log4cplus/log4cplus.h \ log4cplus/log4judpappender.h \ log4cplus/logger.h \ log4cplus/loggingmacros.h \ diff --git a/include/Makefile.in b/include/Makefile.in index 102e0d720..90d593aad 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -380,6 +380,7 @@ nobase_log4cplusinc_HEADERS = \ log4cplus/internal/internal.h \ log4cplus/internal/socket.h \ log4cplus/layout.h \ + log4cplus/log4cplus.h \ log4cplus/log4judpappender.h \ log4cplus/logger.h \ log4cplus/loggingmacros.h \ diff --git a/include/log4cplus/log4cplus.h b/include/log4cplus/log4cplus.h new file mode 100644 index 000000000..6db1d98a1 --- /dev/null +++ b/include/log4cplus/log4cplus.h @@ -0,0 +1,78 @@ +// Copyright (C) 2015, Vaclav Haisman. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modifica- +// tion, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- +// DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef LOG4CPLUS_LOG4CPLUS_HXX +#define LOG4CPLUS_LOG4CPLUS_HXX + +#include + +#if defined (LOG4CPLUS_HAVE_PRAGMA_ONCE) +#pragma once +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + + +namespace log4cplus +{ + +class LOG4CPLUS_EXPORT Initializer +{ +public: + Initializer (); + ~Initializer (); + + Initializer (Initializer const &) = delete; + Initializer (Initializer &&) = delete; + Initializer & operator = (Initializer const &) = delete; + Initializer & operator = (Initializer &&) = delete; + +private: + struct Impl; + std::unique_ptr pimpl; +}; + +} // namespace log4cplus + +#endif // LOG4CPLUS_LOG4CPLUS_HXX diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 91174da28..02bc3c81e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -137,6 +137,7 @@ install(FILES ../include/log4cplus/appender.h ../include/log4cplus/hierarchy.h ../include/log4cplus/hierarchylocker.h ../include/log4cplus/layout.h + ../include/log4cplus/log4cplus.h ../include/log4cplus/log4judpappender.h ../include/log4cplus/logger.h ../include/log4cplus/loggingmacros.h diff --git a/src/global-init.cxx b/src/global-init.cxx index afbf9b499..7001abaed 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -19,6 +19,7 @@ // limitations under the License. #include +#include #include #include #include @@ -50,6 +51,36 @@ LOG4CPLUS_EXPORT tostream & tcerr = std::cerr; #endif // UNICODE +struct Initializer::Impl +{ +#if ! defined (LOG4CPLUS_SINGLE_THREADED) + std::mutex mtx; +#endif + + unsigned count = 0; +}; + + +Initializer::Initializer () + : pimpl (new Impl) +{ + LOG4CPLUS_THREADED (std::unique_lock guard (pimpl->mtx)); + if (pimpl->count == 0) + initialize (); + + ++pimpl->count; +} + + +Initializer::~Initializer () +{ + LOG4CPLUS_THREADED (std::unique_lock guard (pimpl->mtx)); + --pimpl->count; + if (pimpl->count == 0) + Logger::shutdown (); +} + + namespace { diff --git a/tests/headers.at b/tests/headers.at index 8227b827a..005c32fde 100644 --- a/tests/headers.at +++ b/tests/headers.at @@ -12,6 +12,7 @@ m4_foreach_w([HEADER], log4cplus/hierarchy.h log4cplus/hierarchylocker.h log4cplus/layout.h + log4cplus/log4cplus.h log4cplus/log4judpappender.h log4cplus/logger.h log4cplus/loggingmacros.h diff --git a/tests/testsuite b/tests/testsuite index 4d018559c..feed3d342 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -602,66 +602,67 @@ at_help_all="1;headers.at:1;separate compilation of log4cplus/appender.h;headers 10;headers.at:1;separate compilation of log4cplus/hierarchy.h;headers-compilation; 11;headers.at:1;separate compilation of log4cplus/hierarchylocker.h;headers-compilation; 12;headers.at:1;separate compilation of log4cplus/layout.h;headers-compilation; -13;headers.at:1;separate compilation of log4cplus/log4judpappender.h;headers-compilation; -14;headers.at:1;separate compilation of log4cplus/logger.h;headers-compilation; -15;headers.at:1;separate compilation of log4cplus/loggingmacros.h;headers-compilation; -16;headers.at:1;separate compilation of log4cplus/loglevel.h;headers-compilation; -17;headers.at:1;separate compilation of log4cplus/mdc.h;headers-compilation; -18;headers.at:1;separate compilation of log4cplus/msttsappender.h;headers-compilation; -19;headers.at:1;separate compilation of log4cplus/ndc.h;headers-compilation; -20;headers.at:1;separate compilation of log4cplus/nteventlogappender.h;headers-compilation; -21;headers.at:1;separate compilation of log4cplus/nullappender.h;headers-compilation; -22;headers.at:1;separate compilation of log4cplus/qt4debugappender.h;headers-compilation; -23;headers.at:1;separate compilation of log4cplus/socketappender.h;headers-compilation; -24;headers.at:1;separate compilation of log4cplus/streams.h;headers-compilation; -25;headers.at:1;separate compilation of log4cplus/syslogappender.h;headers-compilation; -26;headers.at:1;separate compilation of log4cplus/tchar.h;headers-compilation; -27;headers.at:1;separate compilation of log4cplus/tracelogger.h;headers-compilation; -28;headers.at:1;separate compilation of log4cplus/tstring.h;headers-compilation; -29;headers.at:1;separate compilation of log4cplus/version.h;headers-compilation; -30;headers.at:1;separate compilation of log4cplus/win32consoleappender.h;headers-compilation; -31;headers.at:1;separate compilation of log4cplus/win32debugappender.h;headers-compilation; -32;headers.at:1;separate compilation of log4cplus/helpers/appenderattachableimpl.h;headers-compilation; -33;headers.at:1;separate compilation of log4cplus/helpers/connectorthread.h;headers-compilation; -34;headers.at:1;separate compilation of log4cplus/helpers/fileinfo.h;headers-compilation; -35;headers.at:1;separate compilation of log4cplus/helpers/lockfile.h;headers-compilation; -36;headers.at:1;separate compilation of log4cplus/helpers/loglog.h;headers-compilation; -37;headers.at:1;separate compilation of log4cplus/helpers/logloguser.h;headers-compilation; -38;headers.at:1;separate compilation of log4cplus/helpers/pointer.h;headers-compilation; -39;headers.at:1;separate compilation of log4cplus/helpers/property.h;headers-compilation; -40;headers.at:1;separate compilation of log4cplus/helpers/queue.h;headers-compilation; -41;headers.at:1;separate compilation of log4cplus/helpers/sleep.h;headers-compilation; -42;headers.at:1;separate compilation of log4cplus/helpers/snprintf.h;headers-compilation; -43;headers.at:1;separate compilation of log4cplus/helpers/socket.h;headers-compilation; -44;headers.at:1;separate compilation of log4cplus/helpers/socketbuffer.h;headers-compilation; -45;headers.at:1;separate compilation of log4cplus/helpers/stringhelper.h;headers-compilation; -46;headers.at:1;separate compilation of log4cplus/helpers/timehelper.h;headers-compilation; -47;headers.at:1;separate compilation of log4cplus/spi/appenderattachable.h;headers-compilation; -48;headers.at:1;separate compilation of log4cplus/spi/factory.h;headers-compilation; -49;headers.at:1;separate compilation of log4cplus/spi/filter.h;headers-compilation; -50;headers.at:1;separate compilation of log4cplus/spi/loggerfactory.h;headers-compilation; -51;headers.at:1;separate compilation of log4cplus/spi/loggerimpl.h;headers-compilation; -52;headers.at:1;separate compilation of log4cplus/spi/loggingevent.h;headers-compilation; -53;headers.at:1;separate compilation of log4cplus/spi/objectregistry.h;headers-compilation; -54;headers.at:1;separate compilation of log4cplus/spi/rootlogger.h;headers-compilation; -55;headers.at:1;separate compilation of log4cplus/thread/syncprims-pub-impl.h;headers-compilation; -56;headers.at:1;separate compilation of log4cplus/thread/syncprims.h;headers-compilation; -57;headers.at:1;separate compilation of log4cplus/thread/threads.h;headers-compilation; -58;appender_test.at:1;appender_test;appenders; -59;configandwatch_test.at:1;configandwatch_test;appenders; -60;customloglevel_test.at:1;customloglevel_test;appenders; -61;fileappender_test.at:1;fileappender_test;appenders; -62;filter_test.at:1;filter_test;appenders; -63;hierarchy_test.at:1;hierarchy_test;appenders; -64;loglog_test.at:1;loglog_test;appenders; -65;ndc_test.at:1;ndc_test;appenders; -66;ostream_test.at:1;ostream_test;appenders; -67;patternlayout_test.at:1;patternlayout_test;appenders; -68;performance_test.at:1;performance_test;appenders; -69;priority_test.at:1;priority_test;appenders; -70;propertyconfig_test.at:1;propertyconfig_test;appenders; -71;thread_test.at:1;thread_test;appenders; -72;timeformat_test.at:1;timeformat_test;appenders; +13;headers.at:1;separate compilation of log4cplus/log4cplus.h;headers-compilation; +14;headers.at:1;separate compilation of log4cplus/log4judpappender.h;headers-compilation; +15;headers.at:1;separate compilation of log4cplus/logger.h;headers-compilation; +16;headers.at:1;separate compilation of log4cplus/loggingmacros.h;headers-compilation; +17;headers.at:1;separate compilation of log4cplus/loglevel.h;headers-compilation; +18;headers.at:1;separate compilation of log4cplus/mdc.h;headers-compilation; +19;headers.at:1;separate compilation of log4cplus/msttsappender.h;headers-compilation; +20;headers.at:1;separate compilation of log4cplus/ndc.h;headers-compilation; +21;headers.at:1;separate compilation of log4cplus/nteventlogappender.h;headers-compilation; +22;headers.at:1;separate compilation of log4cplus/nullappender.h;headers-compilation; +23;headers.at:1;separate compilation of log4cplus/qt4debugappender.h;headers-compilation; +24;headers.at:1;separate compilation of log4cplus/socketappender.h;headers-compilation; +25;headers.at:1;separate compilation of log4cplus/streams.h;headers-compilation; +26;headers.at:1;separate compilation of log4cplus/syslogappender.h;headers-compilation; +27;headers.at:1;separate compilation of log4cplus/tchar.h;headers-compilation; +28;headers.at:1;separate compilation of log4cplus/tracelogger.h;headers-compilation; +29;headers.at:1;separate compilation of log4cplus/tstring.h;headers-compilation; +30;headers.at:1;separate compilation of log4cplus/version.h;headers-compilation; +31;headers.at:1;separate compilation of log4cplus/win32consoleappender.h;headers-compilation; +32;headers.at:1;separate compilation of log4cplus/win32debugappender.h;headers-compilation; +33;headers.at:1;separate compilation of log4cplus/helpers/appenderattachableimpl.h;headers-compilation; +34;headers.at:1;separate compilation of log4cplus/helpers/connectorthread.h;headers-compilation; +35;headers.at:1;separate compilation of log4cplus/helpers/fileinfo.h;headers-compilation; +36;headers.at:1;separate compilation of log4cplus/helpers/lockfile.h;headers-compilation; +37;headers.at:1;separate compilation of log4cplus/helpers/loglog.h;headers-compilation; +38;headers.at:1;separate compilation of log4cplus/helpers/logloguser.h;headers-compilation; +39;headers.at:1;separate compilation of log4cplus/helpers/pointer.h;headers-compilation; +40;headers.at:1;separate compilation of log4cplus/helpers/property.h;headers-compilation; +41;headers.at:1;separate compilation of log4cplus/helpers/queue.h;headers-compilation; +42;headers.at:1;separate compilation of log4cplus/helpers/sleep.h;headers-compilation; +43;headers.at:1;separate compilation of log4cplus/helpers/snprintf.h;headers-compilation; +44;headers.at:1;separate compilation of log4cplus/helpers/socket.h;headers-compilation; +45;headers.at:1;separate compilation of log4cplus/helpers/socketbuffer.h;headers-compilation; +46;headers.at:1;separate compilation of log4cplus/helpers/stringhelper.h;headers-compilation; +47;headers.at:1;separate compilation of log4cplus/helpers/timehelper.h;headers-compilation; +48;headers.at:1;separate compilation of log4cplus/spi/appenderattachable.h;headers-compilation; +49;headers.at:1;separate compilation of log4cplus/spi/factory.h;headers-compilation; +50;headers.at:1;separate compilation of log4cplus/spi/filter.h;headers-compilation; +51;headers.at:1;separate compilation of log4cplus/spi/loggerfactory.h;headers-compilation; +52;headers.at:1;separate compilation of log4cplus/spi/loggerimpl.h;headers-compilation; +53;headers.at:1;separate compilation of log4cplus/spi/loggingevent.h;headers-compilation; +54;headers.at:1;separate compilation of log4cplus/spi/objectregistry.h;headers-compilation; +55;headers.at:1;separate compilation of log4cplus/spi/rootlogger.h;headers-compilation; +56;headers.at:1;separate compilation of log4cplus/thread/syncprims-pub-impl.h;headers-compilation; +57;headers.at:1;separate compilation of log4cplus/thread/syncprims.h;headers-compilation; +58;headers.at:1;separate compilation of log4cplus/thread/threads.h;headers-compilation; +59;appender_test.at:1;appender_test;appenders; +60;configandwatch_test.at:1;configandwatch_test;appenders; +61;customloglevel_test.at:1;customloglevel_test;appenders; +62;fileappender_test.at:1;fileappender_test;appenders; +63;filter_test.at:1;filter_test;appenders; +64;hierarchy_test.at:1;hierarchy_test;appenders; +65;loglog_test.at:1;loglog_test;appenders; +66;ndc_test.at:1;ndc_test;appenders; +67;ostream_test.at:1;ostream_test;appenders; +68;patternlayout_test.at:1;patternlayout_test;appenders; +69;performance_test.at:1;performance_test;appenders; +70;priority_test.at:1;priority_test;appenders; +71;propertyconfig_test.at:1;propertyconfig_test;appenders; +72;thread_test.at:1;thread_test;appenders; +73;timeformat_test.at:1;timeformat_test;appenders; " # List of the all the test groups. at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'` @@ -675,7 +676,7 @@ at_fn_validate_ranges () for at_grp do eval at_value=\$$at_grp - if test $at_value -lt 1 || test $at_value -gt 72; then + if test $at_value -lt 1 || test $at_value -gt 73; then $as_echo "invalid test group: $at_value" >&2 exit 1 fi @@ -1035,7 +1036,7 @@ esac # Category starts at test group 1. at_banner_text_1="separate headers compilation" # Banner 2. testsuite.at:14 -# Category starts at test group 58. +# Category starts at test group 59. at_banner_text_2="other tests" # Take any -C into account. @@ -2613,7 +2614,7 @@ read at_status <"$at_status_file" #AT_STOP_12 #AT_START_13 at_fn_group_banner 13 'headers.at:1' \ - "separate compilation of log4cplus/log4judpappender.h" "" 1 + "separate compilation of log4cplus/log4cplus.h" " " 1 at_xfail=no ( $as_echo "13. $at_setup_line: testing $at_desc ..." @@ -2622,9 +2623,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/log4judpappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/log4judpappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/log4judpappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/log4cplus.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/log4cplus.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/log4cplus.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2659,7 +2660,7 @@ read at_status <"$at_status_file" #AT_STOP_13 #AT_START_14 at_fn_group_banner 14 'headers.at:1' \ - "separate compilation of log4cplus/logger.h" " " 1 + "separate compilation of log4cplus/log4judpappender.h" "" 1 at_xfail=no ( $as_echo "14. $at_setup_line: testing $at_desc ..." @@ -2668,9 +2669,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/logger.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/logger.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/logger.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/log4judpappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/log4judpappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/log4judpappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2705,7 +2706,7 @@ read at_status <"$at_status_file" #AT_STOP_14 #AT_START_15 at_fn_group_banner 15 'headers.at:1' \ - "separate compilation of log4cplus/loggingmacros.h" "" 1 + "separate compilation of log4cplus/logger.h" " " 1 at_xfail=no ( $as_echo "15. $at_setup_line: testing $at_desc ..." @@ -2714,9 +2715,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/loggingmacros.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/loggingmacros.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/loggingmacros.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/logger.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/logger.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/logger.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2751,7 +2752,7 @@ read at_status <"$at_status_file" #AT_STOP_15 #AT_START_16 at_fn_group_banner 16 'headers.at:1' \ - "separate compilation of log4cplus/loglevel.h" " " 1 + "separate compilation of log4cplus/loggingmacros.h" "" 1 at_xfail=no ( $as_echo "16. $at_setup_line: testing $at_desc ..." @@ -2760,9 +2761,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/loglevel.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/loglevel.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/loglevel.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/loggingmacros.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/loggingmacros.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/loggingmacros.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2797,7 +2798,7 @@ read at_status <"$at_status_file" #AT_STOP_16 #AT_START_17 at_fn_group_banner 17 'headers.at:1' \ - "separate compilation of log4cplus/mdc.h" " " 1 + "separate compilation of log4cplus/loglevel.h" " " 1 at_xfail=no ( $as_echo "17. $at_setup_line: testing $at_desc ..." @@ -2806,9 +2807,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/mdc.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/mdc.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/mdc.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/loglevel.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/loglevel.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/loglevel.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2843,7 +2844,7 @@ read at_status <"$at_status_file" #AT_STOP_17 #AT_START_18 at_fn_group_banner 18 'headers.at:1' \ - "separate compilation of log4cplus/msttsappender.h" "" 1 + "separate compilation of log4cplus/mdc.h" " " 1 at_xfail=no ( $as_echo "18. $at_setup_line: testing $at_desc ..." @@ -2852,9 +2853,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/msttsappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/msttsappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/msttsappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/mdc.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/mdc.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/mdc.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2889,7 +2890,7 @@ read at_status <"$at_status_file" #AT_STOP_18 #AT_START_19 at_fn_group_banner 19 'headers.at:1' \ - "separate compilation of log4cplus/ndc.h" " " 1 + "separate compilation of log4cplus/msttsappender.h" "" 1 at_xfail=no ( $as_echo "19. $at_setup_line: testing $at_desc ..." @@ -2898,9 +2899,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/ndc.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/ndc.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/ndc.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/msttsappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/msttsappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/msttsappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2935,7 +2936,7 @@ read at_status <"$at_status_file" #AT_STOP_19 #AT_START_20 at_fn_group_banner 20 'headers.at:1' \ - "separate compilation of log4cplus/nteventlogappender.h" "" 1 + "separate compilation of log4cplus/ndc.h" " " 1 at_xfail=no ( $as_echo "20. $at_setup_line: testing $at_desc ..." @@ -2944,9 +2945,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/nteventlogappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/nteventlogappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/nteventlogappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/ndc.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/ndc.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/ndc.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2981,7 +2982,7 @@ read at_status <"$at_status_file" #AT_STOP_20 #AT_START_21 at_fn_group_banner 21 'headers.at:1' \ - "separate compilation of log4cplus/nullappender.h" "" 1 + "separate compilation of log4cplus/nteventlogappender.h" "" 1 at_xfail=no ( $as_echo "21. $at_setup_line: testing $at_desc ..." @@ -2990,9 +2991,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/nullappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/nullappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/nullappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/nteventlogappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/nteventlogappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/nteventlogappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3027,7 +3028,7 @@ read at_status <"$at_status_file" #AT_STOP_21 #AT_START_22 at_fn_group_banner 22 'headers.at:1' \ - "separate compilation of log4cplus/qt4debugappender.h" "" 1 + "separate compilation of log4cplus/nullappender.h" "" 1 at_xfail=no ( $as_echo "22. $at_setup_line: testing $at_desc ..." @@ -3036,9 +3037,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/qt4debugappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/qt4debugappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/qt4debugappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/nullappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/nullappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/nullappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3073,7 +3074,7 @@ read at_status <"$at_status_file" #AT_STOP_22 #AT_START_23 at_fn_group_banner 23 'headers.at:1' \ - "separate compilation of log4cplus/socketappender.h" "" 1 + "separate compilation of log4cplus/qt4debugappender.h" "" 1 at_xfail=no ( $as_echo "23. $at_setup_line: testing $at_desc ..." @@ -3082,9 +3083,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/socketappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/socketappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/socketappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/qt4debugappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/qt4debugappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/qt4debugappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3119,7 +3120,7 @@ read at_status <"$at_status_file" #AT_STOP_23 #AT_START_24 at_fn_group_banner 24 'headers.at:1' \ - "separate compilation of log4cplus/streams.h" " " 1 + "separate compilation of log4cplus/socketappender.h" "" 1 at_xfail=no ( $as_echo "24. $at_setup_line: testing $at_desc ..." @@ -3128,9 +3129,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/streams.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/streams.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/streams.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/socketappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/socketappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/socketappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3165,7 +3166,7 @@ read at_status <"$at_status_file" #AT_STOP_24 #AT_START_25 at_fn_group_banner 25 'headers.at:1' \ - "separate compilation of log4cplus/syslogappender.h" "" 1 + "separate compilation of log4cplus/streams.h" " " 1 at_xfail=no ( $as_echo "25. $at_setup_line: testing $at_desc ..." @@ -3174,9 +3175,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/syslogappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/syslogappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/syslogappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/streams.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/streams.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/streams.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3211,7 +3212,7 @@ read at_status <"$at_status_file" #AT_STOP_25 #AT_START_26 at_fn_group_banner 26 'headers.at:1' \ - "separate compilation of log4cplus/tchar.h" " " 1 + "separate compilation of log4cplus/syslogappender.h" "" 1 at_xfail=no ( $as_echo "26. $at_setup_line: testing $at_desc ..." @@ -3220,9 +3221,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tchar.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tchar.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/tchar.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/syslogappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/syslogappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/syslogappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3257,7 +3258,7 @@ read at_status <"$at_status_file" #AT_STOP_26 #AT_START_27 at_fn_group_banner 27 'headers.at:1' \ - "separate compilation of log4cplus/tracelogger.h" "" 1 + "separate compilation of log4cplus/tchar.h" " " 1 at_xfail=no ( $as_echo "27. $at_setup_line: testing $at_desc ..." @@ -3266,9 +3267,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tracelogger.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tracelogger.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/tracelogger.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tchar.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tchar.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/tchar.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3303,7 +3304,7 @@ read at_status <"$at_status_file" #AT_STOP_27 #AT_START_28 at_fn_group_banner 28 'headers.at:1' \ - "separate compilation of log4cplus/tstring.h" " " 1 + "separate compilation of log4cplus/tracelogger.h" "" 1 at_xfail=no ( $as_echo "28. $at_setup_line: testing $at_desc ..." @@ -3312,9 +3313,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tstring.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tstring.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/tstring.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tracelogger.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tracelogger.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/tracelogger.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3349,7 +3350,7 @@ read at_status <"$at_status_file" #AT_STOP_28 #AT_START_29 at_fn_group_banner 29 'headers.at:1' \ - "separate compilation of log4cplus/version.h" " " 1 + "separate compilation of log4cplus/tstring.h" " " 1 at_xfail=no ( $as_echo "29. $at_setup_line: testing $at_desc ..." @@ -3358,9 +3359,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/version.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/version.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/version.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tstring.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tstring.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/tstring.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3395,7 +3396,7 @@ read at_status <"$at_status_file" #AT_STOP_29 #AT_START_30 at_fn_group_banner 30 'headers.at:1' \ - "separate compilation of log4cplus/win32consoleappender.h" "" 1 + "separate compilation of log4cplus/version.h" " " 1 at_xfail=no ( $as_echo "30. $at_setup_line: testing $at_desc ..." @@ -3404,9 +3405,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/win32consoleappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/win32consoleappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/win32consoleappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/version.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/version.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/version.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3441,7 +3442,7 @@ read at_status <"$at_status_file" #AT_STOP_30 #AT_START_31 at_fn_group_banner 31 'headers.at:1' \ - "separate compilation of log4cplus/win32debugappender.h" "" 1 + "separate compilation of log4cplus/win32consoleappender.h" "" 1 at_xfail=no ( $as_echo "31. $at_setup_line: testing $at_desc ..." @@ -3450,9 +3451,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/win32debugappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/win32debugappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/win32debugappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/win32consoleappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/win32consoleappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/win32consoleappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3487,7 +3488,7 @@ read at_status <"$at_status_file" #AT_STOP_31 #AT_START_32 at_fn_group_banner 32 'headers.at:1' \ - "separate compilation of log4cplus/helpers/appenderattachableimpl.h" "" 1 + "separate compilation of log4cplus/win32debugappender.h" "" 1 at_xfail=no ( $as_echo "32. $at_setup_line: testing $at_desc ..." @@ -3496,9 +3497,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/appenderattachableimpl.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/appenderattachableimpl.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/appenderattachableimpl.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/win32debugappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/win32debugappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/win32debugappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3533,7 +3534,7 @@ read at_status <"$at_status_file" #AT_STOP_32 #AT_START_33 at_fn_group_banner 33 'headers.at:1' \ - "separate compilation of log4cplus/helpers/connectorthread.h" "" 1 + "separate compilation of log4cplus/helpers/appenderattachableimpl.h" "" 1 at_xfail=no ( $as_echo "33. $at_setup_line: testing $at_desc ..." @@ -3542,9 +3543,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/connectorthread.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/connectorthread.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/connectorthread.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/appenderattachableimpl.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/appenderattachableimpl.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/appenderattachableimpl.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3579,7 +3580,7 @@ read at_status <"$at_status_file" #AT_STOP_33 #AT_START_34 at_fn_group_banner 34 'headers.at:1' \ - "separate compilation of log4cplus/helpers/fileinfo.h" "" 1 + "separate compilation of log4cplus/helpers/connectorthread.h" "" 1 at_xfail=no ( $as_echo "34. $at_setup_line: testing $at_desc ..." @@ -3588,9 +3589,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/fileinfo.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/fileinfo.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/fileinfo.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/connectorthread.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/connectorthread.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/connectorthread.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3625,7 +3626,7 @@ read at_status <"$at_status_file" #AT_STOP_34 #AT_START_35 at_fn_group_banner 35 'headers.at:1' \ - "separate compilation of log4cplus/helpers/lockfile.h" "" 1 + "separate compilation of log4cplus/helpers/fileinfo.h" "" 1 at_xfail=no ( $as_echo "35. $at_setup_line: testing $at_desc ..." @@ -3634,9 +3635,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/lockfile.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/lockfile.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/lockfile.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/fileinfo.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/fileinfo.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/fileinfo.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3671,7 +3672,7 @@ read at_status <"$at_status_file" #AT_STOP_35 #AT_START_36 at_fn_group_banner 36 'headers.at:1' \ - "separate compilation of log4cplus/helpers/loglog.h" "" 1 + "separate compilation of log4cplus/helpers/lockfile.h" "" 1 at_xfail=no ( $as_echo "36. $at_setup_line: testing $at_desc ..." @@ -3680,9 +3681,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/loglog.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/loglog.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/loglog.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/lockfile.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/lockfile.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/lockfile.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3717,7 +3718,7 @@ read at_status <"$at_status_file" #AT_STOP_36 #AT_START_37 at_fn_group_banner 37 'headers.at:1' \ - "separate compilation of log4cplus/helpers/logloguser.h" "" 1 + "separate compilation of log4cplus/helpers/loglog.h" "" 1 at_xfail=no ( $as_echo "37. $at_setup_line: testing $at_desc ..." @@ -3726,9 +3727,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/logloguser.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/logloguser.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/logloguser.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/loglog.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/loglog.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/loglog.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3763,7 +3764,7 @@ read at_status <"$at_status_file" #AT_STOP_37 #AT_START_38 at_fn_group_banner 38 'headers.at:1' \ - "separate compilation of log4cplus/helpers/pointer.h" "" 1 + "separate compilation of log4cplus/helpers/logloguser.h" "" 1 at_xfail=no ( $as_echo "38. $at_setup_line: testing $at_desc ..." @@ -3772,9 +3773,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/pointer.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/pointer.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/pointer.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/logloguser.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/logloguser.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/logloguser.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3809,7 +3810,7 @@ read at_status <"$at_status_file" #AT_STOP_38 #AT_START_39 at_fn_group_banner 39 'headers.at:1' \ - "separate compilation of log4cplus/helpers/property.h" "" 1 + "separate compilation of log4cplus/helpers/pointer.h" "" 1 at_xfail=no ( $as_echo "39. $at_setup_line: testing $at_desc ..." @@ -3818,9 +3819,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/property.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/property.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/property.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/pointer.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/pointer.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/pointer.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3855,7 +3856,7 @@ read at_status <"$at_status_file" #AT_STOP_39 #AT_START_40 at_fn_group_banner 40 'headers.at:1' \ - "separate compilation of log4cplus/helpers/queue.h" "" 1 + "separate compilation of log4cplus/helpers/property.h" "" 1 at_xfail=no ( $as_echo "40. $at_setup_line: testing $at_desc ..." @@ -3864,9 +3865,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/queue.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/queue.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/queue.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/property.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/property.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/property.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3901,7 +3902,7 @@ read at_status <"$at_status_file" #AT_STOP_40 #AT_START_41 at_fn_group_banner 41 'headers.at:1' \ - "separate compilation of log4cplus/helpers/sleep.h" "" 1 + "separate compilation of log4cplus/helpers/queue.h" "" 1 at_xfail=no ( $as_echo "41. $at_setup_line: testing $at_desc ..." @@ -3910,9 +3911,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/sleep.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/sleep.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/sleep.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/queue.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/queue.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/queue.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3947,7 +3948,7 @@ read at_status <"$at_status_file" #AT_STOP_41 #AT_START_42 at_fn_group_banner 42 'headers.at:1' \ - "separate compilation of log4cplus/helpers/snprintf.h" "" 1 + "separate compilation of log4cplus/helpers/sleep.h" "" 1 at_xfail=no ( $as_echo "42. $at_setup_line: testing $at_desc ..." @@ -3956,9 +3957,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/snprintf.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/snprintf.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/snprintf.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/sleep.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/sleep.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/sleep.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3993,7 +3994,7 @@ read at_status <"$at_status_file" #AT_STOP_42 #AT_START_43 at_fn_group_banner 43 'headers.at:1' \ - "separate compilation of log4cplus/helpers/socket.h" "" 1 + "separate compilation of log4cplus/helpers/snprintf.h" "" 1 at_xfail=no ( $as_echo "43. $at_setup_line: testing $at_desc ..." @@ -4002,9 +4003,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/socket.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/socket.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/socket.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/snprintf.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/snprintf.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/snprintf.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4039,7 +4040,7 @@ read at_status <"$at_status_file" #AT_STOP_43 #AT_START_44 at_fn_group_banner 44 'headers.at:1' \ - "separate compilation of log4cplus/helpers/socketbuffer.h" "" 1 + "separate compilation of log4cplus/helpers/socket.h" "" 1 at_xfail=no ( $as_echo "44. $at_setup_line: testing $at_desc ..." @@ -4048,9 +4049,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/socketbuffer.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/socketbuffer.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/socketbuffer.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/socket.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/socket.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/socket.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4085,7 +4086,7 @@ read at_status <"$at_status_file" #AT_STOP_44 #AT_START_45 at_fn_group_banner 45 'headers.at:1' \ - "separate compilation of log4cplus/helpers/stringhelper.h" "" 1 + "separate compilation of log4cplus/helpers/socketbuffer.h" "" 1 at_xfail=no ( $as_echo "45. $at_setup_line: testing $at_desc ..." @@ -4094,9 +4095,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/stringhelper.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/stringhelper.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/stringhelper.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/socketbuffer.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/socketbuffer.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/socketbuffer.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4131,7 +4132,7 @@ read at_status <"$at_status_file" #AT_STOP_45 #AT_START_46 at_fn_group_banner 46 'headers.at:1' \ - "separate compilation of log4cplus/helpers/timehelper.h" "" 1 + "separate compilation of log4cplus/helpers/stringhelper.h" "" 1 at_xfail=no ( $as_echo "46. $at_setup_line: testing $at_desc ..." @@ -4140,9 +4141,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/timehelper.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/timehelper.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/timehelper.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/stringhelper.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/stringhelper.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/stringhelper.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4177,7 +4178,7 @@ read at_status <"$at_status_file" #AT_STOP_46 #AT_START_47 at_fn_group_banner 47 'headers.at:1' \ - "separate compilation of log4cplus/spi/appenderattachable.h" "" 1 + "separate compilation of log4cplus/helpers/timehelper.h" "" 1 at_xfail=no ( $as_echo "47. $at_setup_line: testing $at_desc ..." @@ -4186,9 +4187,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/appenderattachable.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/appenderattachable.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/appenderattachable.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/timehelper.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/timehelper.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/timehelper.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4223,7 +4224,7 @@ read at_status <"$at_status_file" #AT_STOP_47 #AT_START_48 at_fn_group_banner 48 'headers.at:1' \ - "separate compilation of log4cplus/spi/factory.h" "" 1 + "separate compilation of log4cplus/spi/appenderattachable.h" "" 1 at_xfail=no ( $as_echo "48. $at_setup_line: testing $at_desc ..." @@ -4232,9 +4233,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/factory.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/factory.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/factory.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/appenderattachable.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/appenderattachable.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/appenderattachable.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4269,7 +4270,7 @@ read at_status <"$at_status_file" #AT_STOP_48 #AT_START_49 at_fn_group_banner 49 'headers.at:1' \ - "separate compilation of log4cplus/spi/filter.h" " " 1 + "separate compilation of log4cplus/spi/factory.h" "" 1 at_xfail=no ( $as_echo "49. $at_setup_line: testing $at_desc ..." @@ -4278,9 +4279,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/filter.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/filter.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/filter.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/factory.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/factory.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/factory.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4315,7 +4316,7 @@ read at_status <"$at_status_file" #AT_STOP_49 #AT_START_50 at_fn_group_banner 50 'headers.at:1' \ - "separate compilation of log4cplus/spi/loggerfactory.h" "" 1 + "separate compilation of log4cplus/spi/filter.h" " " 1 at_xfail=no ( $as_echo "50. $at_setup_line: testing $at_desc ..." @@ -4324,9 +4325,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggerfactory.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggerfactory.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggerfactory.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/filter.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/filter.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/filter.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4361,7 +4362,7 @@ read at_status <"$at_status_file" #AT_STOP_50 #AT_START_51 at_fn_group_banner 51 'headers.at:1' \ - "separate compilation of log4cplus/spi/loggerimpl.h" "" 1 + "separate compilation of log4cplus/spi/loggerfactory.h" "" 1 at_xfail=no ( $as_echo "51. $at_setup_line: testing $at_desc ..." @@ -4370,9 +4371,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggerimpl.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggerimpl.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggerimpl.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggerfactory.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggerfactory.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggerfactory.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4407,7 +4408,7 @@ read at_status <"$at_status_file" #AT_STOP_51 #AT_START_52 at_fn_group_banner 52 'headers.at:1' \ - "separate compilation of log4cplus/spi/loggingevent.h" "" 1 + "separate compilation of log4cplus/spi/loggerimpl.h" "" 1 at_xfail=no ( $as_echo "52. $at_setup_line: testing $at_desc ..." @@ -4416,9 +4417,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggingevent.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggingevent.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggingevent.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggerimpl.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggerimpl.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggerimpl.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4453,7 +4454,7 @@ read at_status <"$at_status_file" #AT_STOP_52 #AT_START_53 at_fn_group_banner 53 'headers.at:1' \ - "separate compilation of log4cplus/spi/objectregistry.h" "" 1 + "separate compilation of log4cplus/spi/loggingevent.h" "" 1 at_xfail=no ( $as_echo "53. $at_setup_line: testing $at_desc ..." @@ -4462,9 +4463,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/objectregistry.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/objectregistry.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/objectregistry.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggingevent.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggingevent.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggingevent.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4499,7 +4500,7 @@ read at_status <"$at_status_file" #AT_STOP_53 #AT_START_54 at_fn_group_banner 54 'headers.at:1' \ - "separate compilation of log4cplus/spi/rootlogger.h" "" 1 + "separate compilation of log4cplus/spi/objectregistry.h" "" 1 at_xfail=no ( $as_echo "54. $at_setup_line: testing $at_desc ..." @@ -4508,9 +4509,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/rootlogger.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/rootlogger.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/rootlogger.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/objectregistry.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/objectregistry.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/objectregistry.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4545,7 +4546,7 @@ read at_status <"$at_status_file" #AT_STOP_54 #AT_START_55 at_fn_group_banner 55 'headers.at:1' \ - "separate compilation of log4cplus/thread/syncprims-pub-impl.h" "" 1 + "separate compilation of log4cplus/spi/rootlogger.h" "" 1 at_xfail=no ( $as_echo "55. $at_setup_line: testing $at_desc ..." @@ -4554,9 +4555,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/syncprims-pub-impl.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/syncprims-pub-impl.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/thread/syncprims-pub-impl.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/rootlogger.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/rootlogger.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/rootlogger.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4591,7 +4592,7 @@ read at_status <"$at_status_file" #AT_STOP_55 #AT_START_56 at_fn_group_banner 56 'headers.at:1' \ - "separate compilation of log4cplus/thread/syncprims.h" "" 1 + "separate compilation of log4cplus/thread/syncprims-pub-impl.h" "" 1 at_xfail=no ( $as_echo "56. $at_setup_line: testing $at_desc ..." @@ -4600,9 +4601,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/syncprims.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/syncprims.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/thread/syncprims.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/syncprims-pub-impl.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/syncprims-pub-impl.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/thread/syncprims-pub-impl.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4637,7 +4638,7 @@ read at_status <"$at_status_file" #AT_STOP_56 #AT_START_57 at_fn_group_banner 57 'headers.at:1' \ - "separate compilation of log4cplus/thread/threads.h" "" 1 + "separate compilation of log4cplus/thread/syncprims.h" "" 1 at_xfail=no ( $as_echo "57. $at_setup_line: testing $at_desc ..." @@ -4645,6 +4646,52 @@ at_xfail=no + { set +x +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/syncprims.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/syncprims.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/thread/syncprims.h\"">test.cxx +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/headers.at:1" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + { set +x +$as_echo "$at_srcdir/headers.at:1: \$CXX \$CPPFLAGS \$CXXFLAGS -c \"test.cxx\"" +at_fn_check_prepare_dynamic "$CXX $CPPFLAGS $CXXFLAGS -c \"test.cxx\"" "headers.at:1" +( $at_check_trace; $CXX $CPPFLAGS $CXXFLAGS -c "test.cxx" +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/headers.at:1" +$at_failed && at_fn_log_failure \ +"test.cxx" +$at_traceon; } + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_57 +#AT_START_58 +at_fn_group_banner 58 'headers.at:1' \ + "separate compilation of log4cplus/thread/threads.h" "" 1 +at_xfail=no +( + $as_echo "58. $at_setup_line: testing $at_desc ..." + $at_traceon + + + { set +x $as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/threads.h\\\"\">test.cxx" at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/threads.h\\\"\">test.cxx" "headers.at:1" @@ -4680,13 +4727,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_57 -#AT_START_58 -at_fn_group_banner 58 'appender_test.at:1' \ +#AT_STOP_58 +#AT_START_59 +at_fn_group_banner 59 'appender_test.at:1' \ "appender_test" " " 2 at_xfail=no ( - $as_echo "58. $at_setup_line: testing $at_desc ..." + $as_echo "59. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4722,13 +4769,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_58 -#AT_START_59 -at_fn_group_banner 59 'configandwatch_test.at:1' \ +#AT_STOP_59 +#AT_START_60 +at_fn_group_banner 60 'configandwatch_test.at:1' \ "configandwatch_test" " " 2 at_xfail=no ( - $as_echo "59. $at_setup_line: testing $at_desc ..." + $as_echo "60. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4780,13 +4827,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_59 -#AT_START_60 -at_fn_group_banner 60 'customloglevel_test.at:1' \ +#AT_STOP_60 +#AT_START_61 +at_fn_group_banner 61 'customloglevel_test.at:1' \ "customloglevel_test" " " 2 at_xfail=no ( - $as_echo "60. $at_setup_line: testing $at_desc ..." + $as_echo "61. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4822,13 +4869,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_60 -#AT_START_61 -at_fn_group_banner 61 'fileappender_test.at:1' \ +#AT_STOP_61 +#AT_START_62 +at_fn_group_banner 62 'fileappender_test.at:1' \ "fileappender_test" " " 2 at_xfail=no ( - $as_echo "61. $at_setup_line: testing $at_desc ..." + $as_echo "62. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4877,13 +4924,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_61 -#AT_START_62 -at_fn_group_banner 62 'filter_test.at:1' \ +#AT_STOP_62 +#AT_START_63 +at_fn_group_banner 63 'filter_test.at:1' \ "filter_test" " " 2 at_xfail=no ( - $as_echo "62. $at_setup_line: testing $at_desc ..." + $as_echo "63. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5027,13 +5074,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_62 -#AT_START_63 -at_fn_group_banner 63 'hierarchy_test.at:1' \ +#AT_STOP_63 +#AT_START_64 +at_fn_group_banner 64 'hierarchy_test.at:1' \ "hierarchy_test" " " 2 at_xfail=no ( - $as_echo "63. $at_setup_line: testing $at_desc ..." + $as_echo "64. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5069,13 +5116,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_63 -#AT_START_64 -at_fn_group_banner 64 'loglog_test.at:1' \ +#AT_STOP_64 +#AT_START_65 +at_fn_group_banner 65 'loglog_test.at:1' \ "loglog_test" " " 2 at_xfail=no ( - $as_echo "64. $at_setup_line: testing $at_desc ..." + $as_echo "65. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5124,13 +5171,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_64 -#AT_START_65 -at_fn_group_banner 65 'ndc_test.at:1' \ +#AT_STOP_65 +#AT_START_66 +at_fn_group_banner 66 'ndc_test.at:1' \ "ndc_test" " " 2 at_xfail=no ( - $as_echo "65. $at_setup_line: testing $at_desc ..." + $as_echo "66. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5166,13 +5213,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_65 -#AT_START_66 -at_fn_group_banner 66 'ostream_test.at:1' \ +#AT_STOP_66 +#AT_START_67 +at_fn_group_banner 67 'ostream_test.at:1' \ "ostream_test" " " 2 at_xfail=no ( - $as_echo "66. $at_setup_line: testing $at_desc ..." + $as_echo "67. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5208,13 +5255,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_66 -#AT_START_67 -at_fn_group_banner 67 'patternlayout_test.at:1' \ +#AT_STOP_67 +#AT_START_68 +at_fn_group_banner 68 'patternlayout_test.at:1' \ "patternlayout_test" " " 2 at_xfail=no ( - $as_echo "67. $at_setup_line: testing $at_desc ..." + $as_echo "68. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5260,13 +5307,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_67 -#AT_START_68 -at_fn_group_banner 68 'performance_test.at:1' \ +#AT_STOP_68 +#AT_START_69 +at_fn_group_banner 69 'performance_test.at:1' \ "performance_test" " " 2 at_xfail=no ( - $as_echo "68. $at_setup_line: testing $at_desc ..." + $as_echo "69. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5315,13 +5362,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_68 -#AT_START_69 -at_fn_group_banner 69 'priority_test.at:1' \ +#AT_STOP_69 +#AT_START_70 +at_fn_group_banner 70 'priority_test.at:1' \ "priority_test" " " 2 at_xfail=no ( - $as_echo "69. $at_setup_line: testing $at_desc ..." + $as_echo "70. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5357,13 +5404,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_69 -#AT_START_70 -at_fn_group_banner 70 'propertyconfig_test.at:1' \ +#AT_STOP_70 +#AT_START_71 +at_fn_group_banner 71 'propertyconfig_test.at:1' \ "propertyconfig_test" " " 2 at_xfail=no ( - $as_echo "70. $at_setup_line: testing $at_desc ..." + $as_echo "71. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5438,13 +5485,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_70 -#AT_START_71 -at_fn_group_banner 71 'thread_test.at:1' \ +#AT_STOP_71 +#AT_START_72 +at_fn_group_banner 72 'thread_test.at:1' \ "thread_test" " " 2 at_xfail=no ( - $as_echo "71. $at_setup_line: testing $at_desc ..." + $as_echo "72. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5470,13 +5517,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_71 -#AT_START_72 -at_fn_group_banner 72 'timeformat_test.at:1' \ +#AT_STOP_72 +#AT_START_73 +at_fn_group_banner 73 'timeformat_test.at:1' \ "timeformat_test" " " 2 at_xfail=no ( - $as_echo "72. $at_setup_line: testing $at_desc ..." + $as_echo "73. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5525,4 +5572,4 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_72 +#AT_STOP_73 From e8781c01c64512d56774cc1194475fc15a8240f9 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 7 Jan 2015 10:06:34 +0100 Subject: [PATCH 051/165] Avoid _vsnprintf_p() and _vsnwprintf_p() on non-MSVC builds to fix MinGW builds. --- include/log4cplus/config/win32.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/log4cplus/config/win32.h b/include/log4cplus/config/win32.h index 75af8bf01..8e5175cd8 100644 --- a/include/log4cplus/config/win32.h +++ b/include/log4cplus/config/win32.h @@ -94,12 +94,14 @@ # define LOG4CPLUS_HAVE__VSNPRINTF_S # define LOG4CPLUS_HAVE__VSNWPRINTF_S +// MS secure version of _tsopen(). +# define LOG4CPLUS_HAVE__TSOPEN_S +#endif + +#if defined (_MSC_VER) && _MSC_VER >= 1400 // MS printf-like functions supporting positional parameters. # define LOG4CPLUS_HAVE__VSPRINTF_P # define LOG4CPLUS_HAVE__VSWPRINTF_P - -// MS secure version of _tsopen(). -# define LOG4CPLUS_HAVE__TSOPEN_S #endif #define LOG4CPLUS_HAVE__TSOPEN From c1b80d71421438d920d5581d79894a47a8cdc9e5 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 7 Jan 2015 21:20:19 +0100 Subject: [PATCH 052/165] Split log4cplus::Initializer into its own header. --- include/Makefile.am | 1 + include/Makefile.in | 1 + include/log4cplus/initializer.h | 66 ++++ include/log4cplus/log4cplus.h | 23 +- src/CMakeLists.txt | 1 + src/global-init.cxx | 2 +- tests/headers.at | 1 + tests/testsuite | 667 +++++++++++++++++--------------- 8 files changed, 429 insertions(+), 333 deletions(-) create mode 100644 include/log4cplus/initializer.h diff --git a/include/Makefile.am b/include/Makefile.am index 08253fda8..35145af7c 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -32,6 +32,7 @@ nobase_log4cplusinc_HEADERS = \ log4cplus/helpers/timehelper.h \ log4cplus/hierarchy.h \ log4cplus/hierarchylocker.h \ + log4cplus/initializer.h \ log4cplus/internal/cygwin-win32.h \ log4cplus/internal/env.h \ log4cplus/internal/internal.h \ diff --git a/include/Makefile.in b/include/Makefile.in index 90d593aad..e3c3b50fd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -375,6 +375,7 @@ nobase_log4cplusinc_HEADERS = \ log4cplus/helpers/timehelper.h \ log4cplus/hierarchy.h \ log4cplus/hierarchylocker.h \ + log4cplus/initializer.h \ log4cplus/internal/cygwin-win32.h \ log4cplus/internal/env.h \ log4cplus/internal/internal.h \ diff --git a/include/log4cplus/initializer.h b/include/log4cplus/initializer.h new file mode 100644 index 000000000..4c7fbe25d --- /dev/null +++ b/include/log4cplus/initializer.h @@ -0,0 +1,66 @@ +// Copyright (C) 2015, Vaclav Haisman. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modifica- +// tion, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- +// DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef LOG4CPLUS_INITIALIZER_HXX +#define LOG4CPLUS_INITIALIZER_HXX + +#include + +#if defined (LOG4CPLUS_HAVE_PRAGMA_ONCE) +#pragma once +#endif + +#include + + +namespace log4cplus +{ + +/** + This class helps with initialization and shutdown of log4cplus. Its + constructor calls `log4cplus::initialize()` and its destructor calls + `log4cplus::Logger::shutdown()`. Use this class as the first thing in your + `main()`. It will ensure shutdown of log4cplus at the end of + `main()`. This is particularly important on Windows, where shutdown of + standard threads outside `main()` is impossible. + */ +class LOG4CPLUS_EXPORT Initializer +{ +public: + Initializer (); + ~Initializer (); + + Initializer (Initializer const &) = delete; + Initializer (Initializer &&) = delete; + Initializer & operator = (Initializer const &) = delete; + Initializer & operator = (Initializer &&) = delete; + +private: + struct Impl; + std::unique_ptr pimpl; +}; + +} // namespace log4cplus + + +#endif // LOG4CPLUS_INITIALIZER_HXX diff --git a/include/log4cplus/log4cplus.h b/include/log4cplus/log4cplus.h index 6db1d98a1..ef550bcd5 100644 --- a/include/log4cplus/log4cplus.h +++ b/include/log4cplus/log4cplus.h @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -53,26 +54,4 @@ #include #include - -namespace log4cplus -{ - -class LOG4CPLUS_EXPORT Initializer -{ -public: - Initializer (); - ~Initializer (); - - Initializer (Initializer const &) = delete; - Initializer (Initializer &&) = delete; - Initializer & operator = (Initializer const &) = delete; - Initializer & operator = (Initializer &&) = delete; - -private: - struct Impl; - std::unique_ptr pimpl; -}; - -} // namespace log4cplus - #endif // LOG4CPLUS_LOG4CPLUS_HXX diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02bc3c81e..5b84ba7ab 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -136,6 +136,7 @@ install(FILES ../include/log4cplus/appender.h ../include/log4cplus/fstreams.h ../include/log4cplus/hierarchy.h ../include/log4cplus/hierarchylocker.h + ../include/log4cplus/initializer.h ../include/log4cplus/layout.h ../include/log4cplus/log4cplus.h ../include/log4cplus/log4judpappender.h diff --git a/src/global-init.cxx b/src/global-init.cxx index 7001abaed..445c89a7a 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -19,7 +19,7 @@ // limitations under the License. #include -#include +#include #include #include #include diff --git a/tests/headers.at b/tests/headers.at index 005c32fde..27cbb0fae 100644 --- a/tests/headers.at +++ b/tests/headers.at @@ -11,6 +11,7 @@ m4_foreach_w([HEADER], log4cplus/fstreams.h log4cplus/hierarchy.h log4cplus/hierarchylocker.h + log4cplus/initializer.h log4cplus/layout.h log4cplus/log4cplus.h log4cplus/log4judpappender.h diff --git a/tests/testsuite b/tests/testsuite index feed3d342..c55997dbd 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -601,68 +601,69 @@ at_help_all="1;headers.at:1;separate compilation of log4cplus/appender.h;headers 9;headers.at:1;separate compilation of log4cplus/fstreams.h;headers-compilation; 10;headers.at:1;separate compilation of log4cplus/hierarchy.h;headers-compilation; 11;headers.at:1;separate compilation of log4cplus/hierarchylocker.h;headers-compilation; -12;headers.at:1;separate compilation of log4cplus/layout.h;headers-compilation; -13;headers.at:1;separate compilation of log4cplus/log4cplus.h;headers-compilation; -14;headers.at:1;separate compilation of log4cplus/log4judpappender.h;headers-compilation; -15;headers.at:1;separate compilation of log4cplus/logger.h;headers-compilation; -16;headers.at:1;separate compilation of log4cplus/loggingmacros.h;headers-compilation; -17;headers.at:1;separate compilation of log4cplus/loglevel.h;headers-compilation; -18;headers.at:1;separate compilation of log4cplus/mdc.h;headers-compilation; -19;headers.at:1;separate compilation of log4cplus/msttsappender.h;headers-compilation; -20;headers.at:1;separate compilation of log4cplus/ndc.h;headers-compilation; -21;headers.at:1;separate compilation of log4cplus/nteventlogappender.h;headers-compilation; -22;headers.at:1;separate compilation of log4cplus/nullappender.h;headers-compilation; -23;headers.at:1;separate compilation of log4cplus/qt4debugappender.h;headers-compilation; -24;headers.at:1;separate compilation of log4cplus/socketappender.h;headers-compilation; -25;headers.at:1;separate compilation of log4cplus/streams.h;headers-compilation; -26;headers.at:1;separate compilation of log4cplus/syslogappender.h;headers-compilation; -27;headers.at:1;separate compilation of log4cplus/tchar.h;headers-compilation; -28;headers.at:1;separate compilation of log4cplus/tracelogger.h;headers-compilation; -29;headers.at:1;separate compilation of log4cplus/tstring.h;headers-compilation; -30;headers.at:1;separate compilation of log4cplus/version.h;headers-compilation; -31;headers.at:1;separate compilation of log4cplus/win32consoleappender.h;headers-compilation; -32;headers.at:1;separate compilation of log4cplus/win32debugappender.h;headers-compilation; -33;headers.at:1;separate compilation of log4cplus/helpers/appenderattachableimpl.h;headers-compilation; -34;headers.at:1;separate compilation of log4cplus/helpers/connectorthread.h;headers-compilation; -35;headers.at:1;separate compilation of log4cplus/helpers/fileinfo.h;headers-compilation; -36;headers.at:1;separate compilation of log4cplus/helpers/lockfile.h;headers-compilation; -37;headers.at:1;separate compilation of log4cplus/helpers/loglog.h;headers-compilation; -38;headers.at:1;separate compilation of log4cplus/helpers/logloguser.h;headers-compilation; -39;headers.at:1;separate compilation of log4cplus/helpers/pointer.h;headers-compilation; -40;headers.at:1;separate compilation of log4cplus/helpers/property.h;headers-compilation; -41;headers.at:1;separate compilation of log4cplus/helpers/queue.h;headers-compilation; -42;headers.at:1;separate compilation of log4cplus/helpers/sleep.h;headers-compilation; -43;headers.at:1;separate compilation of log4cplus/helpers/snprintf.h;headers-compilation; -44;headers.at:1;separate compilation of log4cplus/helpers/socket.h;headers-compilation; -45;headers.at:1;separate compilation of log4cplus/helpers/socketbuffer.h;headers-compilation; -46;headers.at:1;separate compilation of log4cplus/helpers/stringhelper.h;headers-compilation; -47;headers.at:1;separate compilation of log4cplus/helpers/timehelper.h;headers-compilation; -48;headers.at:1;separate compilation of log4cplus/spi/appenderattachable.h;headers-compilation; -49;headers.at:1;separate compilation of log4cplus/spi/factory.h;headers-compilation; -50;headers.at:1;separate compilation of log4cplus/spi/filter.h;headers-compilation; -51;headers.at:1;separate compilation of log4cplus/spi/loggerfactory.h;headers-compilation; -52;headers.at:1;separate compilation of log4cplus/spi/loggerimpl.h;headers-compilation; -53;headers.at:1;separate compilation of log4cplus/spi/loggingevent.h;headers-compilation; -54;headers.at:1;separate compilation of log4cplus/spi/objectregistry.h;headers-compilation; -55;headers.at:1;separate compilation of log4cplus/spi/rootlogger.h;headers-compilation; -56;headers.at:1;separate compilation of log4cplus/thread/syncprims-pub-impl.h;headers-compilation; -57;headers.at:1;separate compilation of log4cplus/thread/syncprims.h;headers-compilation; -58;headers.at:1;separate compilation of log4cplus/thread/threads.h;headers-compilation; -59;appender_test.at:1;appender_test;appenders; -60;configandwatch_test.at:1;configandwatch_test;appenders; -61;customloglevel_test.at:1;customloglevel_test;appenders; -62;fileappender_test.at:1;fileappender_test;appenders; -63;filter_test.at:1;filter_test;appenders; -64;hierarchy_test.at:1;hierarchy_test;appenders; -65;loglog_test.at:1;loglog_test;appenders; -66;ndc_test.at:1;ndc_test;appenders; -67;ostream_test.at:1;ostream_test;appenders; -68;patternlayout_test.at:1;patternlayout_test;appenders; -69;performance_test.at:1;performance_test;appenders; -70;priority_test.at:1;priority_test;appenders; -71;propertyconfig_test.at:1;propertyconfig_test;appenders; -72;thread_test.at:1;thread_test;appenders; -73;timeformat_test.at:1;timeformat_test;appenders; +12;headers.at:1;separate compilation of log4cplus/initializer.h;headers-compilation; +13;headers.at:1;separate compilation of log4cplus/layout.h;headers-compilation; +14;headers.at:1;separate compilation of log4cplus/log4cplus.h;headers-compilation; +15;headers.at:1;separate compilation of log4cplus/log4judpappender.h;headers-compilation; +16;headers.at:1;separate compilation of log4cplus/logger.h;headers-compilation; +17;headers.at:1;separate compilation of log4cplus/loggingmacros.h;headers-compilation; +18;headers.at:1;separate compilation of log4cplus/loglevel.h;headers-compilation; +19;headers.at:1;separate compilation of log4cplus/mdc.h;headers-compilation; +20;headers.at:1;separate compilation of log4cplus/msttsappender.h;headers-compilation; +21;headers.at:1;separate compilation of log4cplus/ndc.h;headers-compilation; +22;headers.at:1;separate compilation of log4cplus/nteventlogappender.h;headers-compilation; +23;headers.at:1;separate compilation of log4cplus/nullappender.h;headers-compilation; +24;headers.at:1;separate compilation of log4cplus/qt4debugappender.h;headers-compilation; +25;headers.at:1;separate compilation of log4cplus/socketappender.h;headers-compilation; +26;headers.at:1;separate compilation of log4cplus/streams.h;headers-compilation; +27;headers.at:1;separate compilation of log4cplus/syslogappender.h;headers-compilation; +28;headers.at:1;separate compilation of log4cplus/tchar.h;headers-compilation; +29;headers.at:1;separate compilation of log4cplus/tracelogger.h;headers-compilation; +30;headers.at:1;separate compilation of log4cplus/tstring.h;headers-compilation; +31;headers.at:1;separate compilation of log4cplus/version.h;headers-compilation; +32;headers.at:1;separate compilation of log4cplus/win32consoleappender.h;headers-compilation; +33;headers.at:1;separate compilation of log4cplus/win32debugappender.h;headers-compilation; +34;headers.at:1;separate compilation of log4cplus/helpers/appenderattachableimpl.h;headers-compilation; +35;headers.at:1;separate compilation of log4cplus/helpers/connectorthread.h;headers-compilation; +36;headers.at:1;separate compilation of log4cplus/helpers/fileinfo.h;headers-compilation; +37;headers.at:1;separate compilation of log4cplus/helpers/lockfile.h;headers-compilation; +38;headers.at:1;separate compilation of log4cplus/helpers/loglog.h;headers-compilation; +39;headers.at:1;separate compilation of log4cplus/helpers/logloguser.h;headers-compilation; +40;headers.at:1;separate compilation of log4cplus/helpers/pointer.h;headers-compilation; +41;headers.at:1;separate compilation of log4cplus/helpers/property.h;headers-compilation; +42;headers.at:1;separate compilation of log4cplus/helpers/queue.h;headers-compilation; +43;headers.at:1;separate compilation of log4cplus/helpers/sleep.h;headers-compilation; +44;headers.at:1;separate compilation of log4cplus/helpers/snprintf.h;headers-compilation; +45;headers.at:1;separate compilation of log4cplus/helpers/socket.h;headers-compilation; +46;headers.at:1;separate compilation of log4cplus/helpers/socketbuffer.h;headers-compilation; +47;headers.at:1;separate compilation of log4cplus/helpers/stringhelper.h;headers-compilation; +48;headers.at:1;separate compilation of log4cplus/helpers/timehelper.h;headers-compilation; +49;headers.at:1;separate compilation of log4cplus/spi/appenderattachable.h;headers-compilation; +50;headers.at:1;separate compilation of log4cplus/spi/factory.h;headers-compilation; +51;headers.at:1;separate compilation of log4cplus/spi/filter.h;headers-compilation; +52;headers.at:1;separate compilation of log4cplus/spi/loggerfactory.h;headers-compilation; +53;headers.at:1;separate compilation of log4cplus/spi/loggerimpl.h;headers-compilation; +54;headers.at:1;separate compilation of log4cplus/spi/loggingevent.h;headers-compilation; +55;headers.at:1;separate compilation of log4cplus/spi/objectregistry.h;headers-compilation; +56;headers.at:1;separate compilation of log4cplus/spi/rootlogger.h;headers-compilation; +57;headers.at:1;separate compilation of log4cplus/thread/syncprims-pub-impl.h;headers-compilation; +58;headers.at:1;separate compilation of log4cplus/thread/syncprims.h;headers-compilation; +59;headers.at:1;separate compilation of log4cplus/thread/threads.h;headers-compilation; +60;appender_test.at:1;appender_test;appenders; +61;configandwatch_test.at:1;configandwatch_test;appenders; +62;customloglevel_test.at:1;customloglevel_test;appenders; +63;fileappender_test.at:1;fileappender_test;appenders; +64;filter_test.at:1;filter_test;appenders; +65;hierarchy_test.at:1;hierarchy_test;appenders; +66;loglog_test.at:1;loglog_test;appenders; +67;ndc_test.at:1;ndc_test;appenders; +68;ostream_test.at:1;ostream_test;appenders; +69;patternlayout_test.at:1;patternlayout_test;appenders; +70;performance_test.at:1;performance_test;appenders; +71;priority_test.at:1;priority_test;appenders; +72;propertyconfig_test.at:1;propertyconfig_test;appenders; +73;thread_test.at:1;thread_test;appenders; +74;timeformat_test.at:1;timeformat_test;appenders; " # List of the all the test groups. at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'` @@ -676,7 +677,7 @@ at_fn_validate_ranges () for at_grp do eval at_value=\$$at_grp - if test $at_value -lt 1 || test $at_value -gt 73; then + if test $at_value -lt 1 || test $at_value -gt 74; then $as_echo "invalid test group: $at_value" >&2 exit 1 fi @@ -1036,7 +1037,7 @@ esac # Category starts at test group 1. at_banner_text_1="separate headers compilation" # Banner 2. testsuite.at:14 -# Category starts at test group 59. +# Category starts at test group 60. at_banner_text_2="other tests" # Take any -C into account. @@ -2568,7 +2569,7 @@ read at_status <"$at_status_file" #AT_STOP_11 #AT_START_12 at_fn_group_banner 12 'headers.at:1' \ - "separate compilation of log4cplus/layout.h" " " 1 + "separate compilation of log4cplus/initializer.h" "" 1 at_xfail=no ( $as_echo "12. $at_setup_line: testing $at_desc ..." @@ -2577,9 +2578,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/layout.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/layout.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/layout.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/initializer.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/initializer.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/initializer.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2614,7 +2615,7 @@ read at_status <"$at_status_file" #AT_STOP_12 #AT_START_13 at_fn_group_banner 13 'headers.at:1' \ - "separate compilation of log4cplus/log4cplus.h" " " 1 + "separate compilation of log4cplus/layout.h" " " 1 at_xfail=no ( $as_echo "13. $at_setup_line: testing $at_desc ..." @@ -2623,9 +2624,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/log4cplus.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/log4cplus.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/log4cplus.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/layout.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/layout.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/layout.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2660,7 +2661,7 @@ read at_status <"$at_status_file" #AT_STOP_13 #AT_START_14 at_fn_group_banner 14 'headers.at:1' \ - "separate compilation of log4cplus/log4judpappender.h" "" 1 + "separate compilation of log4cplus/log4cplus.h" " " 1 at_xfail=no ( $as_echo "14. $at_setup_line: testing $at_desc ..." @@ -2669,9 +2670,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/log4judpappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/log4judpappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/log4judpappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/log4cplus.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/log4cplus.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/log4cplus.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2706,7 +2707,7 @@ read at_status <"$at_status_file" #AT_STOP_14 #AT_START_15 at_fn_group_banner 15 'headers.at:1' \ - "separate compilation of log4cplus/logger.h" " " 1 + "separate compilation of log4cplus/log4judpappender.h" "" 1 at_xfail=no ( $as_echo "15. $at_setup_line: testing $at_desc ..." @@ -2715,9 +2716,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/logger.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/logger.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/logger.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/log4judpappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/log4judpappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/log4judpappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2752,7 +2753,7 @@ read at_status <"$at_status_file" #AT_STOP_15 #AT_START_16 at_fn_group_banner 16 'headers.at:1' \ - "separate compilation of log4cplus/loggingmacros.h" "" 1 + "separate compilation of log4cplus/logger.h" " " 1 at_xfail=no ( $as_echo "16. $at_setup_line: testing $at_desc ..." @@ -2761,9 +2762,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/loggingmacros.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/loggingmacros.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/loggingmacros.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/logger.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/logger.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/logger.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2798,7 +2799,7 @@ read at_status <"$at_status_file" #AT_STOP_16 #AT_START_17 at_fn_group_banner 17 'headers.at:1' \ - "separate compilation of log4cplus/loglevel.h" " " 1 + "separate compilation of log4cplus/loggingmacros.h" "" 1 at_xfail=no ( $as_echo "17. $at_setup_line: testing $at_desc ..." @@ -2807,9 +2808,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/loglevel.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/loglevel.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/loglevel.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/loggingmacros.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/loggingmacros.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/loggingmacros.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2844,7 +2845,7 @@ read at_status <"$at_status_file" #AT_STOP_17 #AT_START_18 at_fn_group_banner 18 'headers.at:1' \ - "separate compilation of log4cplus/mdc.h" " " 1 + "separate compilation of log4cplus/loglevel.h" " " 1 at_xfail=no ( $as_echo "18. $at_setup_line: testing $at_desc ..." @@ -2853,9 +2854,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/mdc.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/mdc.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/mdc.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/loglevel.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/loglevel.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/loglevel.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2890,7 +2891,7 @@ read at_status <"$at_status_file" #AT_STOP_18 #AT_START_19 at_fn_group_banner 19 'headers.at:1' \ - "separate compilation of log4cplus/msttsappender.h" "" 1 + "separate compilation of log4cplus/mdc.h" " " 1 at_xfail=no ( $as_echo "19. $at_setup_line: testing $at_desc ..." @@ -2899,9 +2900,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/msttsappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/msttsappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/msttsappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/mdc.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/mdc.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/mdc.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2936,7 +2937,7 @@ read at_status <"$at_status_file" #AT_STOP_19 #AT_START_20 at_fn_group_banner 20 'headers.at:1' \ - "separate compilation of log4cplus/ndc.h" " " 1 + "separate compilation of log4cplus/msttsappender.h" "" 1 at_xfail=no ( $as_echo "20. $at_setup_line: testing $at_desc ..." @@ -2945,9 +2946,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/ndc.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/ndc.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/ndc.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/msttsappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/msttsappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/msttsappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -2982,7 +2983,7 @@ read at_status <"$at_status_file" #AT_STOP_20 #AT_START_21 at_fn_group_banner 21 'headers.at:1' \ - "separate compilation of log4cplus/nteventlogappender.h" "" 1 + "separate compilation of log4cplus/ndc.h" " " 1 at_xfail=no ( $as_echo "21. $at_setup_line: testing $at_desc ..." @@ -2991,9 +2992,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/nteventlogappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/nteventlogappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/nteventlogappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/ndc.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/ndc.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/ndc.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3028,7 +3029,7 @@ read at_status <"$at_status_file" #AT_STOP_21 #AT_START_22 at_fn_group_banner 22 'headers.at:1' \ - "separate compilation of log4cplus/nullappender.h" "" 1 + "separate compilation of log4cplus/nteventlogappender.h" "" 1 at_xfail=no ( $as_echo "22. $at_setup_line: testing $at_desc ..." @@ -3037,9 +3038,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/nullappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/nullappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/nullappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/nteventlogappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/nteventlogappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/nteventlogappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3074,7 +3075,7 @@ read at_status <"$at_status_file" #AT_STOP_22 #AT_START_23 at_fn_group_banner 23 'headers.at:1' \ - "separate compilation of log4cplus/qt4debugappender.h" "" 1 + "separate compilation of log4cplus/nullappender.h" "" 1 at_xfail=no ( $as_echo "23. $at_setup_line: testing $at_desc ..." @@ -3083,9 +3084,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/qt4debugappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/qt4debugappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/qt4debugappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/nullappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/nullappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/nullappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3120,7 +3121,7 @@ read at_status <"$at_status_file" #AT_STOP_23 #AT_START_24 at_fn_group_banner 24 'headers.at:1' \ - "separate compilation of log4cplus/socketappender.h" "" 1 + "separate compilation of log4cplus/qt4debugappender.h" "" 1 at_xfail=no ( $as_echo "24. $at_setup_line: testing $at_desc ..." @@ -3129,9 +3130,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/socketappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/socketappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/socketappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/qt4debugappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/qt4debugappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/qt4debugappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3166,7 +3167,7 @@ read at_status <"$at_status_file" #AT_STOP_24 #AT_START_25 at_fn_group_banner 25 'headers.at:1' \ - "separate compilation of log4cplus/streams.h" " " 1 + "separate compilation of log4cplus/socketappender.h" "" 1 at_xfail=no ( $as_echo "25. $at_setup_line: testing $at_desc ..." @@ -3175,9 +3176,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/streams.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/streams.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/streams.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/socketappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/socketappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/socketappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3212,7 +3213,7 @@ read at_status <"$at_status_file" #AT_STOP_25 #AT_START_26 at_fn_group_banner 26 'headers.at:1' \ - "separate compilation of log4cplus/syslogappender.h" "" 1 + "separate compilation of log4cplus/streams.h" " " 1 at_xfail=no ( $as_echo "26. $at_setup_line: testing $at_desc ..." @@ -3221,9 +3222,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/syslogappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/syslogappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/syslogappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/streams.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/streams.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/streams.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3258,7 +3259,7 @@ read at_status <"$at_status_file" #AT_STOP_26 #AT_START_27 at_fn_group_banner 27 'headers.at:1' \ - "separate compilation of log4cplus/tchar.h" " " 1 + "separate compilation of log4cplus/syslogappender.h" "" 1 at_xfail=no ( $as_echo "27. $at_setup_line: testing $at_desc ..." @@ -3267,9 +3268,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tchar.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tchar.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/tchar.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/syslogappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/syslogappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/syslogappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3304,7 +3305,7 @@ read at_status <"$at_status_file" #AT_STOP_27 #AT_START_28 at_fn_group_banner 28 'headers.at:1' \ - "separate compilation of log4cplus/tracelogger.h" "" 1 + "separate compilation of log4cplus/tchar.h" " " 1 at_xfail=no ( $as_echo "28. $at_setup_line: testing $at_desc ..." @@ -3313,9 +3314,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tracelogger.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tracelogger.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/tracelogger.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tchar.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tchar.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/tchar.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3350,7 +3351,7 @@ read at_status <"$at_status_file" #AT_STOP_28 #AT_START_29 at_fn_group_banner 29 'headers.at:1' \ - "separate compilation of log4cplus/tstring.h" " " 1 + "separate compilation of log4cplus/tracelogger.h" "" 1 at_xfail=no ( $as_echo "29. $at_setup_line: testing $at_desc ..." @@ -3359,9 +3360,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tstring.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tstring.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/tstring.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tracelogger.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tracelogger.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/tracelogger.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3396,7 +3397,7 @@ read at_status <"$at_status_file" #AT_STOP_29 #AT_START_30 at_fn_group_banner 30 'headers.at:1' \ - "separate compilation of log4cplus/version.h" " " 1 + "separate compilation of log4cplus/tstring.h" " " 1 at_xfail=no ( $as_echo "30. $at_setup_line: testing $at_desc ..." @@ -3405,9 +3406,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/version.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/version.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/version.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/tstring.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/tstring.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/tstring.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3442,7 +3443,7 @@ read at_status <"$at_status_file" #AT_STOP_30 #AT_START_31 at_fn_group_banner 31 'headers.at:1' \ - "separate compilation of log4cplus/win32consoleappender.h" "" 1 + "separate compilation of log4cplus/version.h" " " 1 at_xfail=no ( $as_echo "31. $at_setup_line: testing $at_desc ..." @@ -3451,9 +3452,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/win32consoleappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/win32consoleappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/win32consoleappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/version.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/version.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/version.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3488,7 +3489,7 @@ read at_status <"$at_status_file" #AT_STOP_31 #AT_START_32 at_fn_group_banner 32 'headers.at:1' \ - "separate compilation of log4cplus/win32debugappender.h" "" 1 + "separate compilation of log4cplus/win32consoleappender.h" "" 1 at_xfail=no ( $as_echo "32. $at_setup_line: testing $at_desc ..." @@ -3497,9 +3498,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/win32debugappender.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/win32debugappender.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/win32debugappender.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/win32consoleappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/win32consoleappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/win32consoleappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3534,7 +3535,7 @@ read at_status <"$at_status_file" #AT_STOP_32 #AT_START_33 at_fn_group_banner 33 'headers.at:1' \ - "separate compilation of log4cplus/helpers/appenderattachableimpl.h" "" 1 + "separate compilation of log4cplus/win32debugappender.h" "" 1 at_xfail=no ( $as_echo "33. $at_setup_line: testing $at_desc ..." @@ -3543,9 +3544,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/appenderattachableimpl.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/appenderattachableimpl.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/appenderattachableimpl.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/win32debugappender.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/win32debugappender.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/win32debugappender.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3580,7 +3581,7 @@ read at_status <"$at_status_file" #AT_STOP_33 #AT_START_34 at_fn_group_banner 34 'headers.at:1' \ - "separate compilation of log4cplus/helpers/connectorthread.h" "" 1 + "separate compilation of log4cplus/helpers/appenderattachableimpl.h" "" 1 at_xfail=no ( $as_echo "34. $at_setup_line: testing $at_desc ..." @@ -3589,9 +3590,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/connectorthread.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/connectorthread.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/connectorthread.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/appenderattachableimpl.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/appenderattachableimpl.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/appenderattachableimpl.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3626,7 +3627,7 @@ read at_status <"$at_status_file" #AT_STOP_34 #AT_START_35 at_fn_group_banner 35 'headers.at:1' \ - "separate compilation of log4cplus/helpers/fileinfo.h" "" 1 + "separate compilation of log4cplus/helpers/connectorthread.h" "" 1 at_xfail=no ( $as_echo "35. $at_setup_line: testing $at_desc ..." @@ -3635,9 +3636,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/fileinfo.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/fileinfo.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/fileinfo.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/connectorthread.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/connectorthread.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/connectorthread.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3672,7 +3673,7 @@ read at_status <"$at_status_file" #AT_STOP_35 #AT_START_36 at_fn_group_banner 36 'headers.at:1' \ - "separate compilation of log4cplus/helpers/lockfile.h" "" 1 + "separate compilation of log4cplus/helpers/fileinfo.h" "" 1 at_xfail=no ( $as_echo "36. $at_setup_line: testing $at_desc ..." @@ -3681,9 +3682,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/lockfile.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/lockfile.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/lockfile.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/fileinfo.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/fileinfo.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/fileinfo.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3718,7 +3719,7 @@ read at_status <"$at_status_file" #AT_STOP_36 #AT_START_37 at_fn_group_banner 37 'headers.at:1' \ - "separate compilation of log4cplus/helpers/loglog.h" "" 1 + "separate compilation of log4cplus/helpers/lockfile.h" "" 1 at_xfail=no ( $as_echo "37. $at_setup_line: testing $at_desc ..." @@ -3727,9 +3728,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/loglog.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/loglog.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/loglog.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/lockfile.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/lockfile.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/lockfile.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3764,7 +3765,7 @@ read at_status <"$at_status_file" #AT_STOP_37 #AT_START_38 at_fn_group_banner 38 'headers.at:1' \ - "separate compilation of log4cplus/helpers/logloguser.h" "" 1 + "separate compilation of log4cplus/helpers/loglog.h" "" 1 at_xfail=no ( $as_echo "38. $at_setup_line: testing $at_desc ..." @@ -3773,9 +3774,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/logloguser.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/logloguser.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/logloguser.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/loglog.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/loglog.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/loglog.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3810,7 +3811,7 @@ read at_status <"$at_status_file" #AT_STOP_38 #AT_START_39 at_fn_group_banner 39 'headers.at:1' \ - "separate compilation of log4cplus/helpers/pointer.h" "" 1 + "separate compilation of log4cplus/helpers/logloguser.h" "" 1 at_xfail=no ( $as_echo "39. $at_setup_line: testing $at_desc ..." @@ -3819,9 +3820,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/pointer.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/pointer.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/pointer.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/logloguser.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/logloguser.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/logloguser.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3856,7 +3857,7 @@ read at_status <"$at_status_file" #AT_STOP_39 #AT_START_40 at_fn_group_banner 40 'headers.at:1' \ - "separate compilation of log4cplus/helpers/property.h" "" 1 + "separate compilation of log4cplus/helpers/pointer.h" "" 1 at_xfail=no ( $as_echo "40. $at_setup_line: testing $at_desc ..." @@ -3865,9 +3866,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/property.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/property.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/property.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/pointer.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/pointer.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/pointer.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3902,7 +3903,7 @@ read at_status <"$at_status_file" #AT_STOP_40 #AT_START_41 at_fn_group_banner 41 'headers.at:1' \ - "separate compilation of log4cplus/helpers/queue.h" "" 1 + "separate compilation of log4cplus/helpers/property.h" "" 1 at_xfail=no ( $as_echo "41. $at_setup_line: testing $at_desc ..." @@ -3911,9 +3912,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/queue.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/queue.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/queue.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/property.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/property.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/property.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3948,7 +3949,7 @@ read at_status <"$at_status_file" #AT_STOP_41 #AT_START_42 at_fn_group_banner 42 'headers.at:1' \ - "separate compilation of log4cplus/helpers/sleep.h" "" 1 + "separate compilation of log4cplus/helpers/queue.h" "" 1 at_xfail=no ( $as_echo "42. $at_setup_line: testing $at_desc ..." @@ -3957,9 +3958,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/sleep.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/sleep.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/sleep.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/queue.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/queue.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/queue.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -3994,7 +3995,7 @@ read at_status <"$at_status_file" #AT_STOP_42 #AT_START_43 at_fn_group_banner 43 'headers.at:1' \ - "separate compilation of log4cplus/helpers/snprintf.h" "" 1 + "separate compilation of log4cplus/helpers/sleep.h" "" 1 at_xfail=no ( $as_echo "43. $at_setup_line: testing $at_desc ..." @@ -4003,9 +4004,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/snprintf.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/snprintf.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/snprintf.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/sleep.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/sleep.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/sleep.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4040,7 +4041,7 @@ read at_status <"$at_status_file" #AT_STOP_43 #AT_START_44 at_fn_group_banner 44 'headers.at:1' \ - "separate compilation of log4cplus/helpers/socket.h" "" 1 + "separate compilation of log4cplus/helpers/snprintf.h" "" 1 at_xfail=no ( $as_echo "44. $at_setup_line: testing $at_desc ..." @@ -4049,9 +4050,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/socket.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/socket.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/socket.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/snprintf.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/snprintf.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/snprintf.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4086,7 +4087,7 @@ read at_status <"$at_status_file" #AT_STOP_44 #AT_START_45 at_fn_group_banner 45 'headers.at:1' \ - "separate compilation of log4cplus/helpers/socketbuffer.h" "" 1 + "separate compilation of log4cplus/helpers/socket.h" "" 1 at_xfail=no ( $as_echo "45. $at_setup_line: testing $at_desc ..." @@ -4095,9 +4096,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/socketbuffer.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/socketbuffer.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/socketbuffer.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/socket.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/socket.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/socket.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4132,7 +4133,7 @@ read at_status <"$at_status_file" #AT_STOP_45 #AT_START_46 at_fn_group_banner 46 'headers.at:1' \ - "separate compilation of log4cplus/helpers/stringhelper.h" "" 1 + "separate compilation of log4cplus/helpers/socketbuffer.h" "" 1 at_xfail=no ( $as_echo "46. $at_setup_line: testing $at_desc ..." @@ -4141,9 +4142,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/stringhelper.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/stringhelper.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/stringhelper.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/socketbuffer.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/socketbuffer.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/socketbuffer.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4178,7 +4179,7 @@ read at_status <"$at_status_file" #AT_STOP_46 #AT_START_47 at_fn_group_banner 47 'headers.at:1' \ - "separate compilation of log4cplus/helpers/timehelper.h" "" 1 + "separate compilation of log4cplus/helpers/stringhelper.h" "" 1 at_xfail=no ( $as_echo "47. $at_setup_line: testing $at_desc ..." @@ -4187,9 +4188,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/timehelper.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/timehelper.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/helpers/timehelper.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/stringhelper.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/stringhelper.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/stringhelper.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4224,7 +4225,7 @@ read at_status <"$at_status_file" #AT_STOP_47 #AT_START_48 at_fn_group_banner 48 'headers.at:1' \ - "separate compilation of log4cplus/spi/appenderattachable.h" "" 1 + "separate compilation of log4cplus/helpers/timehelper.h" "" 1 at_xfail=no ( $as_echo "48. $at_setup_line: testing $at_desc ..." @@ -4233,9 +4234,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/appenderattachable.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/appenderattachable.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/appenderattachable.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/helpers/timehelper.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/helpers/timehelper.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/helpers/timehelper.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4270,7 +4271,7 @@ read at_status <"$at_status_file" #AT_STOP_48 #AT_START_49 at_fn_group_banner 49 'headers.at:1' \ - "separate compilation of log4cplus/spi/factory.h" "" 1 + "separate compilation of log4cplus/spi/appenderattachable.h" "" 1 at_xfail=no ( $as_echo "49. $at_setup_line: testing $at_desc ..." @@ -4279,9 +4280,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/factory.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/factory.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/factory.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/appenderattachable.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/appenderattachable.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/appenderattachable.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4316,7 +4317,7 @@ read at_status <"$at_status_file" #AT_STOP_49 #AT_START_50 at_fn_group_banner 50 'headers.at:1' \ - "separate compilation of log4cplus/spi/filter.h" " " 1 + "separate compilation of log4cplus/spi/factory.h" "" 1 at_xfail=no ( $as_echo "50. $at_setup_line: testing $at_desc ..." @@ -4325,9 +4326,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/filter.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/filter.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/filter.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/factory.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/factory.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/factory.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4362,7 +4363,7 @@ read at_status <"$at_status_file" #AT_STOP_50 #AT_START_51 at_fn_group_banner 51 'headers.at:1' \ - "separate compilation of log4cplus/spi/loggerfactory.h" "" 1 + "separate compilation of log4cplus/spi/filter.h" " " 1 at_xfail=no ( $as_echo "51. $at_setup_line: testing $at_desc ..." @@ -4371,9 +4372,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggerfactory.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggerfactory.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggerfactory.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/filter.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/filter.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/filter.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4408,7 +4409,7 @@ read at_status <"$at_status_file" #AT_STOP_51 #AT_START_52 at_fn_group_banner 52 'headers.at:1' \ - "separate compilation of log4cplus/spi/loggerimpl.h" "" 1 + "separate compilation of log4cplus/spi/loggerfactory.h" "" 1 at_xfail=no ( $as_echo "52. $at_setup_line: testing $at_desc ..." @@ -4417,9 +4418,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggerimpl.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggerimpl.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggerimpl.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggerfactory.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggerfactory.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggerfactory.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4454,7 +4455,7 @@ read at_status <"$at_status_file" #AT_STOP_52 #AT_START_53 at_fn_group_banner 53 'headers.at:1' \ - "separate compilation of log4cplus/spi/loggingevent.h" "" 1 + "separate compilation of log4cplus/spi/loggerimpl.h" "" 1 at_xfail=no ( $as_echo "53. $at_setup_line: testing $at_desc ..." @@ -4463,9 +4464,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggingevent.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggingevent.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggingevent.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggerimpl.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggerimpl.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggerimpl.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4500,7 +4501,7 @@ read at_status <"$at_status_file" #AT_STOP_53 #AT_START_54 at_fn_group_banner 54 'headers.at:1' \ - "separate compilation of log4cplus/spi/objectregistry.h" "" 1 + "separate compilation of log4cplus/spi/loggingevent.h" "" 1 at_xfail=no ( $as_echo "54. $at_setup_line: testing $at_desc ..." @@ -4509,9 +4510,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/objectregistry.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/objectregistry.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/objectregistry.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/loggingevent.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/loggingevent.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/loggingevent.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4546,7 +4547,7 @@ read at_status <"$at_status_file" #AT_STOP_54 #AT_START_55 at_fn_group_banner 55 'headers.at:1' \ - "separate compilation of log4cplus/spi/rootlogger.h" "" 1 + "separate compilation of log4cplus/spi/objectregistry.h" "" 1 at_xfail=no ( $as_echo "55. $at_setup_line: testing $at_desc ..." @@ -4555,9 +4556,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/rootlogger.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/rootlogger.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/spi/rootlogger.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/objectregistry.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/objectregistry.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/objectregistry.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4592,7 +4593,7 @@ read at_status <"$at_status_file" #AT_STOP_55 #AT_START_56 at_fn_group_banner 56 'headers.at:1' \ - "separate compilation of log4cplus/thread/syncprims-pub-impl.h" "" 1 + "separate compilation of log4cplus/spi/rootlogger.h" "" 1 at_xfail=no ( $as_echo "56. $at_setup_line: testing $at_desc ..." @@ -4601,9 +4602,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/syncprims-pub-impl.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/syncprims-pub-impl.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/thread/syncprims-pub-impl.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/spi/rootlogger.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/spi/rootlogger.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/spi/rootlogger.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4638,7 +4639,7 @@ read at_status <"$at_status_file" #AT_STOP_56 #AT_START_57 at_fn_group_banner 57 'headers.at:1' \ - "separate compilation of log4cplus/thread/syncprims.h" "" 1 + "separate compilation of log4cplus/thread/syncprims-pub-impl.h" "" 1 at_xfail=no ( $as_echo "57. $at_setup_line: testing $at_desc ..." @@ -4647,9 +4648,9 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/syncprims.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/syncprims.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/thread/syncprims.h\"">test.cxx +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/syncprims-pub-impl.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/syncprims-pub-impl.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/thread/syncprims-pub-impl.h\"">test.cxx ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter @@ -4684,7 +4685,7 @@ read at_status <"$at_status_file" #AT_STOP_57 #AT_START_58 at_fn_group_banner 58 'headers.at:1' \ - "separate compilation of log4cplus/thread/threads.h" "" 1 + "separate compilation of log4cplus/thread/syncprims.h" "" 1 at_xfail=no ( $as_echo "58. $at_setup_line: testing $at_desc ..." @@ -4692,6 +4693,52 @@ at_xfail=no + { set +x +$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/syncprims.h\\\"\">test.cxx" +at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/syncprims.h\\\"\">test.cxx" "headers.at:1" +( $at_check_trace; $as_echo "#include \"log4cplus/thread/syncprims.h\"">test.cxx +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/headers.at:1" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + { set +x +$as_echo "$at_srcdir/headers.at:1: \$CXX \$CPPFLAGS \$CXXFLAGS -c \"test.cxx\"" +at_fn_check_prepare_dynamic "$CXX $CPPFLAGS $CXXFLAGS -c \"test.cxx\"" "headers.at:1" +( $at_check_trace; $CXX $CPPFLAGS $CXXFLAGS -c "test.cxx" +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/headers.at:1" +$at_failed && at_fn_log_failure \ +"test.cxx" +$at_traceon; } + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_58 +#AT_START_59 +at_fn_group_banner 59 'headers.at:1' \ + "separate compilation of log4cplus/thread/threads.h" "" 1 +at_xfail=no +( + $as_echo "59. $at_setup_line: testing $at_desc ..." + $at_traceon + + + { set +x $as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/thread/threads.h\\\"\">test.cxx" at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/thread/threads.h\\\"\">test.cxx" "headers.at:1" @@ -4727,13 +4774,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_58 -#AT_START_59 -at_fn_group_banner 59 'appender_test.at:1' \ +#AT_STOP_59 +#AT_START_60 +at_fn_group_banner 60 'appender_test.at:1' \ "appender_test" " " 2 at_xfail=no ( - $as_echo "59. $at_setup_line: testing $at_desc ..." + $as_echo "60. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4769,13 +4816,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_59 -#AT_START_60 -at_fn_group_banner 60 'configandwatch_test.at:1' \ +#AT_STOP_60 +#AT_START_61 +at_fn_group_banner 61 'configandwatch_test.at:1' \ "configandwatch_test" " " 2 at_xfail=no ( - $as_echo "60. $at_setup_line: testing $at_desc ..." + $as_echo "61. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4827,13 +4874,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_60 -#AT_START_61 -at_fn_group_banner 61 'customloglevel_test.at:1' \ +#AT_STOP_61 +#AT_START_62 +at_fn_group_banner 62 'customloglevel_test.at:1' \ "customloglevel_test" " " 2 at_xfail=no ( - $as_echo "61. $at_setup_line: testing $at_desc ..." + $as_echo "62. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4869,13 +4916,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_61 -#AT_START_62 -at_fn_group_banner 62 'fileappender_test.at:1' \ +#AT_STOP_62 +#AT_START_63 +at_fn_group_banner 63 'fileappender_test.at:1' \ "fileappender_test" " " 2 at_xfail=no ( - $as_echo "62. $at_setup_line: testing $at_desc ..." + $as_echo "63. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4924,13 +4971,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_62 -#AT_START_63 -at_fn_group_banner 63 'filter_test.at:1' \ +#AT_STOP_63 +#AT_START_64 +at_fn_group_banner 64 'filter_test.at:1' \ "filter_test" " " 2 at_xfail=no ( - $as_echo "63. $at_setup_line: testing $at_desc ..." + $as_echo "64. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5074,13 +5121,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_63 -#AT_START_64 -at_fn_group_banner 64 'hierarchy_test.at:1' \ +#AT_STOP_64 +#AT_START_65 +at_fn_group_banner 65 'hierarchy_test.at:1' \ "hierarchy_test" " " 2 at_xfail=no ( - $as_echo "64. $at_setup_line: testing $at_desc ..." + $as_echo "65. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5116,13 +5163,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_64 -#AT_START_65 -at_fn_group_banner 65 'loglog_test.at:1' \ +#AT_STOP_65 +#AT_START_66 +at_fn_group_banner 66 'loglog_test.at:1' \ "loglog_test" " " 2 at_xfail=no ( - $as_echo "65. $at_setup_line: testing $at_desc ..." + $as_echo "66. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5171,13 +5218,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_65 -#AT_START_66 -at_fn_group_banner 66 'ndc_test.at:1' \ +#AT_STOP_66 +#AT_START_67 +at_fn_group_banner 67 'ndc_test.at:1' \ "ndc_test" " " 2 at_xfail=no ( - $as_echo "66. $at_setup_line: testing $at_desc ..." + $as_echo "67. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5213,13 +5260,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_66 -#AT_START_67 -at_fn_group_banner 67 'ostream_test.at:1' \ +#AT_STOP_67 +#AT_START_68 +at_fn_group_banner 68 'ostream_test.at:1' \ "ostream_test" " " 2 at_xfail=no ( - $as_echo "67. $at_setup_line: testing $at_desc ..." + $as_echo "68. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5255,13 +5302,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_67 -#AT_START_68 -at_fn_group_banner 68 'patternlayout_test.at:1' \ +#AT_STOP_68 +#AT_START_69 +at_fn_group_banner 69 'patternlayout_test.at:1' \ "patternlayout_test" " " 2 at_xfail=no ( - $as_echo "68. $at_setup_line: testing $at_desc ..." + $as_echo "69. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5307,13 +5354,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_68 -#AT_START_69 -at_fn_group_banner 69 'performance_test.at:1' \ +#AT_STOP_69 +#AT_START_70 +at_fn_group_banner 70 'performance_test.at:1' \ "performance_test" " " 2 at_xfail=no ( - $as_echo "69. $at_setup_line: testing $at_desc ..." + $as_echo "70. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5362,13 +5409,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_69 -#AT_START_70 -at_fn_group_banner 70 'priority_test.at:1' \ +#AT_STOP_70 +#AT_START_71 +at_fn_group_banner 71 'priority_test.at:1' \ "priority_test" " " 2 at_xfail=no ( - $as_echo "70. $at_setup_line: testing $at_desc ..." + $as_echo "71. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5404,13 +5451,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_70 -#AT_START_71 -at_fn_group_banner 71 'propertyconfig_test.at:1' \ +#AT_STOP_71 +#AT_START_72 +at_fn_group_banner 72 'propertyconfig_test.at:1' \ "propertyconfig_test" " " 2 at_xfail=no ( - $as_echo "71. $at_setup_line: testing $at_desc ..." + $as_echo "72. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5485,13 +5532,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_71 -#AT_START_72 -at_fn_group_banner 72 'thread_test.at:1' \ +#AT_STOP_72 +#AT_START_73 +at_fn_group_banner 73 'thread_test.at:1' \ "thread_test" " " 2 at_xfail=no ( - $as_echo "72. $at_setup_line: testing $at_desc ..." + $as_echo "73. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5517,13 +5564,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_72 -#AT_START_73 -at_fn_group_banner 73 'timeformat_test.at:1' \ +#AT_STOP_73 +#AT_START_74 +at_fn_group_banner 74 'timeformat_test.at:1' \ "timeformat_test" " " 2 at_xfail=no ( - $as_echo "73. $at_setup_line: testing $at_desc ..." + $as_echo "74. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5572,4 +5619,4 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_73 +#AT_STOP_74 From cd9aaf678ab3e21bbb3683e5e0d1dc82997930b6 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Thu, 8 Jan 2015 14:29:17 +0100 Subject: [PATCH 053/165] Test for init_priorit attribute with std::string static variable as well. --- configure | 3 +++ m4/ax_gcc_var_attribute.m4 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index 07b430595..3194f0112 100755 --- a/configure +++ b/configure @@ -8433,8 +8433,11 @@ else /* end confdefs.h. */ + #include struct bar { bar() {} ~bar() {} }; bar b __attribute__((init_priority(65535/2))); + static std::string name ("test") + __attribute__((init_priority(65535/2))); int main () diff --git a/m4/ax_gcc_var_attribute.m4 b/m4/ax_gcc_var_attribute.m4 index 4f60f6da1..8547f1ac8 100644 --- a/m4/ax_gcc_var_attribute.m4 +++ b/m4/ax_gcc_var_attribute.m4 @@ -108,8 +108,11 @@ AC_DEFUN([AX_GCC_VAR_ATTRIBUTE], [ int foo __attribute__(($1)); ], [init_priority], [ + #include struct bar { bar() {} ~bar() {} }; bar b __attribute__(($1(65535/2))); + static std::string name ("test") + __attribute__(($1(65535/2))); ], [ m4_warn([syntax], [Unsupported attribute $1, the test may fail]) From 7975b43adf8f243ae2ee472ab7b91a8727df33e7 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 14 Jan 2015 10:09:14 +0100 Subject: [PATCH 054/165] Revert "Split log4cplus::Initializer into its own header." This reverts commit c1b80d71421438d920d5581d79894a47a8cdc9e5. --- include/Makefile.am | 1 - include/Makefile.in | 1 - include/log4cplus/initializer.h | 66 ---- include/log4cplus/log4cplus.h | 23 +- src/CMakeLists.txt | 1 - src/global-init.cxx | 2 +- tests/headers.at | 1 - tests/testsuite | 667 +++++++++++++++----------------- 8 files changed, 333 insertions(+), 429 deletions(-) delete mode 100644 include/log4cplus/initializer.h diff --git a/include/Makefile.am b/include/Makefile.am index 35145af7c..08253fda8 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -32,7 +32,6 @@ nobase_log4cplusinc_HEADERS = \ log4cplus/helpers/timehelper.h \ log4cplus/hierarchy.h \ log4cplus/hierarchylocker.h \ - log4cplus/initializer.h \ log4cplus/internal/cygwin-win32.h \ log4cplus/internal/env.h \ log4cplus/internal/internal.h \ diff --git a/include/Makefile.in b/include/Makefile.in index e3c3b50fd..90d593aad 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -375,7 +375,6 @@ nobase_log4cplusinc_HEADERS = \ log4cplus/helpers/timehelper.h \ log4cplus/hierarchy.h \ log4cplus/hierarchylocker.h \ - log4cplus/initializer.h \ log4cplus/internal/cygwin-win32.h \ log4cplus/internal/env.h \ log4cplus/internal/internal.h \ diff --git a/include/log4cplus/initializer.h b/include/log4cplus/initializer.h deleted file mode 100644 index 4c7fbe25d..000000000 --- a/include/log4cplus/initializer.h +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (C) 2015, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef LOG4CPLUS_INITIALIZER_HXX -#define LOG4CPLUS_INITIALIZER_HXX - -#include - -#if defined (LOG4CPLUS_HAVE_PRAGMA_ONCE) -#pragma once -#endif - -#include - - -namespace log4cplus -{ - -/** - This class helps with initialization and shutdown of log4cplus. Its - constructor calls `log4cplus::initialize()` and its destructor calls - `log4cplus::Logger::shutdown()`. Use this class as the first thing in your - `main()`. It will ensure shutdown of log4cplus at the end of - `main()`. This is particularly important on Windows, where shutdown of - standard threads outside `main()` is impossible. - */ -class LOG4CPLUS_EXPORT Initializer -{ -public: - Initializer (); - ~Initializer (); - - Initializer (Initializer const &) = delete; - Initializer (Initializer &&) = delete; - Initializer & operator = (Initializer const &) = delete; - Initializer & operator = (Initializer &&) = delete; - -private: - struct Impl; - std::unique_ptr pimpl; -}; - -} // namespace log4cplus - - -#endif // LOG4CPLUS_INITIALIZER_HXX diff --git a/include/log4cplus/log4cplus.h b/include/log4cplus/log4cplus.h index ef550bcd5..6db1d98a1 100644 --- a/include/log4cplus/log4cplus.h +++ b/include/log4cplus/log4cplus.h @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -54,4 +53,26 @@ #include #include + +namespace log4cplus +{ + +class LOG4CPLUS_EXPORT Initializer +{ +public: + Initializer (); + ~Initializer (); + + Initializer (Initializer const &) = delete; + Initializer (Initializer &&) = delete; + Initializer & operator = (Initializer const &) = delete; + Initializer & operator = (Initializer &&) = delete; + +private: + struct Impl; + std::unique_ptr pimpl; +}; + +} // namespace log4cplus + #endif // LOG4CPLUS_LOG4CPLUS_HXX diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5b84ba7ab..02bc3c81e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -136,7 +136,6 @@ install(FILES ../include/log4cplus/appender.h ../include/log4cplus/fstreams.h ../include/log4cplus/hierarchy.h ../include/log4cplus/hierarchylocker.h - ../include/log4cplus/initializer.h ../include/log4cplus/layout.h ../include/log4cplus/log4cplus.h ../include/log4cplus/log4judpappender.h diff --git a/src/global-init.cxx b/src/global-init.cxx index 445c89a7a..7001abaed 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -19,7 +19,7 @@ // limitations under the License. #include -#include +#include #include #include #include diff --git a/tests/headers.at b/tests/headers.at index 27cbb0fae..005c32fde 100644 --- a/tests/headers.at +++ b/tests/headers.at @@ -11,7 +11,6 @@ m4_foreach_w([HEADER], log4cplus/fstreams.h log4cplus/hierarchy.h log4cplus/hierarchylocker.h - log4cplus/initializer.h log4cplus/layout.h log4cplus/log4cplus.h log4cplus/log4judpappender.h diff --git a/tests/testsuite b/tests/testsuite index c55997dbd..feed3d342 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -601,69 +601,68 @@ at_help_all="1;headers.at:1;separate compilation of log4cplus/appender.h;headers 9;headers.at:1;separate compilation of log4cplus/fstreams.h;headers-compilation; 10;headers.at:1;separate compilation of log4cplus/hierarchy.h;headers-compilation; 11;headers.at:1;separate compilation of log4cplus/hierarchylocker.h;headers-compilation; -12;headers.at:1;separate compilation of log4cplus/initializer.h;headers-compilation; -13;headers.at:1;separate compilation of log4cplus/layout.h;headers-compilation; -14;headers.at:1;separate compilation of log4cplus/log4cplus.h;headers-compilation; -15;headers.at:1;separate compilation of log4cplus/log4judpappender.h;headers-compilation; -16;headers.at:1;separate compilation of log4cplus/logger.h;headers-compilation; -17;headers.at:1;separate compilation of log4cplus/loggingmacros.h;headers-compilation; -18;headers.at:1;separate compilation of log4cplus/loglevel.h;headers-compilation; -19;headers.at:1;separate compilation of log4cplus/mdc.h;headers-compilation; -20;headers.at:1;separate compilation of log4cplus/msttsappender.h;headers-compilation; -21;headers.at:1;separate compilation of log4cplus/ndc.h;headers-compilation; -22;headers.at:1;separate compilation of log4cplus/nteventlogappender.h;headers-compilation; -23;headers.at:1;separate compilation of log4cplus/nullappender.h;headers-compilation; -24;headers.at:1;separate compilation of log4cplus/qt4debugappender.h;headers-compilation; -25;headers.at:1;separate compilation of log4cplus/socketappender.h;headers-compilation; -26;headers.at:1;separate compilation of log4cplus/streams.h;headers-compilation; -27;headers.at:1;separate compilation of log4cplus/syslogappender.h;headers-compilation; -28;headers.at:1;separate compilation of log4cplus/tchar.h;headers-compilation; -29;headers.at:1;separate compilation of log4cplus/tracelogger.h;headers-compilation; -30;headers.at:1;separate compilation of log4cplus/tstring.h;headers-compilation; -31;headers.at:1;separate compilation of log4cplus/version.h;headers-compilation; -32;headers.at:1;separate compilation of log4cplus/win32consoleappender.h;headers-compilation; -33;headers.at:1;separate compilation of log4cplus/win32debugappender.h;headers-compilation; -34;headers.at:1;separate compilation of log4cplus/helpers/appenderattachableimpl.h;headers-compilation; -35;headers.at:1;separate compilation of log4cplus/helpers/connectorthread.h;headers-compilation; -36;headers.at:1;separate compilation of log4cplus/helpers/fileinfo.h;headers-compilation; -37;headers.at:1;separate compilation of log4cplus/helpers/lockfile.h;headers-compilation; -38;headers.at:1;separate compilation of log4cplus/helpers/loglog.h;headers-compilation; -39;headers.at:1;separate compilation of log4cplus/helpers/logloguser.h;headers-compilation; -40;headers.at:1;separate compilation of log4cplus/helpers/pointer.h;headers-compilation; -41;headers.at:1;separate compilation of log4cplus/helpers/property.h;headers-compilation; -42;headers.at:1;separate compilation of log4cplus/helpers/queue.h;headers-compilation; -43;headers.at:1;separate compilation of log4cplus/helpers/sleep.h;headers-compilation; -44;headers.at:1;separate compilation of log4cplus/helpers/snprintf.h;headers-compilation; -45;headers.at:1;separate compilation of log4cplus/helpers/socket.h;headers-compilation; -46;headers.at:1;separate compilation of log4cplus/helpers/socketbuffer.h;headers-compilation; -47;headers.at:1;separate compilation of log4cplus/helpers/stringhelper.h;headers-compilation; -48;headers.at:1;separate compilation of log4cplus/helpers/timehelper.h;headers-compilation; -49;headers.at:1;separate compilation of log4cplus/spi/appenderattachable.h;headers-compilation; -50;headers.at:1;separate compilation of log4cplus/spi/factory.h;headers-compilation; -51;headers.at:1;separate compilation of log4cplus/spi/filter.h;headers-compilation; -52;headers.at:1;separate compilation of log4cplus/spi/loggerfactory.h;headers-compilation; -53;headers.at:1;separate compilation of log4cplus/spi/loggerimpl.h;headers-compilation; -54;headers.at:1;separate compilation of log4cplus/spi/loggingevent.h;headers-compilation; -55;headers.at:1;separate compilation of log4cplus/spi/objectregistry.h;headers-compilation; -56;headers.at:1;separate compilation of log4cplus/spi/rootlogger.h;headers-compilation; -57;headers.at:1;separate compilation of log4cplus/thread/syncprims-pub-impl.h;headers-compilation; -58;headers.at:1;separate compilation of log4cplus/thread/syncprims.h;headers-compilation; -59;headers.at:1;separate compilation of log4cplus/thread/threads.h;headers-compilation; -60;appender_test.at:1;appender_test;appenders; -61;configandwatch_test.at:1;configandwatch_test;appenders; -62;customloglevel_test.at:1;customloglevel_test;appenders; -63;fileappender_test.at:1;fileappender_test;appenders; -64;filter_test.at:1;filter_test;appenders; -65;hierarchy_test.at:1;hierarchy_test;appenders; -66;loglog_test.at:1;loglog_test;appenders; -67;ndc_test.at:1;ndc_test;appenders; -68;ostream_test.at:1;ostream_test;appenders; -69;patternlayout_test.at:1;patternlayout_test;appenders; -70;performance_test.at:1;performance_test;appenders; -71;priority_test.at:1;priority_test;appenders; -72;propertyconfig_test.at:1;propertyconfig_test;appenders; -73;thread_test.at:1;thread_test;appenders; -74;timeformat_test.at:1;timeformat_test;appenders; +12;headers.at:1;separate compilation of log4cplus/layout.h;headers-compilation; +13;headers.at:1;separate compilation of log4cplus/log4cplus.h;headers-compilation; +14;headers.at:1;separate compilation of log4cplus/log4judpappender.h;headers-compilation; +15;headers.at:1;separate compilation of log4cplus/logger.h;headers-compilation; +16;headers.at:1;separate compilation of log4cplus/loggingmacros.h;headers-compilation; +17;headers.at:1;separate compilation of log4cplus/loglevel.h;headers-compilation; +18;headers.at:1;separate compilation of log4cplus/mdc.h;headers-compilation; +19;headers.at:1;separate compilation of log4cplus/msttsappender.h;headers-compilation; +20;headers.at:1;separate compilation of log4cplus/ndc.h;headers-compilation; +21;headers.at:1;separate compilation of log4cplus/nteventlogappender.h;headers-compilation; +22;headers.at:1;separate compilation of log4cplus/nullappender.h;headers-compilation; +23;headers.at:1;separate compilation of log4cplus/qt4debugappender.h;headers-compilation; +24;headers.at:1;separate compilation of log4cplus/socketappender.h;headers-compilation; +25;headers.at:1;separate compilation of log4cplus/streams.h;headers-compilation; +26;headers.at:1;separate compilation of log4cplus/syslogappender.h;headers-compilation; +27;headers.at:1;separate compilation of log4cplus/tchar.h;headers-compilation; +28;headers.at:1;separate compilation of log4cplus/tracelogger.h;headers-compilation; +29;headers.at:1;separate compilation of log4cplus/tstring.h;headers-compilation; +30;headers.at:1;separate compilation of log4cplus/version.h;headers-compilation; +31;headers.at:1;separate compilation of log4cplus/win32consoleappender.h;headers-compilation; +32;headers.at:1;separate compilation of log4cplus/win32debugappender.h;headers-compilation; +33;headers.at:1;separate compilation of log4cplus/helpers/appenderattachableimpl.h;headers-compilation; +34;headers.at:1;separate compilation of log4cplus/helpers/connectorthread.h;headers-compilation; +35;headers.at:1;separate compilation of log4cplus/helpers/fileinfo.h;headers-compilation; +36;headers.at:1;separate compilation of log4cplus/helpers/lockfile.h;headers-compilation; +37;headers.at:1;separate compilation of log4cplus/helpers/loglog.h;headers-compilation; +38;headers.at:1;separate compilation of log4cplus/helpers/logloguser.h;headers-compilation; +39;headers.at:1;separate compilation of log4cplus/helpers/pointer.h;headers-compilation; +40;headers.at:1;separate compilation of log4cplus/helpers/property.h;headers-compilation; +41;headers.at:1;separate compilation of log4cplus/helpers/queue.h;headers-compilation; +42;headers.at:1;separate compilation of log4cplus/helpers/sleep.h;headers-compilation; +43;headers.at:1;separate compilation of log4cplus/helpers/snprintf.h;headers-compilation; +44;headers.at:1;separate compilation of log4cplus/helpers/socket.h;headers-compilation; +45;headers.at:1;separate compilation of log4cplus/helpers/socketbuffer.h;headers-compilation; +46;headers.at:1;separate compilation of log4cplus/helpers/stringhelper.h;headers-compilation; +47;headers.at:1;separate compilation of log4cplus/helpers/timehelper.h;headers-compilation; +48;headers.at:1;separate compilation of log4cplus/spi/appenderattachable.h;headers-compilation; +49;headers.at:1;separate compilation of log4cplus/spi/factory.h;headers-compilation; +50;headers.at:1;separate compilation of log4cplus/spi/filter.h;headers-compilation; +51;headers.at:1;separate compilation of log4cplus/spi/loggerfactory.h;headers-compilation; +52;headers.at:1;separate compilation of log4cplus/spi/loggerimpl.h;headers-compilation; +53;headers.at:1;separate compilation of log4cplus/spi/loggingevent.h;headers-compilation; +54;headers.at:1;separate compilation of log4cplus/spi/objectregistry.h;headers-compilation; +55;headers.at:1;separate compilation of log4cplus/spi/rootlogger.h;headers-compilation; +56;headers.at:1;separate compilation of log4cplus/thread/syncprims-pub-impl.h;headers-compilation; +57;headers.at:1;separate compilation of log4cplus/thread/syncprims.h;headers-compilation; +58;headers.at:1;separate compilation of log4cplus/thread/threads.h;headers-compilation; +59;appender_test.at:1;appender_test;appenders; +60;configandwatch_test.at:1;configandwatch_test;appenders; +61;customloglevel_test.at:1;customloglevel_test;appenders; +62;fileappender_test.at:1;fileappender_test;appenders; +63;filter_test.at:1;filter_test;appenders; +64;hierarchy_test.at:1;hierarchy_test;appenders; +65;loglog_test.at:1;loglog_test;appenders; +66;ndc_test.at:1;ndc_test;appenders; +67;ostream_test.at:1;ostream_test;appenders; +68;patternlayout_test.at:1;patternlayout_test;appenders; +69;performance_test.at:1;performance_test;appenders; +70;priority_test.at:1;priority_test;appenders; +71;propertyconfig_test.at:1;propertyconfig_test;appenders; +72;thread_test.at:1;thread_test;appenders; +73;timeformat_test.at:1;timeformat_test;appenders; " # List of the all the test groups. at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'` @@ -677,7 +676,7 @@ at_fn_validate_ranges () for at_grp do eval at_value=\$$at_grp - if test $at_value -lt 1 || test $at_value -gt 74; then + if test $at_value -lt 1 || test $at_value -gt 73; then $as_echo "invalid test group: $at_value" >&2 exit 1 fi @@ -1037,7 +1036,7 @@ esac # Category starts at test group 1. at_banner_text_1="separate headers compilation" # Banner 2. testsuite.at:14 -# Category starts at test group 60. +# Category starts at test group 59. at_banner_text_2="other tests" # Take any -C into account. @@ -2569,56 +2568,10 @@ read at_status <"$at_status_file" #AT_STOP_11 #AT_START_12 at_fn_group_banner 12 'headers.at:1' \ - "separate compilation of log4cplus/initializer.h" "" 1 -at_xfail=no -( - $as_echo "12. $at_setup_line: testing $at_desc ..." - $at_traceon - - - - { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/initializer.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/initializer.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/initializer.h\"">test.cxx -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/headers.at:1" -$at_failed && at_fn_log_failure -$at_traceon; } - - - - { set +x -$as_echo "$at_srcdir/headers.at:1: \$CXX \$CPPFLAGS \$CXXFLAGS -c \"test.cxx\"" -at_fn_check_prepare_dynamic "$CXX $CPPFLAGS $CXXFLAGS -c \"test.cxx\"" "headers.at:1" -( $at_check_trace; $CXX $CPPFLAGS $CXXFLAGS -c "test.cxx" -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/headers.at:1" -$at_failed && at_fn_log_failure \ -"test.cxx" -$at_traceon; } - - - - set +x - $at_times_p && times >"$at_times_file" -) 5>&1 2>&1 7>&- | eval $at_tee_pipe -read at_status <"$at_status_file" -#AT_STOP_12 -#AT_START_13 -at_fn_group_banner 13 'headers.at:1' \ "separate compilation of log4cplus/layout.h" " " 1 at_xfail=no ( - $as_echo "13. $at_setup_line: testing $at_desc ..." + $as_echo "12. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2658,13 +2611,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_13 -#AT_START_14 -at_fn_group_banner 14 'headers.at:1' \ +#AT_STOP_12 +#AT_START_13 +at_fn_group_banner 13 'headers.at:1' \ "separate compilation of log4cplus/log4cplus.h" " " 1 at_xfail=no ( - $as_echo "14. $at_setup_line: testing $at_desc ..." + $as_echo "13. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2704,13 +2657,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_14 -#AT_START_15 -at_fn_group_banner 15 'headers.at:1' \ +#AT_STOP_13 +#AT_START_14 +at_fn_group_banner 14 'headers.at:1' \ "separate compilation of log4cplus/log4judpappender.h" "" 1 at_xfail=no ( - $as_echo "15. $at_setup_line: testing $at_desc ..." + $as_echo "14. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2750,13 +2703,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_15 -#AT_START_16 -at_fn_group_banner 16 'headers.at:1' \ +#AT_STOP_14 +#AT_START_15 +at_fn_group_banner 15 'headers.at:1' \ "separate compilation of log4cplus/logger.h" " " 1 at_xfail=no ( - $as_echo "16. $at_setup_line: testing $at_desc ..." + $as_echo "15. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2796,13 +2749,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_16 -#AT_START_17 -at_fn_group_banner 17 'headers.at:1' \ +#AT_STOP_15 +#AT_START_16 +at_fn_group_banner 16 'headers.at:1' \ "separate compilation of log4cplus/loggingmacros.h" "" 1 at_xfail=no ( - $as_echo "17. $at_setup_line: testing $at_desc ..." + $as_echo "16. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2842,13 +2795,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_17 -#AT_START_18 -at_fn_group_banner 18 'headers.at:1' \ +#AT_STOP_16 +#AT_START_17 +at_fn_group_banner 17 'headers.at:1' \ "separate compilation of log4cplus/loglevel.h" " " 1 at_xfail=no ( - $as_echo "18. $at_setup_line: testing $at_desc ..." + $as_echo "17. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2888,13 +2841,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_18 -#AT_START_19 -at_fn_group_banner 19 'headers.at:1' \ +#AT_STOP_17 +#AT_START_18 +at_fn_group_banner 18 'headers.at:1' \ "separate compilation of log4cplus/mdc.h" " " 1 at_xfail=no ( - $as_echo "19. $at_setup_line: testing $at_desc ..." + $as_echo "18. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2934,13 +2887,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_19 -#AT_START_20 -at_fn_group_banner 20 'headers.at:1' \ +#AT_STOP_18 +#AT_START_19 +at_fn_group_banner 19 'headers.at:1' \ "separate compilation of log4cplus/msttsappender.h" "" 1 at_xfail=no ( - $as_echo "20. $at_setup_line: testing $at_desc ..." + $as_echo "19. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2980,13 +2933,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_20 -#AT_START_21 -at_fn_group_banner 21 'headers.at:1' \ +#AT_STOP_19 +#AT_START_20 +at_fn_group_banner 20 'headers.at:1' \ "separate compilation of log4cplus/ndc.h" " " 1 at_xfail=no ( - $as_echo "21. $at_setup_line: testing $at_desc ..." + $as_echo "20. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3026,13 +2979,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_21 -#AT_START_22 -at_fn_group_banner 22 'headers.at:1' \ +#AT_STOP_20 +#AT_START_21 +at_fn_group_banner 21 'headers.at:1' \ "separate compilation of log4cplus/nteventlogappender.h" "" 1 at_xfail=no ( - $as_echo "22. $at_setup_line: testing $at_desc ..." + $as_echo "21. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3072,13 +3025,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_22 -#AT_START_23 -at_fn_group_banner 23 'headers.at:1' \ +#AT_STOP_21 +#AT_START_22 +at_fn_group_banner 22 'headers.at:1' \ "separate compilation of log4cplus/nullappender.h" "" 1 at_xfail=no ( - $as_echo "23. $at_setup_line: testing $at_desc ..." + $as_echo "22. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3118,13 +3071,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_23 -#AT_START_24 -at_fn_group_banner 24 'headers.at:1' \ +#AT_STOP_22 +#AT_START_23 +at_fn_group_banner 23 'headers.at:1' \ "separate compilation of log4cplus/qt4debugappender.h" "" 1 at_xfail=no ( - $as_echo "24. $at_setup_line: testing $at_desc ..." + $as_echo "23. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3164,13 +3117,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_24 -#AT_START_25 -at_fn_group_banner 25 'headers.at:1' \ +#AT_STOP_23 +#AT_START_24 +at_fn_group_banner 24 'headers.at:1' \ "separate compilation of log4cplus/socketappender.h" "" 1 at_xfail=no ( - $as_echo "25. $at_setup_line: testing $at_desc ..." + $as_echo "24. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3210,13 +3163,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_25 -#AT_START_26 -at_fn_group_banner 26 'headers.at:1' \ +#AT_STOP_24 +#AT_START_25 +at_fn_group_banner 25 'headers.at:1' \ "separate compilation of log4cplus/streams.h" " " 1 at_xfail=no ( - $as_echo "26. $at_setup_line: testing $at_desc ..." + $as_echo "25. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3256,13 +3209,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_26 -#AT_START_27 -at_fn_group_banner 27 'headers.at:1' \ +#AT_STOP_25 +#AT_START_26 +at_fn_group_banner 26 'headers.at:1' \ "separate compilation of log4cplus/syslogappender.h" "" 1 at_xfail=no ( - $as_echo "27. $at_setup_line: testing $at_desc ..." + $as_echo "26. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3302,13 +3255,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_27 -#AT_START_28 -at_fn_group_banner 28 'headers.at:1' \ +#AT_STOP_26 +#AT_START_27 +at_fn_group_banner 27 'headers.at:1' \ "separate compilation of log4cplus/tchar.h" " " 1 at_xfail=no ( - $as_echo "28. $at_setup_line: testing $at_desc ..." + $as_echo "27. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3348,13 +3301,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_28 -#AT_START_29 -at_fn_group_banner 29 'headers.at:1' \ +#AT_STOP_27 +#AT_START_28 +at_fn_group_banner 28 'headers.at:1' \ "separate compilation of log4cplus/tracelogger.h" "" 1 at_xfail=no ( - $as_echo "29. $at_setup_line: testing $at_desc ..." + $as_echo "28. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3394,13 +3347,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_29 -#AT_START_30 -at_fn_group_banner 30 'headers.at:1' \ +#AT_STOP_28 +#AT_START_29 +at_fn_group_banner 29 'headers.at:1' \ "separate compilation of log4cplus/tstring.h" " " 1 at_xfail=no ( - $as_echo "30. $at_setup_line: testing $at_desc ..." + $as_echo "29. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3440,13 +3393,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_30 -#AT_START_31 -at_fn_group_banner 31 'headers.at:1' \ +#AT_STOP_29 +#AT_START_30 +at_fn_group_banner 30 'headers.at:1' \ "separate compilation of log4cplus/version.h" " " 1 at_xfail=no ( - $as_echo "31. $at_setup_line: testing $at_desc ..." + $as_echo "30. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3486,13 +3439,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_31 -#AT_START_32 -at_fn_group_banner 32 'headers.at:1' \ +#AT_STOP_30 +#AT_START_31 +at_fn_group_banner 31 'headers.at:1' \ "separate compilation of log4cplus/win32consoleappender.h" "" 1 at_xfail=no ( - $as_echo "32. $at_setup_line: testing $at_desc ..." + $as_echo "31. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3532,13 +3485,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_32 -#AT_START_33 -at_fn_group_banner 33 'headers.at:1' \ +#AT_STOP_31 +#AT_START_32 +at_fn_group_banner 32 'headers.at:1' \ "separate compilation of log4cplus/win32debugappender.h" "" 1 at_xfail=no ( - $as_echo "33. $at_setup_line: testing $at_desc ..." + $as_echo "32. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3578,13 +3531,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_33 -#AT_START_34 -at_fn_group_banner 34 'headers.at:1' \ +#AT_STOP_32 +#AT_START_33 +at_fn_group_banner 33 'headers.at:1' \ "separate compilation of log4cplus/helpers/appenderattachableimpl.h" "" 1 at_xfail=no ( - $as_echo "34. $at_setup_line: testing $at_desc ..." + $as_echo "33. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3624,13 +3577,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_34 -#AT_START_35 -at_fn_group_banner 35 'headers.at:1' \ +#AT_STOP_33 +#AT_START_34 +at_fn_group_banner 34 'headers.at:1' \ "separate compilation of log4cplus/helpers/connectorthread.h" "" 1 at_xfail=no ( - $as_echo "35. $at_setup_line: testing $at_desc ..." + $as_echo "34. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3670,13 +3623,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_35 -#AT_START_36 -at_fn_group_banner 36 'headers.at:1' \ +#AT_STOP_34 +#AT_START_35 +at_fn_group_banner 35 'headers.at:1' \ "separate compilation of log4cplus/helpers/fileinfo.h" "" 1 at_xfail=no ( - $as_echo "36. $at_setup_line: testing $at_desc ..." + $as_echo "35. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3716,13 +3669,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_36 -#AT_START_37 -at_fn_group_banner 37 'headers.at:1' \ +#AT_STOP_35 +#AT_START_36 +at_fn_group_banner 36 'headers.at:1' \ "separate compilation of log4cplus/helpers/lockfile.h" "" 1 at_xfail=no ( - $as_echo "37. $at_setup_line: testing $at_desc ..." + $as_echo "36. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3762,13 +3715,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_37 -#AT_START_38 -at_fn_group_banner 38 'headers.at:1' \ +#AT_STOP_36 +#AT_START_37 +at_fn_group_banner 37 'headers.at:1' \ "separate compilation of log4cplus/helpers/loglog.h" "" 1 at_xfail=no ( - $as_echo "38. $at_setup_line: testing $at_desc ..." + $as_echo "37. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3808,13 +3761,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_38 -#AT_START_39 -at_fn_group_banner 39 'headers.at:1' \ +#AT_STOP_37 +#AT_START_38 +at_fn_group_banner 38 'headers.at:1' \ "separate compilation of log4cplus/helpers/logloguser.h" "" 1 at_xfail=no ( - $as_echo "39. $at_setup_line: testing $at_desc ..." + $as_echo "38. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3854,13 +3807,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_39 -#AT_START_40 -at_fn_group_banner 40 'headers.at:1' \ +#AT_STOP_38 +#AT_START_39 +at_fn_group_banner 39 'headers.at:1' \ "separate compilation of log4cplus/helpers/pointer.h" "" 1 at_xfail=no ( - $as_echo "40. $at_setup_line: testing $at_desc ..." + $as_echo "39. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3900,13 +3853,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_40 -#AT_START_41 -at_fn_group_banner 41 'headers.at:1' \ +#AT_STOP_39 +#AT_START_40 +at_fn_group_banner 40 'headers.at:1' \ "separate compilation of log4cplus/helpers/property.h" "" 1 at_xfail=no ( - $as_echo "41. $at_setup_line: testing $at_desc ..." + $as_echo "40. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3946,13 +3899,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_41 -#AT_START_42 -at_fn_group_banner 42 'headers.at:1' \ +#AT_STOP_40 +#AT_START_41 +at_fn_group_banner 41 'headers.at:1' \ "separate compilation of log4cplus/helpers/queue.h" "" 1 at_xfail=no ( - $as_echo "42. $at_setup_line: testing $at_desc ..." + $as_echo "41. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3992,13 +3945,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_42 -#AT_START_43 -at_fn_group_banner 43 'headers.at:1' \ +#AT_STOP_41 +#AT_START_42 +at_fn_group_banner 42 'headers.at:1' \ "separate compilation of log4cplus/helpers/sleep.h" "" 1 at_xfail=no ( - $as_echo "43. $at_setup_line: testing $at_desc ..." + $as_echo "42. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4038,13 +3991,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_43 -#AT_START_44 -at_fn_group_banner 44 'headers.at:1' \ +#AT_STOP_42 +#AT_START_43 +at_fn_group_banner 43 'headers.at:1' \ "separate compilation of log4cplus/helpers/snprintf.h" "" 1 at_xfail=no ( - $as_echo "44. $at_setup_line: testing $at_desc ..." + $as_echo "43. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4084,13 +4037,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_44 -#AT_START_45 -at_fn_group_banner 45 'headers.at:1' \ +#AT_STOP_43 +#AT_START_44 +at_fn_group_banner 44 'headers.at:1' \ "separate compilation of log4cplus/helpers/socket.h" "" 1 at_xfail=no ( - $as_echo "45. $at_setup_line: testing $at_desc ..." + $as_echo "44. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4130,13 +4083,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_45 -#AT_START_46 -at_fn_group_banner 46 'headers.at:1' \ +#AT_STOP_44 +#AT_START_45 +at_fn_group_banner 45 'headers.at:1' \ "separate compilation of log4cplus/helpers/socketbuffer.h" "" 1 at_xfail=no ( - $as_echo "46. $at_setup_line: testing $at_desc ..." + $as_echo "45. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4176,13 +4129,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_46 -#AT_START_47 -at_fn_group_banner 47 'headers.at:1' \ +#AT_STOP_45 +#AT_START_46 +at_fn_group_banner 46 'headers.at:1' \ "separate compilation of log4cplus/helpers/stringhelper.h" "" 1 at_xfail=no ( - $as_echo "47. $at_setup_line: testing $at_desc ..." + $as_echo "46. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4222,13 +4175,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_47 -#AT_START_48 -at_fn_group_banner 48 'headers.at:1' \ +#AT_STOP_46 +#AT_START_47 +at_fn_group_banner 47 'headers.at:1' \ "separate compilation of log4cplus/helpers/timehelper.h" "" 1 at_xfail=no ( - $as_echo "48. $at_setup_line: testing $at_desc ..." + $as_echo "47. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4268,13 +4221,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_48 -#AT_START_49 -at_fn_group_banner 49 'headers.at:1' \ +#AT_STOP_47 +#AT_START_48 +at_fn_group_banner 48 'headers.at:1' \ "separate compilation of log4cplus/spi/appenderattachable.h" "" 1 at_xfail=no ( - $as_echo "49. $at_setup_line: testing $at_desc ..." + $as_echo "48. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4314,13 +4267,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_49 -#AT_START_50 -at_fn_group_banner 50 'headers.at:1' \ +#AT_STOP_48 +#AT_START_49 +at_fn_group_banner 49 'headers.at:1' \ "separate compilation of log4cplus/spi/factory.h" "" 1 at_xfail=no ( - $as_echo "50. $at_setup_line: testing $at_desc ..." + $as_echo "49. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4360,13 +4313,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_50 -#AT_START_51 -at_fn_group_banner 51 'headers.at:1' \ +#AT_STOP_49 +#AT_START_50 +at_fn_group_banner 50 'headers.at:1' \ "separate compilation of log4cplus/spi/filter.h" " " 1 at_xfail=no ( - $as_echo "51. $at_setup_line: testing $at_desc ..." + $as_echo "50. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4406,13 +4359,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_51 -#AT_START_52 -at_fn_group_banner 52 'headers.at:1' \ +#AT_STOP_50 +#AT_START_51 +at_fn_group_banner 51 'headers.at:1' \ "separate compilation of log4cplus/spi/loggerfactory.h" "" 1 at_xfail=no ( - $as_echo "52. $at_setup_line: testing $at_desc ..." + $as_echo "51. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4452,13 +4405,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_52 -#AT_START_53 -at_fn_group_banner 53 'headers.at:1' \ +#AT_STOP_51 +#AT_START_52 +at_fn_group_banner 52 'headers.at:1' \ "separate compilation of log4cplus/spi/loggerimpl.h" "" 1 at_xfail=no ( - $as_echo "53. $at_setup_line: testing $at_desc ..." + $as_echo "52. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4498,13 +4451,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_53 -#AT_START_54 -at_fn_group_banner 54 'headers.at:1' \ +#AT_STOP_52 +#AT_START_53 +at_fn_group_banner 53 'headers.at:1' \ "separate compilation of log4cplus/spi/loggingevent.h" "" 1 at_xfail=no ( - $as_echo "54. $at_setup_line: testing $at_desc ..." + $as_echo "53. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4544,13 +4497,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_54 -#AT_START_55 -at_fn_group_banner 55 'headers.at:1' \ +#AT_STOP_53 +#AT_START_54 +at_fn_group_banner 54 'headers.at:1' \ "separate compilation of log4cplus/spi/objectregistry.h" "" 1 at_xfail=no ( - $as_echo "55. $at_setup_line: testing $at_desc ..." + $as_echo "54. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4590,13 +4543,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_55 -#AT_START_56 -at_fn_group_banner 56 'headers.at:1' \ +#AT_STOP_54 +#AT_START_55 +at_fn_group_banner 55 'headers.at:1' \ "separate compilation of log4cplus/spi/rootlogger.h" "" 1 at_xfail=no ( - $as_echo "56. $at_setup_line: testing $at_desc ..." + $as_echo "55. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4636,13 +4589,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_56 -#AT_START_57 -at_fn_group_banner 57 'headers.at:1' \ +#AT_STOP_55 +#AT_START_56 +at_fn_group_banner 56 'headers.at:1' \ "separate compilation of log4cplus/thread/syncprims-pub-impl.h" "" 1 at_xfail=no ( - $as_echo "57. $at_setup_line: testing $at_desc ..." + $as_echo "56. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4682,13 +4635,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_57 -#AT_START_58 -at_fn_group_banner 58 'headers.at:1' \ +#AT_STOP_56 +#AT_START_57 +at_fn_group_banner 57 'headers.at:1' \ "separate compilation of log4cplus/thread/syncprims.h" "" 1 at_xfail=no ( - $as_echo "58. $at_setup_line: testing $at_desc ..." + $as_echo "57. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4728,13 +4681,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_58 -#AT_START_59 -at_fn_group_banner 59 'headers.at:1' \ +#AT_STOP_57 +#AT_START_58 +at_fn_group_banner 58 'headers.at:1' \ "separate compilation of log4cplus/thread/threads.h" "" 1 at_xfail=no ( - $as_echo "59. $at_setup_line: testing $at_desc ..." + $as_echo "58. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4774,13 +4727,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_59 -#AT_START_60 -at_fn_group_banner 60 'appender_test.at:1' \ +#AT_STOP_58 +#AT_START_59 +at_fn_group_banner 59 'appender_test.at:1' \ "appender_test" " " 2 at_xfail=no ( - $as_echo "60. $at_setup_line: testing $at_desc ..." + $as_echo "59. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4816,13 +4769,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_60 -#AT_START_61 -at_fn_group_banner 61 'configandwatch_test.at:1' \ +#AT_STOP_59 +#AT_START_60 +at_fn_group_banner 60 'configandwatch_test.at:1' \ "configandwatch_test" " " 2 at_xfail=no ( - $as_echo "61. $at_setup_line: testing $at_desc ..." + $as_echo "60. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4874,13 +4827,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_61 -#AT_START_62 -at_fn_group_banner 62 'customloglevel_test.at:1' \ +#AT_STOP_60 +#AT_START_61 +at_fn_group_banner 61 'customloglevel_test.at:1' \ "customloglevel_test" " " 2 at_xfail=no ( - $as_echo "62. $at_setup_line: testing $at_desc ..." + $as_echo "61. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4916,13 +4869,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_62 -#AT_START_63 -at_fn_group_banner 63 'fileappender_test.at:1' \ +#AT_STOP_61 +#AT_START_62 +at_fn_group_banner 62 'fileappender_test.at:1' \ "fileappender_test" " " 2 at_xfail=no ( - $as_echo "63. $at_setup_line: testing $at_desc ..." + $as_echo "62. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4971,13 +4924,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_63 -#AT_START_64 -at_fn_group_banner 64 'filter_test.at:1' \ +#AT_STOP_62 +#AT_START_63 +at_fn_group_banner 63 'filter_test.at:1' \ "filter_test" " " 2 at_xfail=no ( - $as_echo "64. $at_setup_line: testing $at_desc ..." + $as_echo "63. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5121,13 +5074,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_64 -#AT_START_65 -at_fn_group_banner 65 'hierarchy_test.at:1' \ +#AT_STOP_63 +#AT_START_64 +at_fn_group_banner 64 'hierarchy_test.at:1' \ "hierarchy_test" " " 2 at_xfail=no ( - $as_echo "65. $at_setup_line: testing $at_desc ..." + $as_echo "64. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5163,13 +5116,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_65 -#AT_START_66 -at_fn_group_banner 66 'loglog_test.at:1' \ +#AT_STOP_64 +#AT_START_65 +at_fn_group_banner 65 'loglog_test.at:1' \ "loglog_test" " " 2 at_xfail=no ( - $as_echo "66. $at_setup_line: testing $at_desc ..." + $as_echo "65. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5218,13 +5171,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_66 -#AT_START_67 -at_fn_group_banner 67 'ndc_test.at:1' \ +#AT_STOP_65 +#AT_START_66 +at_fn_group_banner 66 'ndc_test.at:1' \ "ndc_test" " " 2 at_xfail=no ( - $as_echo "67. $at_setup_line: testing $at_desc ..." + $as_echo "66. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5260,13 +5213,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_67 -#AT_START_68 -at_fn_group_banner 68 'ostream_test.at:1' \ +#AT_STOP_66 +#AT_START_67 +at_fn_group_banner 67 'ostream_test.at:1' \ "ostream_test" " " 2 at_xfail=no ( - $as_echo "68. $at_setup_line: testing $at_desc ..." + $as_echo "67. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5302,13 +5255,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_68 -#AT_START_69 -at_fn_group_banner 69 'patternlayout_test.at:1' \ +#AT_STOP_67 +#AT_START_68 +at_fn_group_banner 68 'patternlayout_test.at:1' \ "patternlayout_test" " " 2 at_xfail=no ( - $as_echo "69. $at_setup_line: testing $at_desc ..." + $as_echo "68. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5354,13 +5307,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_69 -#AT_START_70 -at_fn_group_banner 70 'performance_test.at:1' \ +#AT_STOP_68 +#AT_START_69 +at_fn_group_banner 69 'performance_test.at:1' \ "performance_test" " " 2 at_xfail=no ( - $as_echo "70. $at_setup_line: testing $at_desc ..." + $as_echo "69. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5409,13 +5362,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_70 -#AT_START_71 -at_fn_group_banner 71 'priority_test.at:1' \ +#AT_STOP_69 +#AT_START_70 +at_fn_group_banner 70 'priority_test.at:1' \ "priority_test" " " 2 at_xfail=no ( - $as_echo "71. $at_setup_line: testing $at_desc ..." + $as_echo "70. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5451,13 +5404,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_71 -#AT_START_72 -at_fn_group_banner 72 'propertyconfig_test.at:1' \ +#AT_STOP_70 +#AT_START_71 +at_fn_group_banner 71 'propertyconfig_test.at:1' \ "propertyconfig_test" " " 2 at_xfail=no ( - $as_echo "72. $at_setup_line: testing $at_desc ..." + $as_echo "71. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5532,13 +5485,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_72 -#AT_START_73 -at_fn_group_banner 73 'thread_test.at:1' \ +#AT_STOP_71 +#AT_START_72 +at_fn_group_banner 72 'thread_test.at:1' \ "thread_test" " " 2 at_xfail=no ( - $as_echo "73. $at_setup_line: testing $at_desc ..." + $as_echo "72. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5564,13 +5517,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_73 -#AT_START_74 -at_fn_group_banner 74 'timeformat_test.at:1' \ +#AT_STOP_72 +#AT_START_73 +at_fn_group_banner 73 'timeformat_test.at:1' \ "timeformat_test" " " 2 at_xfail=no ( - $as_echo "74. $at_setup_line: testing $at_desc ..." + $as_echo "73. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5619,4 +5572,4 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_74 +#AT_STOP_73 From 295cde7aae3e9a0f24d6976b337ffd67fc53febb Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Wed, 14 Jan 2015 10:11:35 +0100 Subject: [PATCH 055/165] Revert "Add log4cplus.h header including commonly used headers. Implement Initializer" This reverts commit f0f9a2792452638191a3f71c8cdc5c21ae326edf. --- include/Makefile.am | 1 - include/Makefile.in | 1 - include/log4cplus/log4cplus.h | 78 ---- src/CMakeLists.txt | 1 - src/global-init.cxx | 31 -- tests/headers.at | 1 - tests/testsuite | 647 ++++++++++++++++------------------ 7 files changed, 300 insertions(+), 460 deletions(-) delete mode 100644 include/log4cplus/log4cplus.h diff --git a/include/Makefile.am b/include/Makefile.am index 08253fda8..2e4960ee2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -37,7 +37,6 @@ nobase_log4cplusinc_HEADERS = \ log4cplus/internal/internal.h \ log4cplus/internal/socket.h \ log4cplus/layout.h \ - log4cplus/log4cplus.h \ log4cplus/log4judpappender.h \ log4cplus/logger.h \ log4cplus/loggingmacros.h \ diff --git a/include/Makefile.in b/include/Makefile.in index 90d593aad..102e0d720 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -380,7 +380,6 @@ nobase_log4cplusinc_HEADERS = \ log4cplus/internal/internal.h \ log4cplus/internal/socket.h \ log4cplus/layout.h \ - log4cplus/log4cplus.h \ log4cplus/log4judpappender.h \ log4cplus/logger.h \ log4cplus/loggingmacros.h \ diff --git a/include/log4cplus/log4cplus.h b/include/log4cplus/log4cplus.h deleted file mode 100644 index 6db1d98a1..000000000 --- a/include/log4cplus/log4cplus.h +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (C) 2015, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef LOG4CPLUS_LOG4CPLUS_HXX -#define LOG4CPLUS_LOG4CPLUS_HXX - -#include - -#if defined (LOG4CPLUS_HAVE_PRAGMA_ONCE) -#pragma once -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - - -namespace log4cplus -{ - -class LOG4CPLUS_EXPORT Initializer -{ -public: - Initializer (); - ~Initializer (); - - Initializer (Initializer const &) = delete; - Initializer (Initializer &&) = delete; - Initializer & operator = (Initializer const &) = delete; - Initializer & operator = (Initializer &&) = delete; - -private: - struct Impl; - std::unique_ptr pimpl; -}; - -} // namespace log4cplus - -#endif // LOG4CPLUS_LOG4CPLUS_HXX diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02bc3c81e..91174da28 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -137,7 +137,6 @@ install(FILES ../include/log4cplus/appender.h ../include/log4cplus/hierarchy.h ../include/log4cplus/hierarchylocker.h ../include/log4cplus/layout.h - ../include/log4cplus/log4cplus.h ../include/log4cplus/log4judpappender.h ../include/log4cplus/logger.h ../include/log4cplus/loggingmacros.h diff --git a/src/global-init.cxx b/src/global-init.cxx index 7001abaed..afbf9b499 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -19,7 +19,6 @@ // limitations under the License. #include -#include #include #include #include @@ -51,36 +50,6 @@ LOG4CPLUS_EXPORT tostream & tcerr = std::cerr; #endif // UNICODE -struct Initializer::Impl -{ -#if ! defined (LOG4CPLUS_SINGLE_THREADED) - std::mutex mtx; -#endif - - unsigned count = 0; -}; - - -Initializer::Initializer () - : pimpl (new Impl) -{ - LOG4CPLUS_THREADED (std::unique_lock guard (pimpl->mtx)); - if (pimpl->count == 0) - initialize (); - - ++pimpl->count; -} - - -Initializer::~Initializer () -{ - LOG4CPLUS_THREADED (std::unique_lock guard (pimpl->mtx)); - --pimpl->count; - if (pimpl->count == 0) - Logger::shutdown (); -} - - namespace { diff --git a/tests/headers.at b/tests/headers.at index 005c32fde..8227b827a 100644 --- a/tests/headers.at +++ b/tests/headers.at @@ -12,7 +12,6 @@ m4_foreach_w([HEADER], log4cplus/hierarchy.h log4cplus/hierarchylocker.h log4cplus/layout.h - log4cplus/log4cplus.h log4cplus/log4judpappender.h log4cplus/logger.h log4cplus/loggingmacros.h diff --git a/tests/testsuite b/tests/testsuite index feed3d342..4d018559c 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -602,67 +602,66 @@ at_help_all="1;headers.at:1;separate compilation of log4cplus/appender.h;headers 10;headers.at:1;separate compilation of log4cplus/hierarchy.h;headers-compilation; 11;headers.at:1;separate compilation of log4cplus/hierarchylocker.h;headers-compilation; 12;headers.at:1;separate compilation of log4cplus/layout.h;headers-compilation; -13;headers.at:1;separate compilation of log4cplus/log4cplus.h;headers-compilation; -14;headers.at:1;separate compilation of log4cplus/log4judpappender.h;headers-compilation; -15;headers.at:1;separate compilation of log4cplus/logger.h;headers-compilation; -16;headers.at:1;separate compilation of log4cplus/loggingmacros.h;headers-compilation; -17;headers.at:1;separate compilation of log4cplus/loglevel.h;headers-compilation; -18;headers.at:1;separate compilation of log4cplus/mdc.h;headers-compilation; -19;headers.at:1;separate compilation of log4cplus/msttsappender.h;headers-compilation; -20;headers.at:1;separate compilation of log4cplus/ndc.h;headers-compilation; -21;headers.at:1;separate compilation of log4cplus/nteventlogappender.h;headers-compilation; -22;headers.at:1;separate compilation of log4cplus/nullappender.h;headers-compilation; -23;headers.at:1;separate compilation of log4cplus/qt4debugappender.h;headers-compilation; -24;headers.at:1;separate compilation of log4cplus/socketappender.h;headers-compilation; -25;headers.at:1;separate compilation of log4cplus/streams.h;headers-compilation; -26;headers.at:1;separate compilation of log4cplus/syslogappender.h;headers-compilation; -27;headers.at:1;separate compilation of log4cplus/tchar.h;headers-compilation; -28;headers.at:1;separate compilation of log4cplus/tracelogger.h;headers-compilation; -29;headers.at:1;separate compilation of log4cplus/tstring.h;headers-compilation; -30;headers.at:1;separate compilation of log4cplus/version.h;headers-compilation; -31;headers.at:1;separate compilation of log4cplus/win32consoleappender.h;headers-compilation; -32;headers.at:1;separate compilation of log4cplus/win32debugappender.h;headers-compilation; -33;headers.at:1;separate compilation of log4cplus/helpers/appenderattachableimpl.h;headers-compilation; -34;headers.at:1;separate compilation of log4cplus/helpers/connectorthread.h;headers-compilation; -35;headers.at:1;separate compilation of log4cplus/helpers/fileinfo.h;headers-compilation; -36;headers.at:1;separate compilation of log4cplus/helpers/lockfile.h;headers-compilation; -37;headers.at:1;separate compilation of log4cplus/helpers/loglog.h;headers-compilation; -38;headers.at:1;separate compilation of log4cplus/helpers/logloguser.h;headers-compilation; -39;headers.at:1;separate compilation of log4cplus/helpers/pointer.h;headers-compilation; -40;headers.at:1;separate compilation of log4cplus/helpers/property.h;headers-compilation; -41;headers.at:1;separate compilation of log4cplus/helpers/queue.h;headers-compilation; -42;headers.at:1;separate compilation of log4cplus/helpers/sleep.h;headers-compilation; -43;headers.at:1;separate compilation of log4cplus/helpers/snprintf.h;headers-compilation; -44;headers.at:1;separate compilation of log4cplus/helpers/socket.h;headers-compilation; -45;headers.at:1;separate compilation of log4cplus/helpers/socketbuffer.h;headers-compilation; -46;headers.at:1;separate compilation of log4cplus/helpers/stringhelper.h;headers-compilation; -47;headers.at:1;separate compilation of log4cplus/helpers/timehelper.h;headers-compilation; -48;headers.at:1;separate compilation of log4cplus/spi/appenderattachable.h;headers-compilation; -49;headers.at:1;separate compilation of log4cplus/spi/factory.h;headers-compilation; -50;headers.at:1;separate compilation of log4cplus/spi/filter.h;headers-compilation; -51;headers.at:1;separate compilation of log4cplus/spi/loggerfactory.h;headers-compilation; -52;headers.at:1;separate compilation of log4cplus/spi/loggerimpl.h;headers-compilation; -53;headers.at:1;separate compilation of log4cplus/spi/loggingevent.h;headers-compilation; -54;headers.at:1;separate compilation of log4cplus/spi/objectregistry.h;headers-compilation; -55;headers.at:1;separate compilation of log4cplus/spi/rootlogger.h;headers-compilation; -56;headers.at:1;separate compilation of log4cplus/thread/syncprims-pub-impl.h;headers-compilation; -57;headers.at:1;separate compilation of log4cplus/thread/syncprims.h;headers-compilation; -58;headers.at:1;separate compilation of log4cplus/thread/threads.h;headers-compilation; -59;appender_test.at:1;appender_test;appenders; -60;configandwatch_test.at:1;configandwatch_test;appenders; -61;customloglevel_test.at:1;customloglevel_test;appenders; -62;fileappender_test.at:1;fileappender_test;appenders; -63;filter_test.at:1;filter_test;appenders; -64;hierarchy_test.at:1;hierarchy_test;appenders; -65;loglog_test.at:1;loglog_test;appenders; -66;ndc_test.at:1;ndc_test;appenders; -67;ostream_test.at:1;ostream_test;appenders; -68;patternlayout_test.at:1;patternlayout_test;appenders; -69;performance_test.at:1;performance_test;appenders; -70;priority_test.at:1;priority_test;appenders; -71;propertyconfig_test.at:1;propertyconfig_test;appenders; -72;thread_test.at:1;thread_test;appenders; -73;timeformat_test.at:1;timeformat_test;appenders; +13;headers.at:1;separate compilation of log4cplus/log4judpappender.h;headers-compilation; +14;headers.at:1;separate compilation of log4cplus/logger.h;headers-compilation; +15;headers.at:1;separate compilation of log4cplus/loggingmacros.h;headers-compilation; +16;headers.at:1;separate compilation of log4cplus/loglevel.h;headers-compilation; +17;headers.at:1;separate compilation of log4cplus/mdc.h;headers-compilation; +18;headers.at:1;separate compilation of log4cplus/msttsappender.h;headers-compilation; +19;headers.at:1;separate compilation of log4cplus/ndc.h;headers-compilation; +20;headers.at:1;separate compilation of log4cplus/nteventlogappender.h;headers-compilation; +21;headers.at:1;separate compilation of log4cplus/nullappender.h;headers-compilation; +22;headers.at:1;separate compilation of log4cplus/qt4debugappender.h;headers-compilation; +23;headers.at:1;separate compilation of log4cplus/socketappender.h;headers-compilation; +24;headers.at:1;separate compilation of log4cplus/streams.h;headers-compilation; +25;headers.at:1;separate compilation of log4cplus/syslogappender.h;headers-compilation; +26;headers.at:1;separate compilation of log4cplus/tchar.h;headers-compilation; +27;headers.at:1;separate compilation of log4cplus/tracelogger.h;headers-compilation; +28;headers.at:1;separate compilation of log4cplus/tstring.h;headers-compilation; +29;headers.at:1;separate compilation of log4cplus/version.h;headers-compilation; +30;headers.at:1;separate compilation of log4cplus/win32consoleappender.h;headers-compilation; +31;headers.at:1;separate compilation of log4cplus/win32debugappender.h;headers-compilation; +32;headers.at:1;separate compilation of log4cplus/helpers/appenderattachableimpl.h;headers-compilation; +33;headers.at:1;separate compilation of log4cplus/helpers/connectorthread.h;headers-compilation; +34;headers.at:1;separate compilation of log4cplus/helpers/fileinfo.h;headers-compilation; +35;headers.at:1;separate compilation of log4cplus/helpers/lockfile.h;headers-compilation; +36;headers.at:1;separate compilation of log4cplus/helpers/loglog.h;headers-compilation; +37;headers.at:1;separate compilation of log4cplus/helpers/logloguser.h;headers-compilation; +38;headers.at:1;separate compilation of log4cplus/helpers/pointer.h;headers-compilation; +39;headers.at:1;separate compilation of log4cplus/helpers/property.h;headers-compilation; +40;headers.at:1;separate compilation of log4cplus/helpers/queue.h;headers-compilation; +41;headers.at:1;separate compilation of log4cplus/helpers/sleep.h;headers-compilation; +42;headers.at:1;separate compilation of log4cplus/helpers/snprintf.h;headers-compilation; +43;headers.at:1;separate compilation of log4cplus/helpers/socket.h;headers-compilation; +44;headers.at:1;separate compilation of log4cplus/helpers/socketbuffer.h;headers-compilation; +45;headers.at:1;separate compilation of log4cplus/helpers/stringhelper.h;headers-compilation; +46;headers.at:1;separate compilation of log4cplus/helpers/timehelper.h;headers-compilation; +47;headers.at:1;separate compilation of log4cplus/spi/appenderattachable.h;headers-compilation; +48;headers.at:1;separate compilation of log4cplus/spi/factory.h;headers-compilation; +49;headers.at:1;separate compilation of log4cplus/spi/filter.h;headers-compilation; +50;headers.at:1;separate compilation of log4cplus/spi/loggerfactory.h;headers-compilation; +51;headers.at:1;separate compilation of log4cplus/spi/loggerimpl.h;headers-compilation; +52;headers.at:1;separate compilation of log4cplus/spi/loggingevent.h;headers-compilation; +53;headers.at:1;separate compilation of log4cplus/spi/objectregistry.h;headers-compilation; +54;headers.at:1;separate compilation of log4cplus/spi/rootlogger.h;headers-compilation; +55;headers.at:1;separate compilation of log4cplus/thread/syncprims-pub-impl.h;headers-compilation; +56;headers.at:1;separate compilation of log4cplus/thread/syncprims.h;headers-compilation; +57;headers.at:1;separate compilation of log4cplus/thread/threads.h;headers-compilation; +58;appender_test.at:1;appender_test;appenders; +59;configandwatch_test.at:1;configandwatch_test;appenders; +60;customloglevel_test.at:1;customloglevel_test;appenders; +61;fileappender_test.at:1;fileappender_test;appenders; +62;filter_test.at:1;filter_test;appenders; +63;hierarchy_test.at:1;hierarchy_test;appenders; +64;loglog_test.at:1;loglog_test;appenders; +65;ndc_test.at:1;ndc_test;appenders; +66;ostream_test.at:1;ostream_test;appenders; +67;patternlayout_test.at:1;patternlayout_test;appenders; +68;performance_test.at:1;performance_test;appenders; +69;priority_test.at:1;priority_test;appenders; +70;propertyconfig_test.at:1;propertyconfig_test;appenders; +71;thread_test.at:1;thread_test;appenders; +72;timeformat_test.at:1;timeformat_test;appenders; " # List of the all the test groups. at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'` @@ -676,7 +675,7 @@ at_fn_validate_ranges () for at_grp do eval at_value=\$$at_grp - if test $at_value -lt 1 || test $at_value -gt 73; then + if test $at_value -lt 1 || test $at_value -gt 72; then $as_echo "invalid test group: $at_value" >&2 exit 1 fi @@ -1036,7 +1035,7 @@ esac # Category starts at test group 1. at_banner_text_1="separate headers compilation" # Banner 2. testsuite.at:14 -# Category starts at test group 59. +# Category starts at test group 58. at_banner_text_2="other tests" # Take any -C into account. @@ -2614,56 +2613,10 @@ read at_status <"$at_status_file" #AT_STOP_12 #AT_START_13 at_fn_group_banner 13 'headers.at:1' \ - "separate compilation of log4cplus/log4cplus.h" " " 1 -at_xfail=no -( - $as_echo "13. $at_setup_line: testing $at_desc ..." - $at_traceon - - - - { set +x -$as_echo "$at_srcdir/headers.at:1: \$as_echo \"#include \\\"log4cplus/log4cplus.h\\\"\">test.cxx" -at_fn_check_prepare_dynamic "$as_echo \"#include \\\"log4cplus/log4cplus.h\\\"\">test.cxx" "headers.at:1" -( $at_check_trace; $as_echo "#include \"log4cplus/log4cplus.h\"">test.cxx -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/headers.at:1" -$at_failed && at_fn_log_failure -$at_traceon; } - - - - { set +x -$as_echo "$at_srcdir/headers.at:1: \$CXX \$CPPFLAGS \$CXXFLAGS -c \"test.cxx\"" -at_fn_check_prepare_dynamic "$CXX $CPPFLAGS $CXXFLAGS -c \"test.cxx\"" "headers.at:1" -( $at_check_trace; $CXX $CPPFLAGS $CXXFLAGS -c "test.cxx" -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/headers.at:1" -$at_failed && at_fn_log_failure \ -"test.cxx" -$at_traceon; } - - - - set +x - $at_times_p && times >"$at_times_file" -) 5>&1 2>&1 7>&- | eval $at_tee_pipe -read at_status <"$at_status_file" -#AT_STOP_13 -#AT_START_14 -at_fn_group_banner 14 'headers.at:1' \ "separate compilation of log4cplus/log4judpappender.h" "" 1 at_xfail=no ( - $as_echo "14. $at_setup_line: testing $at_desc ..." + $as_echo "13. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2703,13 +2656,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_14 -#AT_START_15 -at_fn_group_banner 15 'headers.at:1' \ +#AT_STOP_13 +#AT_START_14 +at_fn_group_banner 14 'headers.at:1' \ "separate compilation of log4cplus/logger.h" " " 1 at_xfail=no ( - $as_echo "15. $at_setup_line: testing $at_desc ..." + $as_echo "14. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2749,13 +2702,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_15 -#AT_START_16 -at_fn_group_banner 16 'headers.at:1' \ +#AT_STOP_14 +#AT_START_15 +at_fn_group_banner 15 'headers.at:1' \ "separate compilation of log4cplus/loggingmacros.h" "" 1 at_xfail=no ( - $as_echo "16. $at_setup_line: testing $at_desc ..." + $as_echo "15. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2795,13 +2748,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_16 -#AT_START_17 -at_fn_group_banner 17 'headers.at:1' \ +#AT_STOP_15 +#AT_START_16 +at_fn_group_banner 16 'headers.at:1' \ "separate compilation of log4cplus/loglevel.h" " " 1 at_xfail=no ( - $as_echo "17. $at_setup_line: testing $at_desc ..." + $as_echo "16. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2841,13 +2794,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_17 -#AT_START_18 -at_fn_group_banner 18 'headers.at:1' \ +#AT_STOP_16 +#AT_START_17 +at_fn_group_banner 17 'headers.at:1' \ "separate compilation of log4cplus/mdc.h" " " 1 at_xfail=no ( - $as_echo "18. $at_setup_line: testing $at_desc ..." + $as_echo "17. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2887,13 +2840,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_18 -#AT_START_19 -at_fn_group_banner 19 'headers.at:1' \ +#AT_STOP_17 +#AT_START_18 +at_fn_group_banner 18 'headers.at:1' \ "separate compilation of log4cplus/msttsappender.h" "" 1 at_xfail=no ( - $as_echo "19. $at_setup_line: testing $at_desc ..." + $as_echo "18. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2933,13 +2886,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_19 -#AT_START_20 -at_fn_group_banner 20 'headers.at:1' \ +#AT_STOP_18 +#AT_START_19 +at_fn_group_banner 19 'headers.at:1' \ "separate compilation of log4cplus/ndc.h" " " 1 at_xfail=no ( - $as_echo "20. $at_setup_line: testing $at_desc ..." + $as_echo "19. $at_setup_line: testing $at_desc ..." $at_traceon @@ -2979,13 +2932,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_20 -#AT_START_21 -at_fn_group_banner 21 'headers.at:1' \ +#AT_STOP_19 +#AT_START_20 +at_fn_group_banner 20 'headers.at:1' \ "separate compilation of log4cplus/nteventlogappender.h" "" 1 at_xfail=no ( - $as_echo "21. $at_setup_line: testing $at_desc ..." + $as_echo "20. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3025,13 +2978,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_21 -#AT_START_22 -at_fn_group_banner 22 'headers.at:1' \ +#AT_STOP_20 +#AT_START_21 +at_fn_group_banner 21 'headers.at:1' \ "separate compilation of log4cplus/nullappender.h" "" 1 at_xfail=no ( - $as_echo "22. $at_setup_line: testing $at_desc ..." + $as_echo "21. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3071,13 +3024,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_22 -#AT_START_23 -at_fn_group_banner 23 'headers.at:1' \ +#AT_STOP_21 +#AT_START_22 +at_fn_group_banner 22 'headers.at:1' \ "separate compilation of log4cplus/qt4debugappender.h" "" 1 at_xfail=no ( - $as_echo "23. $at_setup_line: testing $at_desc ..." + $as_echo "22. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3117,13 +3070,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_23 -#AT_START_24 -at_fn_group_banner 24 'headers.at:1' \ +#AT_STOP_22 +#AT_START_23 +at_fn_group_banner 23 'headers.at:1' \ "separate compilation of log4cplus/socketappender.h" "" 1 at_xfail=no ( - $as_echo "24. $at_setup_line: testing $at_desc ..." + $as_echo "23. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3163,13 +3116,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_24 -#AT_START_25 -at_fn_group_banner 25 'headers.at:1' \ +#AT_STOP_23 +#AT_START_24 +at_fn_group_banner 24 'headers.at:1' \ "separate compilation of log4cplus/streams.h" " " 1 at_xfail=no ( - $as_echo "25. $at_setup_line: testing $at_desc ..." + $as_echo "24. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3209,13 +3162,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_25 -#AT_START_26 -at_fn_group_banner 26 'headers.at:1' \ +#AT_STOP_24 +#AT_START_25 +at_fn_group_banner 25 'headers.at:1' \ "separate compilation of log4cplus/syslogappender.h" "" 1 at_xfail=no ( - $as_echo "26. $at_setup_line: testing $at_desc ..." + $as_echo "25. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3255,13 +3208,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_26 -#AT_START_27 -at_fn_group_banner 27 'headers.at:1' \ +#AT_STOP_25 +#AT_START_26 +at_fn_group_banner 26 'headers.at:1' \ "separate compilation of log4cplus/tchar.h" " " 1 at_xfail=no ( - $as_echo "27. $at_setup_line: testing $at_desc ..." + $as_echo "26. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3301,13 +3254,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_27 -#AT_START_28 -at_fn_group_banner 28 'headers.at:1' \ +#AT_STOP_26 +#AT_START_27 +at_fn_group_banner 27 'headers.at:1' \ "separate compilation of log4cplus/tracelogger.h" "" 1 at_xfail=no ( - $as_echo "28. $at_setup_line: testing $at_desc ..." + $as_echo "27. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3347,13 +3300,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_28 -#AT_START_29 -at_fn_group_banner 29 'headers.at:1' \ +#AT_STOP_27 +#AT_START_28 +at_fn_group_banner 28 'headers.at:1' \ "separate compilation of log4cplus/tstring.h" " " 1 at_xfail=no ( - $as_echo "29. $at_setup_line: testing $at_desc ..." + $as_echo "28. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3393,13 +3346,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_29 -#AT_START_30 -at_fn_group_banner 30 'headers.at:1' \ +#AT_STOP_28 +#AT_START_29 +at_fn_group_banner 29 'headers.at:1' \ "separate compilation of log4cplus/version.h" " " 1 at_xfail=no ( - $as_echo "30. $at_setup_line: testing $at_desc ..." + $as_echo "29. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3439,13 +3392,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_30 -#AT_START_31 -at_fn_group_banner 31 'headers.at:1' \ +#AT_STOP_29 +#AT_START_30 +at_fn_group_banner 30 'headers.at:1' \ "separate compilation of log4cplus/win32consoleappender.h" "" 1 at_xfail=no ( - $as_echo "31. $at_setup_line: testing $at_desc ..." + $as_echo "30. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3485,13 +3438,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_31 -#AT_START_32 -at_fn_group_banner 32 'headers.at:1' \ +#AT_STOP_30 +#AT_START_31 +at_fn_group_banner 31 'headers.at:1' \ "separate compilation of log4cplus/win32debugappender.h" "" 1 at_xfail=no ( - $as_echo "32. $at_setup_line: testing $at_desc ..." + $as_echo "31. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3531,13 +3484,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_32 -#AT_START_33 -at_fn_group_banner 33 'headers.at:1' \ +#AT_STOP_31 +#AT_START_32 +at_fn_group_banner 32 'headers.at:1' \ "separate compilation of log4cplus/helpers/appenderattachableimpl.h" "" 1 at_xfail=no ( - $as_echo "33. $at_setup_line: testing $at_desc ..." + $as_echo "32. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3577,13 +3530,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_33 -#AT_START_34 -at_fn_group_banner 34 'headers.at:1' \ +#AT_STOP_32 +#AT_START_33 +at_fn_group_banner 33 'headers.at:1' \ "separate compilation of log4cplus/helpers/connectorthread.h" "" 1 at_xfail=no ( - $as_echo "34. $at_setup_line: testing $at_desc ..." + $as_echo "33. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3623,13 +3576,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_34 -#AT_START_35 -at_fn_group_banner 35 'headers.at:1' \ +#AT_STOP_33 +#AT_START_34 +at_fn_group_banner 34 'headers.at:1' \ "separate compilation of log4cplus/helpers/fileinfo.h" "" 1 at_xfail=no ( - $as_echo "35. $at_setup_line: testing $at_desc ..." + $as_echo "34. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3669,13 +3622,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_35 -#AT_START_36 -at_fn_group_banner 36 'headers.at:1' \ +#AT_STOP_34 +#AT_START_35 +at_fn_group_banner 35 'headers.at:1' \ "separate compilation of log4cplus/helpers/lockfile.h" "" 1 at_xfail=no ( - $as_echo "36. $at_setup_line: testing $at_desc ..." + $as_echo "35. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3715,13 +3668,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_36 -#AT_START_37 -at_fn_group_banner 37 'headers.at:1' \ +#AT_STOP_35 +#AT_START_36 +at_fn_group_banner 36 'headers.at:1' \ "separate compilation of log4cplus/helpers/loglog.h" "" 1 at_xfail=no ( - $as_echo "37. $at_setup_line: testing $at_desc ..." + $as_echo "36. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3761,13 +3714,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_37 -#AT_START_38 -at_fn_group_banner 38 'headers.at:1' \ +#AT_STOP_36 +#AT_START_37 +at_fn_group_banner 37 'headers.at:1' \ "separate compilation of log4cplus/helpers/logloguser.h" "" 1 at_xfail=no ( - $as_echo "38. $at_setup_line: testing $at_desc ..." + $as_echo "37. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3807,13 +3760,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_38 -#AT_START_39 -at_fn_group_banner 39 'headers.at:1' \ +#AT_STOP_37 +#AT_START_38 +at_fn_group_banner 38 'headers.at:1' \ "separate compilation of log4cplus/helpers/pointer.h" "" 1 at_xfail=no ( - $as_echo "39. $at_setup_line: testing $at_desc ..." + $as_echo "38. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3853,13 +3806,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_39 -#AT_START_40 -at_fn_group_banner 40 'headers.at:1' \ +#AT_STOP_38 +#AT_START_39 +at_fn_group_banner 39 'headers.at:1' \ "separate compilation of log4cplus/helpers/property.h" "" 1 at_xfail=no ( - $as_echo "40. $at_setup_line: testing $at_desc ..." + $as_echo "39. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3899,13 +3852,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_40 -#AT_START_41 -at_fn_group_banner 41 'headers.at:1' \ +#AT_STOP_39 +#AT_START_40 +at_fn_group_banner 40 'headers.at:1' \ "separate compilation of log4cplus/helpers/queue.h" "" 1 at_xfail=no ( - $as_echo "41. $at_setup_line: testing $at_desc ..." + $as_echo "40. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3945,13 +3898,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_41 -#AT_START_42 -at_fn_group_banner 42 'headers.at:1' \ +#AT_STOP_40 +#AT_START_41 +at_fn_group_banner 41 'headers.at:1' \ "separate compilation of log4cplus/helpers/sleep.h" "" 1 at_xfail=no ( - $as_echo "42. $at_setup_line: testing $at_desc ..." + $as_echo "41. $at_setup_line: testing $at_desc ..." $at_traceon @@ -3991,13 +3944,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_42 -#AT_START_43 -at_fn_group_banner 43 'headers.at:1' \ +#AT_STOP_41 +#AT_START_42 +at_fn_group_banner 42 'headers.at:1' \ "separate compilation of log4cplus/helpers/snprintf.h" "" 1 at_xfail=no ( - $as_echo "43. $at_setup_line: testing $at_desc ..." + $as_echo "42. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4037,13 +3990,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_43 -#AT_START_44 -at_fn_group_banner 44 'headers.at:1' \ +#AT_STOP_42 +#AT_START_43 +at_fn_group_banner 43 'headers.at:1' \ "separate compilation of log4cplus/helpers/socket.h" "" 1 at_xfail=no ( - $as_echo "44. $at_setup_line: testing $at_desc ..." + $as_echo "43. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4083,13 +4036,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_44 -#AT_START_45 -at_fn_group_banner 45 'headers.at:1' \ +#AT_STOP_43 +#AT_START_44 +at_fn_group_banner 44 'headers.at:1' \ "separate compilation of log4cplus/helpers/socketbuffer.h" "" 1 at_xfail=no ( - $as_echo "45. $at_setup_line: testing $at_desc ..." + $as_echo "44. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4129,13 +4082,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_45 -#AT_START_46 -at_fn_group_banner 46 'headers.at:1' \ +#AT_STOP_44 +#AT_START_45 +at_fn_group_banner 45 'headers.at:1' \ "separate compilation of log4cplus/helpers/stringhelper.h" "" 1 at_xfail=no ( - $as_echo "46. $at_setup_line: testing $at_desc ..." + $as_echo "45. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4175,13 +4128,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_46 -#AT_START_47 -at_fn_group_banner 47 'headers.at:1' \ +#AT_STOP_45 +#AT_START_46 +at_fn_group_banner 46 'headers.at:1' \ "separate compilation of log4cplus/helpers/timehelper.h" "" 1 at_xfail=no ( - $as_echo "47. $at_setup_line: testing $at_desc ..." + $as_echo "46. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4221,13 +4174,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_47 -#AT_START_48 -at_fn_group_banner 48 'headers.at:1' \ +#AT_STOP_46 +#AT_START_47 +at_fn_group_banner 47 'headers.at:1' \ "separate compilation of log4cplus/spi/appenderattachable.h" "" 1 at_xfail=no ( - $as_echo "48. $at_setup_line: testing $at_desc ..." + $as_echo "47. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4267,13 +4220,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_48 -#AT_START_49 -at_fn_group_banner 49 'headers.at:1' \ +#AT_STOP_47 +#AT_START_48 +at_fn_group_banner 48 'headers.at:1' \ "separate compilation of log4cplus/spi/factory.h" "" 1 at_xfail=no ( - $as_echo "49. $at_setup_line: testing $at_desc ..." + $as_echo "48. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4313,13 +4266,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_49 -#AT_START_50 -at_fn_group_banner 50 'headers.at:1' \ +#AT_STOP_48 +#AT_START_49 +at_fn_group_banner 49 'headers.at:1' \ "separate compilation of log4cplus/spi/filter.h" " " 1 at_xfail=no ( - $as_echo "50. $at_setup_line: testing $at_desc ..." + $as_echo "49. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4359,13 +4312,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_50 -#AT_START_51 -at_fn_group_banner 51 'headers.at:1' \ +#AT_STOP_49 +#AT_START_50 +at_fn_group_banner 50 'headers.at:1' \ "separate compilation of log4cplus/spi/loggerfactory.h" "" 1 at_xfail=no ( - $as_echo "51. $at_setup_line: testing $at_desc ..." + $as_echo "50. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4405,13 +4358,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_51 -#AT_START_52 -at_fn_group_banner 52 'headers.at:1' \ +#AT_STOP_50 +#AT_START_51 +at_fn_group_banner 51 'headers.at:1' \ "separate compilation of log4cplus/spi/loggerimpl.h" "" 1 at_xfail=no ( - $as_echo "52. $at_setup_line: testing $at_desc ..." + $as_echo "51. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4451,13 +4404,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_52 -#AT_START_53 -at_fn_group_banner 53 'headers.at:1' \ +#AT_STOP_51 +#AT_START_52 +at_fn_group_banner 52 'headers.at:1' \ "separate compilation of log4cplus/spi/loggingevent.h" "" 1 at_xfail=no ( - $as_echo "53. $at_setup_line: testing $at_desc ..." + $as_echo "52. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4497,13 +4450,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_53 -#AT_START_54 -at_fn_group_banner 54 'headers.at:1' \ +#AT_STOP_52 +#AT_START_53 +at_fn_group_banner 53 'headers.at:1' \ "separate compilation of log4cplus/spi/objectregistry.h" "" 1 at_xfail=no ( - $as_echo "54. $at_setup_line: testing $at_desc ..." + $as_echo "53. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4543,13 +4496,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_54 -#AT_START_55 -at_fn_group_banner 55 'headers.at:1' \ +#AT_STOP_53 +#AT_START_54 +at_fn_group_banner 54 'headers.at:1' \ "separate compilation of log4cplus/spi/rootlogger.h" "" 1 at_xfail=no ( - $as_echo "55. $at_setup_line: testing $at_desc ..." + $as_echo "54. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4589,13 +4542,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_55 -#AT_START_56 -at_fn_group_banner 56 'headers.at:1' \ +#AT_STOP_54 +#AT_START_55 +at_fn_group_banner 55 'headers.at:1' \ "separate compilation of log4cplus/thread/syncprims-pub-impl.h" "" 1 at_xfail=no ( - $as_echo "56. $at_setup_line: testing $at_desc ..." + $as_echo "55. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4635,13 +4588,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_56 -#AT_START_57 -at_fn_group_banner 57 'headers.at:1' \ +#AT_STOP_55 +#AT_START_56 +at_fn_group_banner 56 'headers.at:1' \ "separate compilation of log4cplus/thread/syncprims.h" "" 1 at_xfail=no ( - $as_echo "57. $at_setup_line: testing $at_desc ..." + $as_echo "56. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4681,13 +4634,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_57 -#AT_START_58 -at_fn_group_banner 58 'headers.at:1' \ +#AT_STOP_56 +#AT_START_57 +at_fn_group_banner 57 'headers.at:1' \ "separate compilation of log4cplus/thread/threads.h" "" 1 at_xfail=no ( - $as_echo "58. $at_setup_line: testing $at_desc ..." + $as_echo "57. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4727,13 +4680,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_58 -#AT_START_59 -at_fn_group_banner 59 'appender_test.at:1' \ +#AT_STOP_57 +#AT_START_58 +at_fn_group_banner 58 'appender_test.at:1' \ "appender_test" " " 2 at_xfail=no ( - $as_echo "59. $at_setup_line: testing $at_desc ..." + $as_echo "58. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4769,13 +4722,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_59 -#AT_START_60 -at_fn_group_banner 60 'configandwatch_test.at:1' \ +#AT_STOP_58 +#AT_START_59 +at_fn_group_banner 59 'configandwatch_test.at:1' \ "configandwatch_test" " " 2 at_xfail=no ( - $as_echo "60. $at_setup_line: testing $at_desc ..." + $as_echo "59. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4827,13 +4780,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_60 -#AT_START_61 -at_fn_group_banner 61 'customloglevel_test.at:1' \ +#AT_STOP_59 +#AT_START_60 +at_fn_group_banner 60 'customloglevel_test.at:1' \ "customloglevel_test" " " 2 at_xfail=no ( - $as_echo "61. $at_setup_line: testing $at_desc ..." + $as_echo "60. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4869,13 +4822,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_61 -#AT_START_62 -at_fn_group_banner 62 'fileappender_test.at:1' \ +#AT_STOP_60 +#AT_START_61 +at_fn_group_banner 61 'fileappender_test.at:1' \ "fileappender_test" " " 2 at_xfail=no ( - $as_echo "62. $at_setup_line: testing $at_desc ..." + $as_echo "61. $at_setup_line: testing $at_desc ..." $at_traceon @@ -4924,13 +4877,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_62 -#AT_START_63 -at_fn_group_banner 63 'filter_test.at:1' \ +#AT_STOP_61 +#AT_START_62 +at_fn_group_banner 62 'filter_test.at:1' \ "filter_test" " " 2 at_xfail=no ( - $as_echo "63. $at_setup_line: testing $at_desc ..." + $as_echo "62. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5074,13 +5027,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_63 -#AT_START_64 -at_fn_group_banner 64 'hierarchy_test.at:1' \ +#AT_STOP_62 +#AT_START_63 +at_fn_group_banner 63 'hierarchy_test.at:1' \ "hierarchy_test" " " 2 at_xfail=no ( - $as_echo "64. $at_setup_line: testing $at_desc ..." + $as_echo "63. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5116,13 +5069,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_64 -#AT_START_65 -at_fn_group_banner 65 'loglog_test.at:1' \ +#AT_STOP_63 +#AT_START_64 +at_fn_group_banner 64 'loglog_test.at:1' \ "loglog_test" " " 2 at_xfail=no ( - $as_echo "65. $at_setup_line: testing $at_desc ..." + $as_echo "64. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5171,13 +5124,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_65 -#AT_START_66 -at_fn_group_banner 66 'ndc_test.at:1' \ +#AT_STOP_64 +#AT_START_65 +at_fn_group_banner 65 'ndc_test.at:1' \ "ndc_test" " " 2 at_xfail=no ( - $as_echo "66. $at_setup_line: testing $at_desc ..." + $as_echo "65. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5213,13 +5166,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_66 -#AT_START_67 -at_fn_group_banner 67 'ostream_test.at:1' \ +#AT_STOP_65 +#AT_START_66 +at_fn_group_banner 66 'ostream_test.at:1' \ "ostream_test" " " 2 at_xfail=no ( - $as_echo "67. $at_setup_line: testing $at_desc ..." + $as_echo "66. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5255,13 +5208,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_67 -#AT_START_68 -at_fn_group_banner 68 'patternlayout_test.at:1' \ +#AT_STOP_66 +#AT_START_67 +at_fn_group_banner 67 'patternlayout_test.at:1' \ "patternlayout_test" " " 2 at_xfail=no ( - $as_echo "68. $at_setup_line: testing $at_desc ..." + $as_echo "67. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5307,13 +5260,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_68 -#AT_START_69 -at_fn_group_banner 69 'performance_test.at:1' \ +#AT_STOP_67 +#AT_START_68 +at_fn_group_banner 68 'performance_test.at:1' \ "performance_test" " " 2 at_xfail=no ( - $as_echo "69. $at_setup_line: testing $at_desc ..." + $as_echo "68. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5362,13 +5315,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_69 -#AT_START_70 -at_fn_group_banner 70 'priority_test.at:1' \ +#AT_STOP_68 +#AT_START_69 +at_fn_group_banner 69 'priority_test.at:1' \ "priority_test" " " 2 at_xfail=no ( - $as_echo "70. $at_setup_line: testing $at_desc ..." + $as_echo "69. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5404,13 +5357,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_70 -#AT_START_71 -at_fn_group_banner 71 'propertyconfig_test.at:1' \ +#AT_STOP_69 +#AT_START_70 +at_fn_group_banner 70 'propertyconfig_test.at:1' \ "propertyconfig_test" " " 2 at_xfail=no ( - $as_echo "71. $at_setup_line: testing $at_desc ..." + $as_echo "70. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5485,13 +5438,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_71 -#AT_START_72 -at_fn_group_banner 72 'thread_test.at:1' \ +#AT_STOP_70 +#AT_START_71 +at_fn_group_banner 71 'thread_test.at:1' \ "thread_test" " " 2 at_xfail=no ( - $as_echo "72. $at_setup_line: testing $at_desc ..." + $as_echo "71. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5517,13 +5470,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_72 -#AT_START_73 -at_fn_group_banner 73 'timeformat_test.at:1' \ +#AT_STOP_71 +#AT_START_72 +at_fn_group_banner 72 'timeformat_test.at:1' \ "timeformat_test" " " 2 at_xfail=no ( - $as_echo "73. $at_setup_line: testing $at_desc ..." + $as_echo "72. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5572,4 +5525,4 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_73 +#AT_STOP_72 From 768a57c8d9acc341bc9476e6e6445e97fe880d44 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Fri, 16 Jan 2015 08:57:10 +0100 Subject: [PATCH 056/165] Move init_priority attribute right after variable name to avoid it being ignored in case of parenthesized initializer. --- configure | 3 +-- m4/ax_gcc_var_attribute.m4 | 3 +-- src/threads.cxx | 10 ++++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 3194f0112..d99ac9eeb 100755 --- a/configure +++ b/configure @@ -8436,8 +8436,7 @@ else #include struct bar { bar() {} ~bar() {} }; bar b __attribute__((init_priority(65535/2))); - static std::string name ("test") - __attribute__((init_priority(65535/2))); + static std::string name __attribute__((init_priority(65535/2))) ("test"); int main () diff --git a/m4/ax_gcc_var_attribute.m4 b/m4/ax_gcc_var_attribute.m4 index 8547f1ac8..4b7ec061b 100644 --- a/m4/ax_gcc_var_attribute.m4 +++ b/m4/ax_gcc_var_attribute.m4 @@ -111,8 +111,7 @@ AC_DEFUN([AX_GCC_VAR_ATTRIBUTE], [ #include struct bar { bar() {} ~bar() {} }; bar b __attribute__(($1(65535/2))); - static std::string name ("test") - __attribute__(($1(65535/2))); + static std::string name __attribute__(($1(65535/2))) ("test"); ], [ m4_warn([syntax], [Unsupported attribute $1, the test may fail]) diff --git a/src/threads.cxx b/src/threads.cxx index 60e7ea92a..a196f928c 100644 --- a/src/threads.cxx +++ b/src/threads.cxx @@ -95,10 +95,12 @@ yield() } #if defined(LOG4CPLUS_SINGLE_THREADED) -static log4cplus::tstring thread_name(LOG4CPLUS_TEXT("single")) - LOG4CPLUS_INIT_PRIORITY (LOG4CPLUS_INIT_PRIORITY_BASE - 1); -static log4cplus::tstring thread_name2(thread_name) - LOG4CPLUS_INIT_PRIORITY (LOG4CPLUS_INIT_PRIORITY_BASE - 1); +static log4cplus::tstring thread_name + LOG4CPLUS_INIT_PRIORITY (LOG4CPLUS_INIT_PRIORITY_BASE - 1) + (LOG4CPLUS_TEXT("single")); +static log4cplus::tstring thread_name2 + LOG4CPLUS_INIT_PRIORITY (LOG4CPLUS_INIT_PRIORITY_BASE - 1) + (thread_name); #endif LOG4CPLUS_EXPORT From aa0e71d579aafe8bdc914ba103370746704875f7 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Mon, 26 Jan 2015 19:49:18 +0100 Subject: [PATCH 057/165] Avoid "most vexing parse" isseu with LOG4CPLUS_C_STR_TO_TSTRING(STRING) when STRING is an identifier. --- include/log4cplus/tstring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/log4cplus/tstring.h b/include/log4cplus/tstring.h index 1d4f04505..231ae41e9 100644 --- a/include/log4cplus/tstring.h +++ b/include/log4cplus/tstring.h @@ -122,7 +122,7 @@ LOG4CPLUS_EXPORT std::wstring towstring(char const *); #else // UNICODE -#define LOG4CPLUS_C_STR_TO_TSTRING(STRING) std::string(STRING) +#define LOG4CPLUS_C_STR_TO_TSTRING(STRING) (std::string(STRING)) #define LOG4CPLUS_STRING_TO_TSTRING(STRING) STRING #define LOG4CPLUS_TSTRING_TO_STRING(STRING) STRING From 736168e97046eb859080366e62f3651e2c5a3e6e Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Mon, 26 Jan 2015 17:44:22 +0100 Subject: [PATCH 058/165] Fix bug in LogLevelMatchFilter with AcceptOnMatch default value. When AcceptOnMatch property is missing then the default should stay true. This was introduced abuot 5 years ago in 1.1 branch during Properties API changes. --- src/filter.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/filter.cxx b/src/filter.cxx index abf640a53..dc2444b4a 100644 --- a/src/filter.cxx +++ b/src/filter.cxx @@ -110,8 +110,7 @@ LogLevelMatchFilter::LogLevelMatchFilter(const helpers::Properties& properties) { init(); - properties.getBool (acceptOnMatch = false, - LOG4CPLUS_TEXT("AcceptOnMatch")); + properties.getBool (acceptOnMatch, LOG4CPLUS_TEXT("AcceptOnMatch")); tstring const & log_level_to_match = properties.getProperty( LOG4CPLUS_TEXT("LogLevelToMatch") ); From 1854048a4942bb03a5961b2af5f4e15927d45a34 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Mon, 26 Jan 2015 16:50:09 +0100 Subject: [PATCH 059/165] ndc.cxx: Implement remove() in terms of clear(). --- src/ndc.cxx | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/src/ndc.cxx b/src/ndc.cxx index 5f34cafaa..7e74d5241 100644 --- a/src/ndc.cxx +++ b/src/ndc.cxx @@ -134,11 +134,11 @@ DiagnosticContext::swap (DiagnosticContext & other) // log4cplus::NDC ctor and dtor /////////////////////////////////////////////////////////////////////////////// -NDC::NDC() +NDC::NDC() { } -NDC::~NDC() +NDC::~NDC() { } @@ -155,6 +155,13 @@ NDC::clear() } +void +NDC::remove() +{ + clear(); +} + + DiagnosticContextStack NDC::cloneStack() const { @@ -163,7 +170,7 @@ NDC::cloneStack() const } -void +void NDC::inherit(const DiagnosticContextStack& stack) { DiagnosticContextStack* ptr = getPtr(); @@ -182,7 +189,7 @@ NDC::get() const } -std::size_t +std::size_t NDC::getDepth() const { DiagnosticContextStack* ptr = getPtr(); @@ -190,7 +197,7 @@ NDC::getDepth() const } -log4cplus::tstring +log4cplus::tstring NDC::pop() { DiagnosticContextStack* ptr = getPtr(); @@ -226,14 +233,14 @@ NDC::peek() const } -void +void NDC::push(const log4cplus::tstring& message) { push_worker (message); } -void +void NDC::push(tchar const * message) { push_worker (message); @@ -255,15 +262,7 @@ NDC::push_worker (StringType const & message) } -void -NDC::remove() -{ - DiagnosticContextStack* ptr = getPtr(); - DiagnosticContextStack ().swap (*ptr); -} - - -void +void NDC::setMaxDepth(std::size_t maxDepth) { DiagnosticContextStack* ptr = getPtr(); @@ -283,9 +282,9 @@ DiagnosticContextStack* NDC::getPtr() // // -NDCContextCreator::NDCContextCreator(const log4cplus::tstring& msg) -{ - getNDC().push(msg); +NDCContextCreator::NDCContextCreator(const log4cplus::tstring& msg) +{ + getNDC().push(msg); } @@ -295,9 +294,9 @@ NDCContextCreator::NDCContextCreator(tchar const * msg) } -NDCContextCreator::~NDCContextCreator() -{ - getNDC().pop_void(); +NDCContextCreator::~NDCContextCreator() +{ + getNDC().pop_void(); } From e7cdf6d15610c8e0acc4abdb7f0bbdee1014ac63 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Mon, 26 Jan 2015 21:59:44 +0100 Subject: [PATCH 060/165] Make sure Travis-CI builds are enabled for 1.2.x branch. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0d10db1a2..98f525b33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,8 @@ after_failure: branches: only: - master + - 1.2.x + - 1.1.x notifications: recipients: - vhaisman@gmail.com From 23f60914145ce087b37d9701d17ad2b8017203e5 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Mon, 26 Jan 2015 22:45:14 +0100 Subject: [PATCH 061/165] Fix StringMatchFilter bug when AcceptOnMatch is not provided. It should default to true but was false. --- src/filter.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/filter.cxx b/src/filter.cxx index dc2444b4a..fca0f6c6c 100644 --- a/src/filter.cxx +++ b/src/filter.cxx @@ -223,8 +223,7 @@ StringMatchFilter::StringMatchFilter(const helpers::Properties& properties) { init(); - properties.getBool (acceptOnMatch = false, - LOG4CPLUS_TEXT("AcceptOnMatch")); + properties.getBool (acceptOnMatch, LOG4CPLUS_TEXT("AcceptOnMatch")); stringToMatch = properties.getProperty( LOG4CPLUS_TEXT("StringToMatch") ); } From b877ec430ed7ff37dca2e2fdf0f571a110bd1cf8 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Mon, 26 Jan 2015 23:14:31 +0100 Subject: [PATCH 062/165] Fix bug in LogLevelMatchFilter when AcceptOnMatch is not provided. The default should be true but was false. --- src/filter.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/filter.cxx b/src/filter.cxx index fca0f6c6c..d1d5c638e 100644 --- a/src/filter.cxx +++ b/src/filter.cxx @@ -134,7 +134,7 @@ LogLevelMatchFilter::decide(const InternalLoggingEvent& event) const } bool matchOccured = (logLevelToMatch == event.getLogLevel()); - + if(matchOccured) { return (acceptOnMatch ? ACCEPT : DENY); } @@ -160,8 +160,7 @@ LogLevelRangeFilter::LogLevelRangeFilter(const helpers::Properties& properties) { init(); - properties.getBool (acceptOnMatch = false, - LOG4CPLUS_TEXT("AcceptOnMatch")); + properties.getBool (acceptOnMatch, LOG4CPLUS_TEXT("AcceptOnMatch")); tstring const & log_level_min = properties.getProperty( LOG4CPLUS_TEXT("LogLevelMin") ); From 58b32e9b437f76eb92f6de8f5d6e8421ce62e2b5 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 9 May 2015 11:14:14 +0200 Subject: [PATCH 063/165] Fix for bug #86 on GitHub. fileappender.cxx: Create directories for lock file if CreateDirs is specified. fileappender_test/main.cxx: Add a test for this. --- src/fileappender.cxx | 3 +++ tests/fileappender_test/main.cxx | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index ba4362674..67643d17d 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -279,6 +279,9 @@ FileAppenderBase::init() helpers::LockFileGuard guard; if (useLockFile && ! lockFile.get ()) { + if (createDirs) + internal::make_dirs (lockFileName); + try { lockFile.reset (new helpers::LockFile (lockFileName)); diff --git a/tests/fileappender_test/main.cxx b/tests/fileappender_test/main.cxx index 0e22f6f4f..05bdf8fea 100644 --- a/tests/fileappender_test/main.cxx +++ b/tests/fileappender_test/main.cxx @@ -49,5 +49,21 @@ main() appender.setName (LOG4CPLUS_TEXT ("Third")); } + { + // This is checking that CreateDirs is respected when UseLockFile is + // provided and that directories for the lock file are created. + tistringstream propsStream ( + LOG4CPLUS_TEXT("CreateDirs=true\n") + LOG4CPLUS_TEXT("File=./logs/some_name.log\n") + LOG4CPLUS_TEXT("UseLockFile=true\n") + LOG4CPLUS_TEXT("MaxFileSize=100MB\n") + LOG4CPLUS_TEXT("MaxBackupIndex=10\n")); + helpers::Properties props (propsStream); + FileAppender appender (props); + appender.setName (LOG4CPLUS_TEXT ("Fourth")); + } + + log4cplus::Logger::shutdown(); + return 0; } From 2291f3a7affb2155818c7e680e20d4ca3399a45f Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Thu, 28 May 2015 11:47:17 +0200 Subject: [PATCH 064/165] Fail early on single-threaded builds with logging server enabled. Patch provided by: Alexis Wilke --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1397655d2..f190bf6b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,10 @@ if(NOT LOG4CPLUS_SINGLE_THREADED) message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}") endif(NOT LOG4CPLUS_SINGLE_THREADED) +if(LOG4CPLUS_SINGLE_THREADED AND LOG4CPLUS_BUILD_LOGGINGSERVER) + message (FATAL_ERROR "The logging server requires the multi-thread capability.") +endif(LOG4CPLUS_SINGLE_THREADED AND LOG4CPLUS_BUILD_LOGGINGSERVER) + set(BUILD_SHARED_LIBS TRUE CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library") if (WIN32) From f445c3378bd885e701cbcfca52120cd613257968 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 19 May 2015 09:19:30 +0200 Subject: [PATCH 065/165] Turn on SDL checks for Visual Studio debug builds. --- msvc10/log4cplus_debug.props | 1 + 1 file changed, 1 insertion(+) diff --git a/msvc10/log4cplus_debug.props b/msvc10/log4cplus_debug.props index dfbd58f58..5c30e3af6 100644 --- a/msvc10/log4cplus_debug.props +++ b/msvc10/log4cplus_debug.props @@ -8,6 +8,7 @@ Disabled _DEBUG;DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL + true \ No newline at end of file From b114cc48f67afb7b526f4a55cf5d7fb120cd7bd7 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 6 Jul 2015 14:07:44 +0200 Subject: [PATCH 066/165] Fix GitHub bug #92. Truncate seconds away from next rollover time. --- src/fileappender.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index 67643d17d..471e46470 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include #if defined (__BORLANDC__) @@ -849,11 +850,16 @@ DailyRollingFileAppender::rollover(bool alreadyLocked) Time -DailyRollingFileAppender::calculateNextRolloverTime(const Time& t) const +DailyRollingFileAppender::calculateNextRolloverTime(const Time& t_) const { + // Round down the time to whole minutes. + Time const t ( + t_.getTime () + - static_cast(std::fmod (t_.getTime (), 60))); + switch(schedule) { - case MONTHLY: + case MONTHLY: { struct tm nextMonthTime; t.localtime(&nextMonthTime); From 45fb51af036ab5023c12faf3dc37d77536a3a9cf Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 6 Jul 2015 15:04:00 +0200 Subject: [PATCH 067/165] Fix GitHub bug #92 also for other DailyRollingFileAppender schedules. --- src/fileappender.cxx | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index 471e46470..129aae212 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -675,6 +675,30 @@ DailyRollingFileAppender::DailyRollingFileAppender( } +namespace +{ + + +static +Time +round_time (Time const & t, time_t seconds) +{ + return Time ( + t.getTime () + - static_cast(std::fmod (t.getTime (), seconds))); +} + + +static +Time +round_time_and_add (Time const & t, Time const & seconds) +{ + return round_time (t, seconds.sec ()) + seconds; +} + + +} // namespace + void DailyRollingFileAppender::init(DailyRollingFileSchedule sch) @@ -850,13 +874,8 @@ DailyRollingFileAppender::rollover(bool alreadyLocked) Time -DailyRollingFileAppender::calculateNextRolloverTime(const Time& t_) const +DailyRollingFileAppender::calculateNextRolloverTime(const Time& t) const { - // Round down the time to whole minutes. - Time const t ( - t_.getTime () - - static_cast(std::fmod (t_.getTime (), 60))); - switch(schedule) { case MONTHLY: @@ -872,14 +891,14 @@ DailyRollingFileAppender::calculateNextRolloverTime(const Time& t_) const LOG4CPLUS_TEXT("DailyRollingFileAppender::calculateNextRolloverTime()-") LOG4CPLUS_TEXT(" setTime() returned error")); // Set next rollover to 31 days in future. - ret = (t + Time(2678400)); + ret = round_time (t, 24 * 60 * 60) + Time(2678400); } return ret; } case WEEKLY: - return (t + Time(7 * 24 * 60 * 60)); + return round_time (t, 24 * 60 * 60) + Time (7 * 24 * 60 * 60); default: helpers::getLogLog ().error ( @@ -888,16 +907,16 @@ DailyRollingFileAppender::calculateNextRolloverTime(const Time& t_) const // Fall through. case DAILY: - return (t + Time(24 * 60 * 60)); + return round_time_and_add (t, Time (24 * 60 * 60)); case TWICE_DAILY: - return (t + Time(12 * 60 * 60)); + return round_time_and_add (t, Time (12 * 60 * 60)); case HOURLY: - return (t + Time(60 * 60)); + return round_time_and_add (t, Time (60 * 60)); case MINUTELY: - return (t + Time(60)); + return round_time_and_add (t, Time (60)); }; } From ebedea51f25615aa42bf0a96101c460eaa60a9d7 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 7 Jul 2015 10:59:11 +0200 Subject: [PATCH 068/165] Fix GitHub bug #92. Fix fmod() ambiguity error. (cherry picked from commit 62dcb1c94b837bf181da75b075f6e8a6a01edaaf) --- src/fileappender.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index 129aae212..8705dfa1b 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -685,7 +685,9 @@ round_time (Time const & t, time_t seconds) { return Time ( t.getTime () - - static_cast(std::fmod (t.getTime (), seconds))); + - static_cast(std::fmod ( + static_cast(t.getTime ()), + static_cast(seconds)))); } From 34ca708c0ae951da1e6d911a630a3d3f61dc661c Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 7 Jul 2015 13:00:59 +0200 Subject: [PATCH 069/165] Export FileAppenderBase class. --- include/log4cplus/fileappender.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/log4cplus/fileappender.h b/include/log4cplus/fileappender.h index 29c9c1f29..54bf922ec 100644 --- a/include/log4cplus/fileappender.h +++ b/include/log4cplus/fileappender.h @@ -108,7 +108,7 @@ namespace log4cplus * * */ - class FileAppenderBase : public Appender { + class LOG4CPLUS_EXPORT FileAppenderBase : public Appender { public: // Methods virtual void close(); From 8b29023514621309f92ec9936a38e5acc1171ee1 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 15 Jul 2015 07:36:46 +0200 Subject: [PATCH 070/165] Allow turning off library name decoration in CMake builds. See also GitHub issue #98. (cherry picked from commit ff24b0ae94f1b0f8c500f08e1bb300d7454275e8) --- CMakeLists.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f190bf6b2..3de896e52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,21 +72,25 @@ option(ENABLE_SYMBOLS_VISIBILITY set(_WIN32_WINNT 0x0500 CACHE STRING "Define Windows API version to use.") -if (NOT ${BUILD_SHARED_LIBS}) - # set S-prefix for static build - set (log4cplus_postfix "${log4cplus_postfix}S") -endif() +option(LOG4CPLUS_ENABLE_DECORATED_LIBRARY_NAME + "Turns on resulting file name decoration for static and UNICODE builds." ON) +if (LOG4CPLUS_ENABLE_DECORATED_LIBRARY_NAME) + if (NOT ${BUILD_SHARED_LIBS}) + # set S-prefix for static build + set (log4cplus_postfix "${log4cplus_postfix}S") + endif () + + if (UNICODE) + set (log4cplus_postfix "${log4cplus_postfix}U") + endif (UNICODE) +endif (LOG4CPLUS_ENABLE_DECORATED_LIBRARY_NAME) -if (UNICODE) - set (log4cplus_postfix "${log4cplus_postfix}U") -endif (UNICODE) +set (log4cplus "log4cplus${log4cplus_postfix}") if (WITH_ICONV) set(LOG4CPLUS_WITH_ICONV 1) endif () -set (log4cplus "log4cplus${log4cplus_postfix}") - if(LOG4CPLUS_CONFIGURE_CHECKS_PATH) get_filename_component(LOG4CPLUS_CONFIGURE_CHECKS_PATH "${LOG4CPLUS_CONFIGURE_CHECKS_PATH}" ABSOLUTE) endif() From d107c5b5904baded27fa5ec9cf568b5b44970576 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 2 Aug 2015 14:23:10 +0200 Subject: [PATCH 071/165] ChangeLog: Prepare for 1.2.0-RC4. --- ChangeLog | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8d8324583..69af98bfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +log4cplus 1.2.0-RC3 +------------------- + + - Fixed `init_priority` GCC attribute detection and use issue. + + - Fixed "most vexing parse" issue with `LOG4CPLUS_C_STR_TO_TSTRING(STRING)` + when `STRING` is an identifier.` + + - Fixed AcceptOnMatch property function in filters default to true value. + + - Fixed GitHub bug #92. `DailyRollingFileAppender` rollover time was + drifting. + + - Fixed GitHub bug #86. Create directories for lock file if CreateDirs is + specified. + + - Allow turning off library name decoration in CMake builds. See also + GitHub issue #98. + log4cplus 1.2.0-RC3 ------------------- From 77de48a56d8d1e1fee1b7f0e35cdb9d17ad4f738 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 2 Aug 2015 14:25:48 +0200 Subject: [PATCH 072/165] ChangeLog: Fix header. It should state -RC4 not -RC3. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 69af98bfe..309e4011d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -log4cplus 1.2.0-RC3 +log4cplus 1.2.0-RC4 ------------------- - Fixed `init_priority` GCC attribute detection and use issue. From 0c5e74677565fb8a04e10a599776ab28da708151 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 2 Aug 2015 15:21:11 +0200 Subject: [PATCH 073/165] Fix LaTeX errors when generating PDF. --- docs/latex-header.tex | 14 -------------- scripts/build-pdf.pl | 5 +++-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/docs/latex-header.tex b/docs/latex-header.tex index 0b7bf390f..4bf2ed0a6 100644 --- a/docs/latex-header.tex +++ b/docs/latex-header.tex @@ -2,12 +2,9 @@ %% latex-header.tex begin %% -\usepackage{a4wide} -\usepackage{xcolor} \usepackage{graphicx} \usepackage{epstopdf} \usepackage{anyfontsize} -\usepackage[printwatermark]{xwatermark} \usepackage{amssymb} \usepackage{newunicodechar} \usepackage{fancyhdr} @@ -33,9 +30,6 @@ \defaultfontfeatures{Ligatures={TeX, Common}} \setmainfont{TeX Gyre Pagella} \setmonofont[Scale=MatchLowercase,Ligatures={NoCommon}]{DejaVu Sans Mono} -%\setromanfont{Georgia} -%\setsansfont{DejaVu Sans} -\urlstyle{same} \AtBeginEnvironment{quote}{\slshape} @@ -58,14 +52,6 @@ numbers=left, numberstyle=\scriptsize\noncopy, prebreak={\raisebox{0ex}[0ex][0ex]{\ensuremath{\noncopy{\rhookswarrow}}}}} -\lstdefinelanguage{diff}{ - morecomment=[f][\color{blue}]{@@}, % group identifier - morecomment=[f][\color{red}]-, % deleted lines - morecomment=[f][\color{green}]+, % added lines - morecomment=[f][\color{magenta}]{---}, % Diff header lines (must appear after +,-) - morecomment=[f][\color{magenta}]{+++}, -} - %% %% latex-header.tex end %% diff --git a/scripts/build-pdf.pl b/scripts/build-pdf.pl index 3fce948e2..228d3ddcf 100644 --- a/scripts/build-pdf.pl +++ b/scripts/build-pdf.pl @@ -35,7 +35,8 @@ , '--latex-engine=lualatex', , '--include-in-header=docs/latex-header.tex' , '--include-before-body=docs/latex-body.tex' - , '-V', 'lang=english'); + , '-V', 'lang=english', + , '-V', 'geometry:a4paper'); # pre-compute various source information strings @@ -99,7 +100,7 @@ print Dumper(\@parts), "\n"; my @args = ( - 'pandoc', @PANDOC_2ND_STEP_SWITCHES, + 'pandoc', @PANDOC_2ND_STEP_SWITCHES, '-o', 'README.md.tex', @parts); From f3e7ad23adfe9b83d4166f387d675be99c3571f6 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 2 Aug 2015 17:18:42 +0200 Subject: [PATCH 074/165] Various scripts and documentation cleanups. --- docs/latex-header.tex | 1 + docs/release.txt | 3 ++- scripts/build-pdf.pl | 11 +++++++++++ scripts/propagate-version.pl | 2 +- scripts/upload_to_wiki.pl | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) mode change 100644 => 100755 scripts/build-pdf.pl mode change 100644 => 100755 scripts/upload_to_wiki.pl diff --git a/docs/latex-header.tex b/docs/latex-header.tex index 4bf2ed0a6..6ecaabb2b 100644 --- a/docs/latex-header.tex +++ b/docs/latex-header.tex @@ -2,6 +2,7 @@ %% latex-header.tex begin %% +\usepackage{fix-cm} \usepackage{graphicx} \usepackage{epstopdf} \usepackage{anyfontsize} diff --git a/docs/release.txt b/docs/release.txt index 884ad23d7..9f5277239 100644 --- a/docs/release.txt +++ b/docs/release.txt @@ -8,7 +8,8 @@ This describes log4cplus release procedure: to date. Run `scripts/propagate-version.sh` followed by `scripts/doautoreconf.sh`. _Do not forget to commit the changes._ - #. Run `scripts/prepare_dist_from_git.sh` to prepare tarballs. + #. Run `scripts/prepare_dist_from_git.sh` to prepare tarballs. _Do not tag the +revision, yet._ #. [Upload tarballs][4] to SourceForge. diff --git a/scripts/build-pdf.pl b/scripts/build-pdf.pl old mode 100644 new mode 100755 index 228d3ddcf..8ec268958 --- a/scripts/build-pdf.pl +++ b/scripts/build-pdf.pl @@ -1,3 +1,4 @@ +#! env perl use strict; use autodie qw(:all); use File::Basename; @@ -107,3 +108,13 @@ print Dumper(\@args), "\n"; system(@args); + + +# produce PDF using latexmk utility to run the LuaLaTeX + +@args = ( + 'latexmk', '-gg', '-lualatex', 'README.md.tex'); + +print Dumper(\@args), "\n"; + +system(@args); diff --git a/scripts/propagate-version.pl b/scripts/propagate-version.pl index 1a32f3ae6..08700257f 100755 --- a/scripts/propagate-version.pl +++ b/scripts/propagate-version.pl @@ -99,5 +99,5 @@ BEGIN || $line =~ s/\d+ ([._\-]) \d+ ([._\-]) \d+ /$major$1$minor$2$so_current_adjusted/gx; print $line; - } + } } diff --git a/scripts/upload_to_wiki.pl b/scripts/upload_to_wiki.pl old mode 100644 new mode 100755 index 198bdc1f5..31ed6f650 --- a/scripts/upload_to_wiki.pl +++ b/scripts/upload_to_wiki.pl @@ -1,3 +1,4 @@ +#! env perl use strict; use IO::All; use LWP::UserAgent; From f805b467bc3f66f8e705e0b1359fa209cb0f96dc Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 19 Aug 2015 12:56:03 +0200 Subject: [PATCH 075/165] Improve Markdown in ChangeLog. --- ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 309e4011d..fb7237aae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,7 @@ log4cplus 1.2.0-RC4 - Fixed "most vexing parse" issue with `LOG4CPLUS_C_STR_TO_TSTRING(STRING)` when `STRING` is an identifier.` - - Fixed AcceptOnMatch property function in filters default to true value. + - Fixed `AcceptOnMatch` property function in filters default to true value. - Fixed GitHub bug #92. `DailyRollingFileAppender` rollover time was drifting. @@ -26,7 +26,7 @@ log4cplus 1.2.0-RC3 - SysLogAppender now recognize `SyslogHost` property as synonym for `host` property. - - Improved compatibility of TTCCLayout with log4j's. Added + - Improved compatibility of `TTCCLayout` with log4j's. Added `ThreadPrinting`, `CategoryPrefixing` and `ContextPrinting` configuration properties. @@ -34,7 +34,7 @@ log4cplus 1.2.0-RC3 end instead of beginning possible. E.g., allow `%.-1p` to get initial letters of log level. - - New appender TimeBasedRollingFileAppender. (Alexander Malinin) + - New appender `TimeBasedRollingFileAppender`. (Alexander Malinin) - `LOG4CPLUS_*_FMT()` macros can now be invoked with just formatting string, without additional arguments. (Zhang Shengfa) From 6f10519e5d8e859e320d18db0a813f83462781fa Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 8 Sep 2015 21:58:50 +0200 Subject: [PATCH 076/165] Add "Bug reporting instructions" to README.md. --- README.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/README.md b/README.md index d60539b5e..e33b3376e 100644 --- a/README.md +++ b/README.md @@ -510,6 +510,40 @@ thus [log4cplus] cannot be supported there: - Windows CE -- missing implementations of `` functions +Bug reporting instructions +-------------------------- + +For successful resolution of reported bugs, it is necessary to provide enough information: + +- [log4cplus] + - What is the exact release version or Git branch and revision? + - What is the build system that you are building [log4cplus] with + (Autotools, Visual Studio solution and its version, CMake). + - Autotools -- Provide `configure` script parameters and environment + variables, attach generated `config.log` and `defines.hxx` files. + - CMake -- Provide build configuration (`Release`, `Debug`, + `RelWithDebInfo`) and non--default `CMAKE_*` variables values. + - Visual Studio -- Provide project configuration (`Release`, + `Release_Unicode`, `Debug`, `Debug_Unicode`) and Visual Studio version. + - Provide target OS and CPU. In case of MinGW, provide its exact compiler + distribution -- TDM? Nuwen? Other? + +- [log4cplus] client application + - Are you using shared library [log4cplus] or as static library [log4cplus]? + - Is [log4cplus] linked into an executable or into a shared library (DLL or + SO)? + - If [log4cplus] is linked into a shared library, is this library + loaded dynamically or not? + - What library file you are linking your application with -- + `log4cplus.lib`, `log4cplusUSD.lib`, `liblog4cplus.dll.a`, etc., on + Windows? + - Is your application is using Unicode/`wchar_t` or not? + - Provide any error messages. + - Provide stack trace. + - Provide [log4cplus] properties/configuration files. + - Provide a self--contained test case, if possible. + + License ======= From f3dffdaabf28563a4b8fb869c9b2fd3b6800c7ae Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 15 Sep 2015 19:07:33 +0300 Subject: [PATCH 077/165] Install log4cplusConfig.cmake file and friends --- src/CMakeLists.txt | 39 ++++++++++++++++++++++++++++++++++++++- src/cmake/Config.cmake.in | 1 + 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/cmake/Config.cmake.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 91174da28..82e529560 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -122,7 +122,44 @@ if (WIN32) target_link_libraries (${log4cplus} ws2_32 advapi32) endif () -install(TARGETS ${log4cplus} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +### +# Installation (https://github.com/forexample/package-example) + +set(config_install_dir "lib/cmake/${PROJECT_NAME}") + +set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + +# Configuration +set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") +set(targets_export_name "${PROJECT_NAME}Targets") +set(namespace "${PROJECT_NAME}::") + +include(CMakePackageConfigHelpers) + +write_basic_package_version_file( + "${version_config}" + VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}" + COMPATIBILITY SameMajorVersion +) + +# Note: variable 'targets_export_name' used +configure_file("cmake/Config.cmake.in" "${project_config}" @ONLY) + +install( + FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}" +) + +install( + EXPORT "${targets_export_name}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}" +) + +install(TARGETS ${log4cplus} EXPORT "${targets_export_name}" + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in new file mode 100644 index 000000000..6e9256eea --- /dev/null +++ b/src/cmake/Config.cmake.in @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") From a1e48902bf7dd2fd4962ae84a5a4dfc22dcdd8d7 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 15 Sep 2015 14:46:10 +0300 Subject: [PATCH 078/165] cmath should be included std::fmod defined in 'cmath' header: http://en.cppreference.com/w/cpp/numeric/math/fmod --- src/fileappender.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index 8705dfa1b..b610f7622 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -36,6 +36,7 @@ #include #include #include +#include // std::fmod #if defined (__BORLANDC__) // For _wrename() and _wremove() on Windows. From 00bbd410398af74c5a502d1dca34735c533c12c1 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 19 Sep 2015 07:48:03 +0200 Subject: [PATCH 079/165] Document iOS support issues and workarounds. --- README.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ iOS/README.txt | 14 +------------ 2 files changed, 55 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e33b3376e..ee4402994 100644 --- a/README.md +++ b/README.md @@ -268,6 +268,60 @@ To work around this issue, invoke CMake with `-DANDROID_FUNCTION_LEVEL_LINKING:BOOL=OFF` option. +iOS support +----------- + +iOS support is based on CMake build. Use the scripts in `iOS` directory. The +iOS.cmake toolchain file was originally taken from [ios-cmake] project. + +To build the library for iOS, being in current folder, perform the steps +below. For ARMv7 architecture: + + +~~~~{.bash} +./scripts/cmake_ios_armv7.sh +cmake --build ./build_armv7 --config "Release" +cmake --build ./build_armv7 --config "Debug" +~~~~ + +For i386 architecture: + +~~~~{.bash} +./scripts/cmake_ios_i386.sh +cmake --build ./build_i386 --config "Release" +cmake --build ./build_i386 --config "Debug" +~~~~ + +Some versions of the iOS and/or its SDK have problems with thread-local storage +(TLS) and getting through CMake's environment detection phase. To work around +these issues, make these changes: + +Edit the `iOS.cmake` file and add these two lines. + +~~~~ +set (CMAKE_CXX_COMPILER_WORKS TRUE) +set (CMAKE_C_COMPILER_WORKS TRUE) +~~~~ + +Add these lines. Customize them accordingly: + +~~~~ +set(MACOSX_BUNDLE_GUI_IDENTIFIER com.example) +set(CMAKE_MACOSX_BUNDLE YES) +set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer") +set(IPHONEOS_ARCHS arm64) +~~~~ + +If you have issues with TLS, also comment out these lines: + +~~~~ +set(LOG4CPLUS_HAVE_TLS_SUPPORT 1) +set(LOG4CPLUS_THREAD_LOCAL_VAR "__thread") +~~~~ + +[ios-cmake]: https://code.google.com/p/ios-cmake/ + + Threads and signals ------------------- diff --git a/iOS/README.txt b/iOS/README.txt index 528b9b74e..90010ba6d 100644 --- a/iOS/README.txt +++ b/iOS/README.txt @@ -1,13 +1 @@ -NOTE: log4cplus build for iOS is based on iOS.cmake toolchain file, - orininally taken from https://code.google.com/p/ios-cmake/ - -To build the library for iOS, being in current folder, perform the steps below: -For armv7 architecture: -$ ./scripts/cmake_ios_armv7.sh -$ cmake --build ./build_armv7 --config "Release" -$ cmake --build ./build_armv7 --config "Debug" - -For i386 architecture: -$ ./scripts/cmake_ios_i386.sh -$ cmake --build ./build_i386 --config "Release" -$ cmake --build ./build_i386 --config "Debug" +See "iOS support" in README.md. From b484325db3d6da61cbcc02f2f404daa4462ef168 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 4 Nov 2015 15:09:03 +0100 Subject: [PATCH 080/165] Whitespace cleanup in sockets files. --- include/log4cplus/helpers/socket.h | 4 ++-- src/socket-unix.cxx | 26 +++++++++++++------------- src/socket.cxx | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/log4cplus/helpers/socket.h b/include/log4cplus/helpers/socket.h index 9b65d1115..54a4a8b45 100644 --- a/include/log4cplus/helpers/socket.h +++ b/include/log4cplus/helpers/socket.h @@ -41,7 +41,7 @@ namespace log4cplus { not_opened, bad_address, connection_failed, - broken_pipe, + broken_pipe, invalid_access_mode, message_truncated, accept_interrupted @@ -63,7 +63,7 @@ namespace log4cplus { /// Close socket virtual void close(); virtual bool isOpen() const; - virtual void shutdown(); + virtual void shutdown(); AbstractSocket& operator=(const AbstractSocket& rhs); protected: diff --git a/src/socket-unix.cxx b/src/socket-unix.cxx index 8580e2749..d808d7e58 100644 --- a/src/socket-unix.cxx +++ b/src/socket-unix.cxx @@ -51,7 +51,7 @@ #if defined (LOG4CPLUS_HAVE_ARPA_INET_H) #include #endif - + #if defined (LOG4CPLUS_HAVE_ERRNO_H) #include #endif @@ -76,7 +76,7 @@ namespace log4cplus { namespace helpers { // from lockfile.cxx -LOG4CPLUS_PRIVATE bool trySetCloseOnExec (int fd, +LOG4CPLUS_PRIVATE bool trySetCloseOnExec (int fd, helpers::LogLog & loglog = helpers::getLogLog ()); @@ -115,7 +115,7 @@ get_host_by_name (char const * hostname, std::string * name, struct addrinfo const & ai = *res; assert (ai.ai_family == AF_INET); - + if (name) *name = ai.ai_canonname; @@ -227,7 +227,7 @@ connectSocket(const tstring& hostn, unsigned short port, bool udp, SocketState& == -1 && (errno == EINTR)) ; - if (retval == INVALID_OS_SOCKET_VALUE) + if (retval == INVALID_OS_SOCKET_VALUE) { ::close(sock); return INVALID_SOCKET_VALUE; @@ -290,7 +290,7 @@ acceptSocket(SOCKET_TYPE sock, SocketState& state) while( (clientSock = accept_wrap (accept, to_os_socket (sock), - reinterpret_cast(&net_client), &len)) + reinterpret_cast(&net_client), &len)) == -1 && (errno == EINTR)) ; @@ -322,9 +322,9 @@ long read(SOCKET_TYPE sock, SocketBuffer& buffer) { long res, readbytes = 0; - + do - { + { res = ::read(to_os_socket (sock), buffer.getBuffer() + readbytes, buffer.getMaxSize() - readbytes); if( res <= 0 ) { @@ -332,7 +332,7 @@ read(SOCKET_TYPE sock, SocketBuffer& buffer) } readbytes += res; } while( readbytes < static_cast(buffer.getMaxSize()) ); - + return readbytes; } @@ -417,7 +417,7 @@ setTCPNoDelay (SOCKET_TYPE sock, bool val) if ((result = setsockopt(sock, level, TCP_NODELAY, &enabled, sizeof(enabled))) != 0) set_last_socket_error (errno); - + return result; #else @@ -495,7 +495,7 @@ ServerSocket::accept () { interrupt_pipe.revents = 0; accept_fd.revents = 0; - + int ret = poll (pollfds, 2, -1); switch (ret) { @@ -504,7 +504,7 @@ ServerSocket::accept () if (errno == EINTR) // Signal has interrupted the call. Just re-run it. continue; - + set_last_socket_error (errno); return Socket (INVALID_SOCKET_VALUE, not_opened, errno); @@ -536,7 +536,7 @@ ServerSocket::accept () } // Return Socket with state set to accept_interrupted. - + return Socket (INVALID_SOCKET_VALUE, accept_interrupted, 0); } else if ((accept_fd.revents & POLLIN) == POLLIN) @@ -550,7 +550,7 @@ ServerSocket::accept () int eno = 0; if (clientSock == INVALID_SOCKET_VALUE) eno = get_last_socket_error (); - + return Socket (clientSock, st, eno); } else diff --git a/src/socket.cxx b/src/socket.cxx index bfaea4054..ac5c605fa 100644 --- a/src/socket.cxx +++ b/src/socket.cxx @@ -88,7 +88,7 @@ AbstractSocket::shutdown() { if(sock != INVALID_SOCKET_VALUE) { shutdownSocket(sock); - } + } } From 4866b46a3ab639c4fbc836b2bbef3ea3268ae1ae Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 8 Nov 2015 18:36:28 +0100 Subject: [PATCH 081/165] t/1.1.x/sockets-internal-socket-h Import internal/socket.h from master and accommodate for 1.1.x. Signed-off-by: Vaclav Haisman --- include/log4cplus/internal/socket.h | 131 +++++++++++++++++++++++++--- 1 file changed, 120 insertions(+), 11 deletions(-) diff --git a/include/log4cplus/internal/socket.h b/include/log4cplus/internal/socket.h index f62c3b8ac..2f8c5f844 100644 --- a/include/log4cplus/internal/socket.h +++ b/include/log4cplus/internal/socket.h @@ -6,17 +6,17 @@ // // // Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. -// +// // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: -// +// // 1. Redistributions of source code must retain the above copyright notice, // this list of conditions and the following disclaimer. -// +// // 2. Redistributions in binary form must reproduce the above copyright notice, // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. -// +// // THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND // FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -28,7 +28,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -/** @file +/** @file * This header contains declaration internal to log4cplus. They must never be * visible from user accesible headers or exported in DLL/shared libray. */ @@ -57,25 +57,134 @@ #include #endif +#ifdef LOG4CPLUS_HAVE_UNISTD_H +#include +#endif + +#if defined (LOG4CPLUS_HAVE_NETDB_H) +#include +#endif + namespace log4cplus { namespace helpers { - #if defined(_WIN32) typedef SOCKET os_socket_type; +os_socket_type const INVALID_OS_SOCKET_VALUE = INVALID_SOCKET; + +struct ADDRINFOT_deleter +{ + void + operator () (ADDRINFOA * ptr) const + { + FreeAddrInfoA(ptr); + } + + void + operator () (ADDRINFOW * ptr) const + { + FreeAddrInfoW(ptr); + } +}; + + +struct socket_closer +{ + void + operator () (SOCKET s) + { + if (s && s != INVALID_OS_SOCKET_VALUE) + { + DWORD const eno = WSAGetLastError(); + ::closesocket(s); + WSASetLastError(eno); + } + } +}; + + #else typedef int os_socket_type; +os_socket_type const INVALID_OS_SOCKET_VALUE = -1; + + +struct addrinfo_deleter +{ + void + operator () (struct addrinfo * ptr) const + { + freeaddrinfo(ptr); + } +}; + + +struct socket_closer +{ + void + operator () (os_socket_type s) + { + if (s >= 0) + { + int const eno = errno; + close(s); + errno = eno; + } + } +}; + #endif -os_socket_type const INVALID_OS_SOCKET_VALUE -#if defined(_WIN32) - = INVALID_SOCKET; +struct socket_holder +{ + os_socket_type sock; + + socket_holder() + : sock(INVALID_OS_SOCKET_VALUE) + { } + + socket_holder(os_socket_type s) + : sock(s) + { } + + ~socket_holder() + { + socket_closer()(sock); + } + + void + reset(os_socket_type s = INVALID_OS_SOCKET_VALUE) + { + if (sock != INVALID_OS_SOCKET_VALUE) + socket_closer()(sock); + + sock = s; + } + + os_socket_type + detach() + { + os_socket_type s = sock; + sock = INVALID_OS_SOCKET_VALUE; + return s; + } + +#if defined (LOG4CPLUS_HAVE_CXX11_SUPPORT) + socket_holder (socket_holder &&) = delete; + socket_holder (socket_holder const &) = delete; + + socket_holder operator = (socket_holder &&) = delete; + socket_holder operator = (socket_holder const &) = delete; + #else - = -1; +private: + socket_holder (socket_holder const &); + socket_holder operator = (socket_holder const &); + #endif +}; static inline @@ -112,7 +221,7 @@ get_last_socket_error () } // namespace helpers { -} // namespace log4cplus { +} // namespace log4cplus { #endif // LOG4CPLUS_INTERNAL_SOCKET_H_ From c501a7c18eb1884bc54b6f92740326f976a86fa6 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 8 Nov 2015 18:36:28 +0100 Subject: [PATCH 082/165] t/1.1.x/sockets-use-socket-holder Use socket_holder in socket-unix.cxx. Signed-off-by: Vaclav Haisman --- src/socket-unix.cxx | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/src/socket-unix.cxx b/src/socket-unix.cxx index d808d7e58..92f586d18 100644 --- a/src/socket-unix.cxx +++ b/src/socket-unix.cxx @@ -162,8 +162,8 @@ get_host_by_name (char const * hostname, std::string * name, SOCKET_TYPE openSocket(unsigned short port, SocketState& state) { - int sock = ::socket(AF_INET, SOCK_STREAM, 0); - if(sock < 0) { + socket_holder sock_holder (::socket(AF_INET, SOCK_STREAM, 0)); + if(sock_holder.sock < 0) { return INVALID_SOCKET_VALUE; } @@ -174,7 +174,8 @@ openSocket(unsigned short port, SocketState& state) int optval = 1; socklen_t optlen = sizeof (optval); - int ret = setsockopt( sock, SOL_SOCKET, SO_REUSEADDR, &optval, optlen ); + int ret = setsockopt (sock_holder.sock, SOL_SOCKET, SO_REUSEADDR, &optval, + optlen); if (ret != 0) { int const eno = errno; @@ -182,20 +183,16 @@ openSocket(unsigned short port, SocketState& state) + helpers::convertIntegerToString (eno)); } - int retval = bind(sock, reinterpret_cast(&server), - sizeof(server)); + int retval = bind(sock_holder.sock, + reinterpret_cast(&server), sizeof(server)); if (retval < 0) - goto error; + return INVALID_SOCKET_VALUE; - if (::listen(sock, 10)) - goto error; + if (::listen(sock_holder.sock, 10)) + return INVALID_SOCKET_VALUE; state = ok; - return to_log4cplus_socket (sock); - -error: - close (sock); - return INVALID_SOCKET_VALUE; + return to_log4cplus_socket (sock_holder.detach ()); } @@ -203,7 +200,6 @@ SOCKET_TYPE connectSocket(const tstring& hostn, unsigned short port, bool udp, SocketState& state) { struct sockaddr_in server; - int sock; int retval; std::memset (&server, 0, sizeof (server)); @@ -215,26 +211,23 @@ connectSocket(const tstring& hostn, unsigned short port, bool udp, SocketState& server.sin_port = htons(port); server.sin_family = AF_INET; - sock = ::socket(AF_INET, (udp ? SOCK_DGRAM : SOCK_STREAM), 0); - if(sock < 0) { + socket_holder sock_holder ( + ::socket(AF_INET, (udp ? SOCK_DGRAM : SOCK_STREAM), 0)); + if (sock_holder.sock < 0) return INVALID_SOCKET_VALUE; - } socklen_t namelen = sizeof (server); while ( - (retval = ::connect(sock, reinterpret_cast(&server), - namelen)) + (retval = ::connect(sock_holder.sock, + reinterpret_cast(&server), namelen)) == -1 && (errno == EINTR)) ; if (retval == INVALID_OS_SOCKET_VALUE) - { - ::close(sock); return INVALID_SOCKET_VALUE; - } state = ok; - return to_log4cplus_socket (sock); + return to_log4cplus_socket (sock_holder.detach ()); } From 99b6abedff15ef83e679c129e849e07ad286672f Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 8 Nov 2015 18:36:28 +0100 Subject: [PATCH 083/165] t/1.1.x/sockets-loggingserver-leak-fix Fix sockets and memory leak in loggingserver discussed in GitHub issue #112. Signed-off-by: Vaclav Haisman --- simpleserver/loggingserver.cxx | 228 +++++++++++++++++++++++++++------ 1 file changed, 187 insertions(+), 41 deletions(-) diff --git a/simpleserver/loggingserver.cxx b/simpleserver/loggingserver.cxx index 8a94dbbd3..3c0b25caa 100644 --- a/simpleserver/loggingserver.cxx +++ b/simpleserver/loggingserver.cxx @@ -19,22 +19,154 @@ // limitations under the License. #include +#include #include #include #include #include #include #include +#include +#include namespace loggingserver { -class ClientThread : public log4cplus::thread::AbstractThread + +typedef std::list ThreadQueueType; + + +class ReaperThread + : public log4cplus::thread::AbstractThread +{ +public: + ReaperThread (log4cplus::thread::Mutex & mtx_, + log4cplus::thread::ManualResetEvent & ev_, + ThreadQueueType & queue_) + : mtx (mtx_) + , ev (ev_) + , queue (queue_) + , stop (false) + { } + + virtual + ~ReaperThread () + { } + + virtual void run (); + + void signal_exit (); + +private: + log4cplus::thread::Mutex & mtx; + log4cplus::thread::ManualResetEvent & ev; + ThreadQueueType & queue; + bool stop; +}; + + +typedef log4cplus::helpers::SharedObjectPtr ReaperThreadPtr; + + +void +ReaperThread::signal_exit () +{ + log4cplus::thread::MutexGuard guard (mtx); + stop = true; + ev.signal (); +} + + +void +ReaperThread::run () +{ + ThreadQueueType q; + + while (true) + { + ev.timed_wait (30 * 1000); + + { + log4cplus::thread::MutexGuard guard (mtx); + + // Check exit condition as the very first thing. + if (stop) + { + std::cout << "Reaper thread is stopping..." << std::endl; + return; + } + + ev.reset (); + q.swap (queue); + } + + if (! q.empty ()) + { + std::cout << "Reaper thread is reaping " << q.size () << " threads." + << std::endl; + + for (ThreadQueueType::iterator it = q.begin (), end_it = q.end (); + it != end_it; ++it) + { + AbstractThread & t = **it; + t.join (); + } + + q.clear (); + } + } +} + + + +/** + This class wraps ReaperThread thread and its queue. + */ +class Reaper +{ +public: + Reaper () + { + reaper_thread = ReaperThreadPtr (new ReaperThread (mtx, ev, queue)); + reaper_thread->start (); + } + + ~Reaper () + { + reaper_thread->signal_exit (); + reaper_thread->join (); + } + + void visit (log4cplus::thread::AbstractThreadPtr const & thread_ptr); + +private: + log4cplus::thread::Mutex mtx; + log4cplus::thread::ManualResetEvent ev; + ThreadQueueType queue; + ReaperThreadPtr reaper_thread; +}; + + +void +Reaper::visit (log4cplus::thread::AbstractThreadPtr const & thread_ptr) +{ + log4cplus::thread::MutexGuard guard (mtx); + queue.push_back (thread_ptr); + ev.signal (); +} + + + + +class ClientThread + : public log4cplus::thread::AbstractThread { public: - ClientThread(log4cplus::helpers::Socket clientsock) - : clientsock(clientsock) + ClientThread(log4cplus::helpers::Socket clientsock_, Reaper & reaper_) + : self_reference (log4cplus::thread::AbstractThreadPtr (this)) + , clientsock(clientsock_) + , reaper (reaper_) { std::cout << "Received a client connection!!!!" << std::endl; } @@ -47,17 +179,59 @@ class ClientThread : public log4cplus::thread::AbstractThread virtual void run(); private: + log4cplus::thread::AbstractThreadPtr self_reference; log4cplus::helpers::Socket clientsock; + Reaper & reaper; }; -} +void +loggingserver::ClientThread::run() +{ + try + { + while (1) + { + if (!clientsock.isOpen()) + break; + + log4cplus::helpers::SocketBuffer msgSizeBuffer(sizeof(unsigned int)); + if (!clientsock.read(msgSizeBuffer)) + break; + + unsigned int msgSize = msgSizeBuffer.readInt(); + + log4cplus::helpers::SocketBuffer buffer(msgSize); + if (!clientsock.read(buffer)) + break; + + log4cplus::spi::InternalLoggingEvent event + = log4cplus::helpers::readFromBuffer(buffer); + log4cplus::Logger logger + = log4cplus::Logger::getInstance(event.getLoggerName()); + logger.callAppenders(event); + } + } + catch (...) + { + reaper.visit (self_reference); + self_reference = log4cplus::thread::AbstractThreadPtr (); + throw; + } + + reaper.visit (self_reference); + self_reference = log4cplus::thread::AbstractThreadPtr (); +} +} // namespace loggingserver + int main(int argc, char** argv) { + log4cplus::initialize (); + if(argc < 3) { std::cout << "Usage: port config_file" << std::endl; return 1; @@ -70,49 +244,21 @@ main(int argc, char** argv) log4cplus::helpers::ServerSocket serverSocket(port); if (!serverSocket.isOpen()) { - std::cout << "Could not open server socket, maybe port " + std::cerr << "Could not open server socket, maybe port " << port << " is already in use." << std::endl; return 2; } - while(1) { - loggingserver::ClientThread *thr = - new loggingserver::ClientThread(serverSocket.accept()); + loggingserver::Reaper reaper; + + for (;;) + { + loggingserver::ClientThread *thr = + new loggingserver::ClientThread(serverSocket.accept(), reaper); thr->start(); } - return 0; -} - - -//////////////////////////////////////////////////////////////////////////////// -// loggingserver::ClientThread implementation -//////////////////////////////////////////////////////////////////////////////// + log4cplus::Logger::shutdown(); - -void -loggingserver::ClientThread::run() -{ - while(1) { - if(!clientsock.isOpen()) { - return; - } - log4cplus::helpers::SocketBuffer msgSizeBuffer(sizeof(unsigned int)); - if(!clientsock.read(msgSizeBuffer)) { - return; - } - - unsigned int msgSize = msgSizeBuffer.readInt(); - - log4cplus::helpers::SocketBuffer buffer(msgSize); - if(!clientsock.read(buffer)) { - return; - } - - log4cplus::spi::InternalLoggingEvent event - = log4cplus::helpers::readFromBuffer(buffer); - log4cplus::Logger logger - = log4cplus::Logger::getInstance(event.getLoggerName()); - logger.callAppenders(event); - } + return 0; } From c7573e9e7746552c8806b74652092ed9e5a7119c Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 10 Nov 2015 22:40:29 +0100 Subject: [PATCH 084/165] Update ChangeLog. --- ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index fb7237aae..f665c24c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +log4cplus 1.2.0-RC5 +------------------- + + - Various scripts and documentation cleanups. + + - Fix sockets and memory leak in loggingserver discussed in GitHub + issue #112. + + - CMake improvements. + + log4cplus 1.2.0-RC4 ------------------- From 3407fc608884b3b8388e14136ed7f26a59106eaf Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 10 Nov 2015 22:43:46 +0100 Subject: [PATCH 085/165] Bump up SO revision. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d99ac9eeb..c8fb623e7 100755 --- a/configure +++ b/configure @@ -4470,7 +4470,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=5:1:0 +LT_VERSION=5:2:0 LT_RELEASE=1.2 diff --git a/configure.ac b/configure.ac index 70efd0127..eb1831781 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AM_PROG_AR # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=5:1:0 +LT_VERSION=5:2:0 LT_RELEASE=1.2 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) From 47d77223bc6ae08fb3b28ab17e829f9732facaae Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 18 Nov 2015 10:15:35 +0100 Subject: [PATCH 086/165] Add .gitattributes. --- .gitattributes | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..83db24ba3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,66 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +*.sln text eol=crlf +*.csproj text eol=crlf +#*.vbproj merge=binary +*.vcxproj text eol=crlf +*.vcproj text eol=crlf +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary +*.swg text eol=lf +*.cmd text eol=crlf +*.bat text eol=crlf + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain From 8020e5857d876f3b6035bd2f3437bf6146726e64 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 18 Nov 2015 10:26:07 +0100 Subject: [PATCH 087/165] Normalize line endings. --- swig/configurator.swg | 108 +++++++++++++++++++++--------------------- swig/hierarchy.swg | 34 ++++++------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/swig/configurator.swg b/swig/configurator.swg index aaa032b59..4899b0a7f 100755 --- a/swig/configurator.swg +++ b/swig/configurator.swg @@ -1,54 +1,54 @@ -#ifndef LOG4CPLUS_CONFIGURATOR_SWG -#define LOG4CPLUS_CONFIGURATOR_SWG - -%{ - -#include "log4cplus/configurator.h" - -%} - -%include "hierarchy.swg" - -namespace log4cplus { - -/* class PropertyConfigurator -{ -public: - enum PCFLags - { - fRecursiveExpansion - , fShadowEnvironment - , fAllowEmptyVars - , fUnspecEncoding -#if defined (LOG4CPLUS_HAVE_CODECVT_UTF8_FACET) && defined (UNICODE) - , fUTF8 -#endif -#if (defined (LOG4CPLUS_HAVE_CODECVT_UTF16_FACET) || defined (_WIN32)) \ - && defined (UNICODE) - , fUTF16 -#endif -#if defined (LOG4CPLUS_HAVE_CODECVT_UTF32_FACET) && defined (UNICODE) - , fUTF32 -#endif - }; - - PropertyConfigurator (log4cplus::tstring const & propertyFile, - Hierarchy& h = Logger::getDefaultHierarchy(), unsigned flags = 0 -}; */ - -class BasicConfigurator -{ -public: - BasicConfigurator (Hierarchy & h - = log4cplus::Logger::getDefaultHierarchy (), bool logToStdErr = false); - virtual ~BasicConfigurator (); - - static void doConfigure(log4cplus::Hierarchy & h - = log4cplus::Logger::getDefaultHierarchy (), - bool logToStdErr = false); -}; - -} // namespace log4cplus - -#endif // LOG4CPLUS_CONFIGURATOR_SWG - +#ifndef LOG4CPLUS_CONFIGURATOR_SWG +#define LOG4CPLUS_CONFIGURATOR_SWG + +%{ + +#include "log4cplus/configurator.h" + +%} + +%include "hierarchy.swg" + +namespace log4cplus { + +/* class PropertyConfigurator +{ +public: + enum PCFLags + { + fRecursiveExpansion + , fShadowEnvironment + , fAllowEmptyVars + , fUnspecEncoding +#if defined (LOG4CPLUS_HAVE_CODECVT_UTF8_FACET) && defined (UNICODE) + , fUTF8 +#endif +#if (defined (LOG4CPLUS_HAVE_CODECVT_UTF16_FACET) || defined (_WIN32)) \ + && defined (UNICODE) + , fUTF16 +#endif +#if defined (LOG4CPLUS_HAVE_CODECVT_UTF32_FACET) && defined (UNICODE) + , fUTF32 +#endif + }; + + PropertyConfigurator (log4cplus::tstring const & propertyFile, + Hierarchy& h = Logger::getDefaultHierarchy(), unsigned flags = 0 +}; */ + +class BasicConfigurator +{ +public: + BasicConfigurator (Hierarchy & h + = log4cplus::Logger::getDefaultHierarchy (), bool logToStdErr = false); + virtual ~BasicConfigurator (); + + static void doConfigure(log4cplus::Hierarchy & h + = log4cplus::Logger::getDefaultHierarchy (), + bool logToStdErr = false); +}; + +} // namespace log4cplus + +#endif // LOG4CPLUS_CONFIGURATOR_SWG + diff --git a/swig/hierarchy.swg b/swig/hierarchy.swg index 7deb9a8f4..baee25ef3 100755 --- a/swig/hierarchy.swg +++ b/swig/hierarchy.swg @@ -1,17 +1,17 @@ -#ifndef LOG4CPLUS_HIERARCHY_SWG -#define LOG4CPLUS_HIERARCHY_SWG - -%{ - -#include "log4cplus/hierarchy.h" - -%} - -namespace log4cplus { - -class Hierarchy; - -} // namespace log4cplus - -#endif // LOG4CPLUS_HIERARCHY_SWG - +#ifndef LOG4CPLUS_HIERARCHY_SWG +#define LOG4CPLUS_HIERARCHY_SWG + +%{ + +#include "log4cplus/hierarchy.h" + +%} + +namespace log4cplus { + +class Hierarchy; + +} // namespace log4cplus + +#endif // LOG4CPLUS_HIERARCHY_SWG + From ee303e65f7d7cf5c7a30ca7ca7a60dccdebd3cdf Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 18 Nov 2015 14:26:26 +0100 Subject: [PATCH 088/165] Use CRLF for *.filters and *.props. --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 83db24ba3..5693e3822 100644 --- a/.gitattributes +++ b/.gitattributes @@ -27,6 +27,7 @@ #*.vbproj merge=binary *.vcxproj text eol=crlf *.vcproj text eol=crlf +*.filters text eol=crlf #*.dbproj merge=binary #*.fsproj merge=binary #*.lsproj merge=binary @@ -37,6 +38,7 @@ *.swg text eol=lf *.cmd text eol=crlf *.bat text eol=crlf +*.props text eol=crlf ############################################################################### # behavior for image files From b2804915887c7aec836232b78fc3dca61715adde Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 18 Nov 2015 14:28:39 +0100 Subject: [PATCH 089/165] Normalize EOLs. --- msvc10/CLFSAppender.props | 42 +- msvc10/CLFSAppender.vcxproj | 300 +-- msvc10/MSTTSAppender.props | 42 +- msvc10/MSTTSAppender.vcxproj | 300 +-- msvc10/Qt4DebugAppender.props | 40 +- msvc10/Qt4DebugAppender.vcxproj | 380 +-- msvc10/Qt5DebugAppender.props | 40 +- msvc10/Qt5DebugAppender.vcxproj | 380 +-- msvc10/log4cplus.props | 72 +- msvc10/log4cplus.sln | 932 +++---- msvc10/log4cplus.vcxproj | 2190 ++++++++--------- msvc10/log4cplus.vcxproj.filters | 824 +++---- msvc10/log4cplusS.vcxproj | 2060 ++++++++-------- msvc10/log4cplusS.vcxproj.filters | 818 +++--- msvc10/log4cplus_debug.props | 26 +- msvc10/log4cplus_release.props | 34 +- msvc10/log4cplus_static.props | 18 +- msvc10/loggingserver.props | 36 +- msvc10/loggingserver.vcxproj | 914 +++---- msvc10/loggingserver.vcxproj.filters | 32 +- msvc10/tests/appender_test.vcxproj | 926 +++---- msvc10/tests/appender_test.vcxproj.filters | 26 +- msvc10/tests/configandwatch_test.vcxproj | 924 +++---- .../tests/configandwatch_test.vcxproj.filters | 26 +- msvc10/tests/customloglevel_test.vcxproj | 996 ++++---- .../tests/customloglevel_test.vcxproj.filters | 38 +- msvc10/tests/fileappender_test.vcxproj | 924 +++---- .../tests/fileappender_test.vcxproj.filters | 26 +- msvc10/tests/filter_test.vcxproj | 926 +++---- msvc10/tests/filter_test.vcxproj.filters | 26 +- msvc10/tests/hierarchy_test.vcxproj | 924 +++---- msvc10/tests/hierarchy_test.vcxproj.filters | 26 +- msvc10/tests/log4cplus_tests.props | 42 +- msvc10/tests/loglog_test.vcxproj | 924 +++---- msvc10/tests/loglog_test.vcxproj.filters | 26 +- msvc10/tests/ndc_test.vcxproj | 924 +++---- msvc10/tests/ndc_test.vcxproj.filters | 26 +- msvc10/tests/ostream_test.vcxproj | 924 +++---- msvc10/tests/ostream_test.vcxproj.filters | 26 +- msvc10/tests/patternlayout_test.vcxproj | 942 +++---- .../tests/patternlayout_test.vcxproj.filters | 26 +- msvc10/tests/performance_test.vcxproj | 924 +++---- msvc10/tests/performance_test.vcxproj.filters | 26 +- msvc10/tests/priority_test.vcxproj | 960 ++++---- msvc10/tests/priority_test.vcxproj.filters | 32 +- msvc10/tests/propertyconfig_test.vcxproj | 924 +++---- .../tests/propertyconfig_test.vcxproj.filters | 26 +- msvc10/tests/socket_test.vcxproj | 924 +++---- msvc10/tests/socket_test.vcxproj.filters | 26 +- msvc10/tests/thread_test.vcxproj | 924 +++---- msvc10/tests/thread_test.vcxproj.filters | 26 +- msvc10/tests/timeformat_test.vcxproj | 940 +++---- msvc10/tests/timeformat_test.vcxproj.filters | 26 +- scripts/clean_cmake_files.bat | 42 +- scripts/msvc10_to_msvc11.cmd | 68 +- scripts/msvc10_to_msvc12.cmd | 68 +- 56 files changed, 12532 insertions(+), 12532 deletions(-) diff --git a/msvc10/CLFSAppender.props b/msvc10/CLFSAppender.props index 9ae28e555..44888389e 100644 --- a/msvc10/CLFSAppender.props +++ b/msvc10/CLFSAppender.props @@ -1,22 +1,22 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ - $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ - log4cplus-$(ProjectName) - - - - ..\include;%(AdditionalIncludeDirectories) - INSIDE_LOG4CPLUS_CLFSAPPENDER;LOG4CPLUS_CLFSAPPENDER_BUILD_DLL;LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - $(OutDir)$(TargetName).pdb - Level3 - - - $(SolutionDir)$(Platform)\bin.$(Configuration);%(AdditionalLibraryDirectories) - clfsw32.lib;%(AdditionalDependencies) - true - - + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ + $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ + log4cplus-$(ProjectName) + + + + ..\include;%(AdditionalIncludeDirectories) + INSIDE_LOG4CPLUS_CLFSAPPENDER;LOG4CPLUS_CLFSAPPENDER_BUILD_DLL;LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + $(OutDir)$(TargetName).pdb + Level3 + + + $(SolutionDir)$(Platform)\bin.$(Configuration);%(AdditionalLibraryDirectories) + clfsw32.lib;%(AdditionalDependencies) + true + + \ No newline at end of file diff --git a/msvc10/CLFSAppender.vcxproj b/msvc10/CLFSAppender.vcxproj index 4eef5648c..2392c82f9 100644 --- a/msvc10/CLFSAppender.vcxproj +++ b/msvc10/CLFSAppender.vcxproj @@ -1,151 +1,151 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {C0C6F651-99D8-404E-B2EC-507B261E820C} - CLFSAppender - - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - - - - - - - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {C0C6F651-99D8-404E-B2EC-507B261E820C} + CLFSAppender + + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + + + + + + + + + + + \ No newline at end of file diff --git a/msvc10/MSTTSAppender.props b/msvc10/MSTTSAppender.props index 9e382b9ee..d0966d80c 100644 --- a/msvc10/MSTTSAppender.props +++ b/msvc10/MSTTSAppender.props @@ -1,22 +1,22 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ - $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ - log4cplus-$(ProjectName) - - - - ..\include;%(AdditionalIncludeDirectories) - INSIDE_LOG4CPLUS_MSTTSAPPENDER;LOG4CPLUS_MSTTSAPPENDER_BUILD_DLL;LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - $(OutDir)$(TargetName).pdb - Level3 - - - $(SolutionDir)$(Platform)\bin.$(Configuration);%(AdditionalLibraryDirectories) - sapi.lib;%(AdditionalDependencies) - true - - + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ + $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ + log4cplus-$(ProjectName) + + + + ..\include;%(AdditionalIncludeDirectories) + INSIDE_LOG4CPLUS_MSTTSAPPENDER;LOG4CPLUS_MSTTSAPPENDER_BUILD_DLL;LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + $(OutDir)$(TargetName).pdb + Level3 + + + $(SolutionDir)$(Platform)\bin.$(Configuration);%(AdditionalLibraryDirectories) + sapi.lib;%(AdditionalDependencies) + true + + \ No newline at end of file diff --git a/msvc10/MSTTSAppender.vcxproj b/msvc10/MSTTSAppender.vcxproj index f7134ce62..e84132094 100644 --- a/msvc10/MSTTSAppender.vcxproj +++ b/msvc10/MSTTSAppender.vcxproj @@ -1,151 +1,151 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {7C361308-3FC8-45AF-9362-1A7C75E7F277} - MSTTSAppender - - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - - - - - - - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {7C361308-3FC8-45AF-9362-1A7C75E7F277} + MSTTSAppender + + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + + + + + + + + + + + \ No newline at end of file diff --git a/msvc10/Qt4DebugAppender.props b/msvc10/Qt4DebugAppender.props index c06e5cf8a..b6176eb93 100644 --- a/msvc10/Qt4DebugAppender.props +++ b/msvc10/Qt4DebugAppender.props @@ -1,21 +1,21 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ - $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ - log4cplus-$(ProjectName) - - - - ..\include;C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\include;C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\include\Qt;C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\include\QtCore;%(AdditionalIncludeDirectories) - INSIDE_LOG4CPLUS_QT4DEBUGAPPENDER;LOG4CPLUS_QT4DEBUGAPPENDER_BUILD_DLL;LOG4CPLUS_BUILD_DLL;QT_SHARED;QT_THREAD_SUPPORT;%(PreprocessorDefinitions) - $(OutDir)$(TargetName).pdb - Level3 - - - $(SolutionDir)$(Platform)\bin.$(Configuration);C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\lib;%(AdditionalLibraryDirectories) - true - - + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ + $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ + log4cplus-$(ProjectName) + + + + ..\include;C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\include;C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\include\Qt;C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\include\QtCore;%(AdditionalIncludeDirectories) + INSIDE_LOG4CPLUS_QT4DEBUGAPPENDER;LOG4CPLUS_QT4DEBUGAPPENDER_BUILD_DLL;LOG4CPLUS_BUILD_DLL;QT_SHARED;QT_THREAD_SUPPORT;%(PreprocessorDefinitions) + $(OutDir)$(TargetName).pdb + Level3 + + + $(SolutionDir)$(Platform)\bin.$(Configuration);C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\lib;%(AdditionalLibraryDirectories) + true + + \ No newline at end of file diff --git a/msvc10/Qt4DebugAppender.vcxproj b/msvc10/Qt4DebugAppender.vcxproj index df5dbd0a1..fc19fd2d4 100644 --- a/msvc10/Qt4DebugAppender.vcxproj +++ b/msvc10/Qt4DebugAppender.vcxproj @@ -1,191 +1,191 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9} - Qt4DebugAppender - - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - QtCored4.lib;%(AdditionalDependencies) - - - - - QtCored4.lib;%(AdditionalDependencies) - - - - - QtCored4.lib;%(AdditionalDependencies) - - - - - QtCored4.lib;%(AdditionalDependencies) - - - - - QtCore4.lib;%(AdditionalDependencies) - - - - - QtCore4.lib;%(AdditionalDependencies) - - - - - QtCore4.lib;%(AdditionalDependencies) - - - - - QtCore4.lib;%(AdditionalDependencies) - - - - - Designer - - - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - - - - - - - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9} + Qt4DebugAppender + + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + QtCored4.lib;%(AdditionalDependencies) + + + + + QtCored4.lib;%(AdditionalDependencies) + + + + + QtCored4.lib;%(AdditionalDependencies) + + + + + QtCored4.lib;%(AdditionalDependencies) + + + + + QtCore4.lib;%(AdditionalDependencies) + + + + + QtCore4.lib;%(AdditionalDependencies) + + + + + QtCore4.lib;%(AdditionalDependencies) + + + + + QtCore4.lib;%(AdditionalDependencies) + + + + + Designer + + + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + + + + + + + + + + + \ No newline at end of file diff --git a/msvc10/Qt5DebugAppender.props b/msvc10/Qt5DebugAppender.props index 1252733dd..69e7c7e9a 100755 --- a/msvc10/Qt5DebugAppender.props +++ b/msvc10/Qt5DebugAppender.props @@ -1,21 +1,21 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ - $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ - log4cplus-$(ProjectName) - - - - ..\include;C:\Qt\Qt5.0.2\5.0.2\msvc2010\include;C:\Qt\Qt5.0.2\5.0.2\msvc2010\include\QtCore;%(AdditionalIncludeDirectories) - INSIDE_LOG4CPLUS_QT5DEBUGAPPENDER;LOG4CPLUS_QT5DEBUGAPPENDER_BUILD_DLL;LOG4CPLUS_BUILD_DLL;QT_SHARED;QT_THREAD_SUPPORT;%(PreprocessorDefinitions) - $(OutDir)$(TargetName).pdb - Level3 - - - $(SolutionDir)$(Platform)\bin.$(Configuration);C:\Qt\Qt5.0.2\5.0.2\msvc2010\lib;%(AdditionalLibraryDirectories) - true - - + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ + $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ + log4cplus-$(ProjectName) + + + + ..\include;C:\Qt\Qt5.0.2\5.0.2\msvc2010\include;C:\Qt\Qt5.0.2\5.0.2\msvc2010\include\QtCore;%(AdditionalIncludeDirectories) + INSIDE_LOG4CPLUS_QT5DEBUGAPPENDER;LOG4CPLUS_QT5DEBUGAPPENDER_BUILD_DLL;LOG4CPLUS_BUILD_DLL;QT_SHARED;QT_THREAD_SUPPORT;%(PreprocessorDefinitions) + $(OutDir)$(TargetName).pdb + Level3 + + + $(SolutionDir)$(Platform)\bin.$(Configuration);C:\Qt\Qt5.0.2\5.0.2\msvc2010\lib;%(AdditionalLibraryDirectories) + true + + \ No newline at end of file diff --git a/msvc10/Qt5DebugAppender.vcxproj b/msvc10/Qt5DebugAppender.vcxproj index d76d04ba3..f97212c26 100755 --- a/msvc10/Qt5DebugAppender.vcxproj +++ b/msvc10/Qt5DebugAppender.vcxproj @@ -1,191 +1,191 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B} - Qt5DebugAppender - - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Qt5Cored.lib;%(AdditionalDependencies) - - - - - Qt5Cored.lib;%(AdditionalDependencies) - - - - - Qt5Cored.lib;%(AdditionalDependencies) - - - - - Qt5Cored.lib;%(AdditionalDependencies) - - - - - Qt5Core.lib;%(AdditionalDependencies) - - - - - Qt5Core.lib;%(AdditionalDependencies) - - - - - Qt5Core.lib;%(AdditionalDependencies) - - - - - Qt5Core.lib;%(AdditionalDependencies) - - - - - Designer - - - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - - - - - - - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B} + Qt5DebugAppender + + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Qt5Cored.lib;%(AdditionalDependencies) + + + + + Qt5Cored.lib;%(AdditionalDependencies) + + + + + Qt5Cored.lib;%(AdditionalDependencies) + + + + + Qt5Cored.lib;%(AdditionalDependencies) + + + + + Qt5Core.lib;%(AdditionalDependencies) + + + + + Qt5Core.lib;%(AdditionalDependencies) + + + + + Qt5Core.lib;%(AdditionalDependencies) + + + + + Qt5Core.lib;%(AdditionalDependencies) + + + + + Designer + + + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + + + + + + + + + + + \ No newline at end of file diff --git a/msvc10/log4cplus.props b/msvc10/log4cplus.props index e613e9d53..671cc0c3a 100644 --- a/msvc10/log4cplus.props +++ b/msvc10/log4cplus.props @@ -1,37 +1,37 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ - $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ - false - .dll - - - - ..\include;%(AdditionalIncludeDirectories) - WIN32;_WIN32_WINNT=0x0501;WINVER=0x0501;INSIDE_LOG4CPLUS;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(OutDir)$(TargetName).c.pdb - $(IntDir) - Level3 - ProgramDatabase - true - /bigobj %(AdditionalOptions) - true - - - true - true - false - $(OutDir)$(TargetName).pdb - $(OutDir)$(TargetName).lib - - - ws2_32.lib - - + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ + $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ + false + .dll + + + + ..\include;%(AdditionalIncludeDirectories) + WIN32;_WIN32_WINNT=0x0501;WINVER=0x0501;INSIDE_LOG4CPLUS;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + $(IntDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(OutDir)$(TargetName).c.pdb + $(IntDir) + Level3 + ProgramDatabase + true + /bigobj %(AdditionalOptions) + true + + + true + true + false + $(OutDir)$(TargetName).pdb + $(OutDir)$(TargetName).lib + + + ws2_32.lib + + \ No newline at end of file diff --git a/msvc10/log4cplus.sln b/msvc10/log4cplus.sln index 849e2d166..ca6a77af2 100644 --- a/msvc10/log4cplus.sln +++ b/msvc10/log4cplus.sln @@ -1,466 +1,466 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{92DEA81D-81ED-4283-BBC7-41975647F69E}" - ProjectSection(SolutionItems) = preProject - tests\log4cplus_tests.props = tests\log4cplus_tests.props - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appender_test", "tests\appender_test.vcxproj", "{63AF3784-3FFB-46AC-B341-76B55AEE3148}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileappender_test", "tests\fileappender_test.vcxproj", "{434FBB6C-6D3C-466A-86DB-DE999065B5E5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter_test", "tests\filter_test.vcxproj", "{66FE475D-D26C-4457-8B1C-B057D770C716}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hierarchy_test", "tests\hierarchy_test.vcxproj", "{07817E6D-9FAB-4261-9D62-C5AD13810258}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4cplus", "log4cplus.vcxproj", "{917836A4-0DDC-47BE-B930-1B3BFDF6C940}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4cplusS", "log4cplusS.vcxproj", "{BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loggingserver", "loggingserver.vcxproj", "{B8E88AF6-0427-4839-88AC-0C6E12615B10}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loglog_test", "tests\loglog_test.vcxproj", "{1F8CC79C-876D-4A13-BA92-98A3A51B2749}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndc_test", "tests\ndc_test.vcxproj", "{FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "performance_test", "tests\performance_test.vcxproj", "{94EF9EE0-6E68-4F5F-9174-D09896518894}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configandwatch_test", "tests\configandwatch_test.vcxproj", "{0A878274-362D-4184-B5C6-A1C80D22A170}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "customloglevel_test", "tests\customloglevel_test.vcxproj", "{040B829F-8ED6-4D35-9043-0DF31597F7FB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ostream_test", "tests\ostream_test.vcxproj", "{C133DEF0-FAF5-4635-8D5A-2C789B424371}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "priority_test", "tests\priority_test.vcxproj", "{CBD762A9-79BC-4AE7-8890-76360F539D76}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socket_test", "tests\socket_test.vcxproj", "{D405C4A0-D62F-4EE7-96D2-76AD808C7319}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thread_test", "tests\thread_test.vcxproj", "{F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timeformat_test", "tests\timeformat_test.vcxproj", "{7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patternlayout_test", "tests\patternlayout_test.vcxproj", "{AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLFSAppender", "CLFSAppender.vcxproj", "{C0C6F651-99D8-404E-B2EC-507B261E820C}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Qt4DebugAppender", "Qt4DebugAppender.vcxproj", "{18B64AA1-A2F7-46BE-8D48-7882AA471FA9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSTTSAppender", "MSTTSAppender.vcxproj", "{7C361308-3FC8-45AF-9362-1A7C75E7F277}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propertyconfig_test", "tests\propertyconfig_test.vcxproj", "{44D4D0A3-FAFA-4134-9806-BCB830594E28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Qt5DebugAppender", "Qt5DebugAppender.vcxproj", "{0F01EBDC-F988-41DD-BDA8-247DBC870F6B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External Appenders", "External Appenders", "{DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_Unicode|Win32 = Debug_Unicode|Win32 - Debug_Unicode|x64 = Debug_Unicode|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_Unicode|Win32 = Release_Unicode|Win32 - Release_Unicode|x64 = Release_Unicode|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|Win32.ActiveCfg = Debug|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|Win32.Build.0 = Debug|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|x64.ActiveCfg = Debug|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|x64.Build.0 = Debug|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|Win32.ActiveCfg = Release|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|Win32.Build.0 = Release|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|x64.ActiveCfg = Release|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|x64.Build.0 = Release|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|Win32.ActiveCfg = Debug|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|Win32.Build.0 = Debug|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|x64.ActiveCfg = Debug|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|x64.Build.0 = Debug|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|Win32.ActiveCfg = Release|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|Win32.Build.0 = Release|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|x64.ActiveCfg = Release|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|x64.Build.0 = Release|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|Win32.ActiveCfg = Debug|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|Win32.Build.0 = Debug|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|x64.ActiveCfg = Debug|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|x64.Build.0 = Debug|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|Win32.ActiveCfg = Release|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|Win32.Build.0 = Release|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|x64.ActiveCfg = Release|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|x64.Build.0 = Release|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|Win32.ActiveCfg = Debug|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|Win32.Build.0 = Debug|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|x64.ActiveCfg = Debug|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|x64.Build.0 = Debug|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|Win32.ActiveCfg = Release|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|Win32.Build.0 = Release|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|x64.ActiveCfg = Release|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|x64.Build.0 = Release|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|Win32.ActiveCfg = Debug|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|Win32.Build.0 = Debug|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|x64.ActiveCfg = Debug|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|x64.Build.0 = Debug|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|Win32.ActiveCfg = Release|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|Win32.Build.0 = Release|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|x64.ActiveCfg = Release|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|x64.Build.0 = Release|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|Win32.ActiveCfg = Debug|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|Win32.Build.0 = Debug|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|x64.ActiveCfg = Debug|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|x64.Build.0 = Debug|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|Win32.ActiveCfg = Release|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|Win32.Build.0 = Release|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|x64.ActiveCfg = Release|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|x64.Build.0 = Release|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|Win32.ActiveCfg = Debug|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|Win32.Build.0 = Debug|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|x64.ActiveCfg = Debug|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|x64.Build.0 = Debug|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|Win32.ActiveCfg = Release|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|Win32.Build.0 = Release|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|x64.ActiveCfg = Release|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|x64.Build.0 = Release|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|Win32.ActiveCfg = Debug|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|Win32.Build.0 = Debug|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|x64.ActiveCfg = Debug|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|x64.Build.0 = Debug|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|Win32.ActiveCfg = Release|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|Win32.Build.0 = Release|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|x64.ActiveCfg = Release|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|x64.Build.0 = Release|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|Win32.ActiveCfg = Debug|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|Win32.Build.0 = Debug|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|x64.ActiveCfg = Debug|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|x64.Build.0 = Debug|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|Win32.ActiveCfg = Release|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|Win32.Build.0 = Release|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|x64.ActiveCfg = Release|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|x64.Build.0 = Release|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|Win32.ActiveCfg = Debug|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|Win32.Build.0 = Debug|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|x64.ActiveCfg = Debug|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|x64.Build.0 = Debug|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|Win32.ActiveCfg = Release|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|Win32.Build.0 = Release|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|x64.ActiveCfg = Release|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|x64.Build.0 = Release|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|Win32.ActiveCfg = Debug|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|Win32.Build.0 = Debug|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|x64.ActiveCfg = Debug|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|x64.Build.0 = Debug|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|Win32.ActiveCfg = Release|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|Win32.Build.0 = Release|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|x64.ActiveCfg = Release|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|x64.Build.0 = Release|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|Win32.Build.0 = Debug|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|x64.ActiveCfg = Debug|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|x64.Build.0 = Debug|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|Win32.ActiveCfg = Release|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|Win32.Build.0 = Release|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|x64.ActiveCfg = Release|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|x64.Build.0 = Release|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|Win32.ActiveCfg = Debug|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|Win32.Build.0 = Debug|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|x64.ActiveCfg = Debug|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|x64.Build.0 = Debug|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|Win32.ActiveCfg = Release|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|Win32.Build.0 = Release|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|x64.ActiveCfg = Release|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|x64.Build.0 = Release|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|Win32.ActiveCfg = Debug|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|Win32.Build.0 = Debug|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|x64.ActiveCfg = Debug|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|x64.Build.0 = Debug|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|Win32.ActiveCfg = Release|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|Win32.Build.0 = Release|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|x64.ActiveCfg = Release|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|x64.Build.0 = Release|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|Win32.ActiveCfg = Debug|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|Win32.Build.0 = Debug|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|x64.ActiveCfg = Debug|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|x64.Build.0 = Debug|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|Win32.ActiveCfg = Release|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|Win32.Build.0 = Release|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|x64.ActiveCfg = Release|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|x64.Build.0 = Release|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|Win32.Build.0 = Debug|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|x64.ActiveCfg = Debug|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|x64.Build.0 = Debug|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|Win32.ActiveCfg = Release|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|Win32.Build.0 = Release|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|x64.ActiveCfg = Release|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|x64.Build.0 = Release|x64 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug|Win32.ActiveCfg = Debug|Win32 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug|Win32.Build.0 = Debug|Win32 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug|x64.ActiveCfg = Debug|x64 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug|x64.Build.0 = Debug|x64 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release|Win32.ActiveCfg = Release|Win32 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release|Win32.Build.0 = Release|Win32 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release|x64.ActiveCfg = Release|x64 - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release|x64.Build.0 = Release|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|Win32.ActiveCfg = Debug|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|Win32.Build.0 = Debug|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|x64.ActiveCfg = Debug|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|x64.Build.0 = Debug|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|Win32.ActiveCfg = Release|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|Win32.Build.0 = Release|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|x64.ActiveCfg = Release|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|x64.Build.0 = Release|x64 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug|Win32.ActiveCfg = Debug|Win32 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug|Win32.Build.0 = Debug|Win32 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug|x64.ActiveCfg = Debug|x64 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug|x64.Build.0 = Debug|x64 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release|Win32.ActiveCfg = Release|Win32 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release|Win32.Build.0 = Release|Win32 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release|x64.ActiveCfg = Release|x64 - {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release|x64.Build.0 = Release|x64 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug|Win32.ActiveCfg = Debug|Win32 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug|Win32.Build.0 = Debug|Win32 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug|x64.ActiveCfg = Debug|x64 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug|x64.Build.0 = Debug|x64 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release|Win32.ActiveCfg = Release|Win32 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release|Win32.Build.0 = Release|Win32 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release|x64.ActiveCfg = Release|x64 - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release|x64.Build.0 = Release|x64 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug|Win32.ActiveCfg = Debug|Win32 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug|Win32.Build.0 = Debug|Win32 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug|x64.ActiveCfg = Debug|x64 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug|x64.Build.0 = Debug|x64 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release|Win32.ActiveCfg = Release|Win32 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release|Win32.Build.0 = Release|Win32 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release|x64.ActiveCfg = Release|x64 - {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release|x64.Build.0 = Release|x64 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug|Win32.ActiveCfg = Debug|Win32 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug|Win32.Build.0 = Debug|Win32 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug|x64.ActiveCfg = Debug|x64 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug|x64.Build.0 = Debug|x64 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release|Win32.ActiveCfg = Release|Win32 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release|Win32.Build.0 = Release|Win32 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release|x64.ActiveCfg = Release|x64 - {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release|x64.Build.0 = Release|x64 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug|Win32.Build.0 = Debug|Win32 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug|x64.ActiveCfg = Debug|x64 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug|x64.Build.0 = Debug|x64 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release|Win32.ActiveCfg = Release|Win32 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release|Win32.Build.0 = Release|Win32 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release|x64.ActiveCfg = Release|x64 - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {63AF3784-3FFB-46AC-B341-76B55AEE3148} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {434FBB6C-6D3C-466A-86DB-DE999065B5E5} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {66FE475D-D26C-4457-8B1C-B057D770C716} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {07817E6D-9FAB-4261-9D62-C5AD13810258} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {1F8CC79C-876D-4A13-BA92-98A3A51B2749} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {94EF9EE0-6E68-4F5F-9174-D09896518894} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {0A878274-362D-4184-B5C6-A1C80D22A170} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {040B829F-8ED6-4D35-9043-0DF31597F7FB} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {C133DEF0-FAF5-4635-8D5A-2C789B424371} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {CBD762A9-79BC-4AE7-8890-76360F539D76} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {D405C4A0-D62F-4EE7-96D2-76AD808C7319} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {44D4D0A3-FAFA-4134-9806-BCB830594E28} = {92DEA81D-81ED-4283-BBC7-41975647F69E} - {C0C6F651-99D8-404E-B2EC-507B261E820C} = {DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA} - {18B64AA1-A2F7-46BE-8D48-7882AA471FA9} = {DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA} - {0F01EBDC-F988-41DD-BDA8-247DBC870F6B} = {DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA} - {7C361308-3FC8-45AF-9362-1A7C75E7F277} = {DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{92DEA81D-81ED-4283-BBC7-41975647F69E}" + ProjectSection(SolutionItems) = preProject + tests\log4cplus_tests.props = tests\log4cplus_tests.props + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appender_test", "tests\appender_test.vcxproj", "{63AF3784-3FFB-46AC-B341-76B55AEE3148}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileappender_test", "tests\fileappender_test.vcxproj", "{434FBB6C-6D3C-466A-86DB-DE999065B5E5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter_test", "tests\filter_test.vcxproj", "{66FE475D-D26C-4457-8B1C-B057D770C716}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hierarchy_test", "tests\hierarchy_test.vcxproj", "{07817E6D-9FAB-4261-9D62-C5AD13810258}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4cplus", "log4cplus.vcxproj", "{917836A4-0DDC-47BE-B930-1B3BFDF6C940}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4cplusS", "log4cplusS.vcxproj", "{BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loggingserver", "loggingserver.vcxproj", "{B8E88AF6-0427-4839-88AC-0C6E12615B10}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loglog_test", "tests\loglog_test.vcxproj", "{1F8CC79C-876D-4A13-BA92-98A3A51B2749}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndc_test", "tests\ndc_test.vcxproj", "{FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "performance_test", "tests\performance_test.vcxproj", "{94EF9EE0-6E68-4F5F-9174-D09896518894}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configandwatch_test", "tests\configandwatch_test.vcxproj", "{0A878274-362D-4184-B5C6-A1C80D22A170}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "customloglevel_test", "tests\customloglevel_test.vcxproj", "{040B829F-8ED6-4D35-9043-0DF31597F7FB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ostream_test", "tests\ostream_test.vcxproj", "{C133DEF0-FAF5-4635-8D5A-2C789B424371}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "priority_test", "tests\priority_test.vcxproj", "{CBD762A9-79BC-4AE7-8890-76360F539D76}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socket_test", "tests\socket_test.vcxproj", "{D405C4A0-D62F-4EE7-96D2-76AD808C7319}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thread_test", "tests\thread_test.vcxproj", "{F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timeformat_test", "tests\timeformat_test.vcxproj", "{7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patternlayout_test", "tests\patternlayout_test.vcxproj", "{AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLFSAppender", "CLFSAppender.vcxproj", "{C0C6F651-99D8-404E-B2EC-507B261E820C}" + ProjectSection(ProjectDependencies) = postProject + {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Qt4DebugAppender", "Qt4DebugAppender.vcxproj", "{18B64AA1-A2F7-46BE-8D48-7882AA471FA9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSTTSAppender", "MSTTSAppender.vcxproj", "{7C361308-3FC8-45AF-9362-1A7C75E7F277}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propertyconfig_test", "tests\propertyconfig_test.vcxproj", "{44D4D0A3-FAFA-4134-9806-BCB830594E28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Qt5DebugAppender", "Qt5DebugAppender.vcxproj", "{0F01EBDC-F988-41DD-BDA8-247DBC870F6B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External Appenders", "External Appenders", "{DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_Unicode|Win32 = Debug_Unicode|Win32 + Debug_Unicode|x64 = Debug_Unicode|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_Unicode|Win32 = Release_Unicode|Win32 + Release_Unicode|x64 = Release_Unicode|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|Win32.ActiveCfg = Debug|Win32 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|Win32.Build.0 = Debug|Win32 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|x64.ActiveCfg = Debug|x64 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|x64.Build.0 = Debug|x64 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|Win32.ActiveCfg = Release|Win32 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|Win32.Build.0 = Release|Win32 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|x64.ActiveCfg = Release|x64 + {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|x64.Build.0 = Release|x64 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|Win32.ActiveCfg = Debug|Win32 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|Win32.Build.0 = Debug|Win32 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|x64.ActiveCfg = Debug|x64 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|x64.Build.0 = Debug|x64 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|Win32.ActiveCfg = Release|Win32 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|Win32.Build.0 = Release|Win32 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|x64.ActiveCfg = Release|x64 + {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|x64.Build.0 = Release|x64 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|Win32.ActiveCfg = Debug|Win32 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|Win32.Build.0 = Debug|Win32 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|x64.ActiveCfg = Debug|x64 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|x64.Build.0 = Debug|x64 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|Win32.ActiveCfg = Release|Win32 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|Win32.Build.0 = Release|Win32 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|x64.ActiveCfg = Release|x64 + {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|x64.Build.0 = Release|x64 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|Win32.ActiveCfg = Debug|Win32 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|Win32.Build.0 = Debug|Win32 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|x64.ActiveCfg = Debug|x64 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|x64.Build.0 = Debug|x64 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|Win32.ActiveCfg = Release|Win32 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|Win32.Build.0 = Release|Win32 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|x64.ActiveCfg = Release|x64 + {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|x64.Build.0 = Release|x64 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|Win32.ActiveCfg = Debug|Win32 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|Win32.Build.0 = Debug|Win32 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|x64.ActiveCfg = Debug|x64 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|x64.Build.0 = Debug|x64 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|Win32.ActiveCfg = Release|Win32 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|Win32.Build.0 = Release|Win32 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|x64.ActiveCfg = Release|x64 + {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|x64.Build.0 = Release|x64 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|Win32.Build.0 = Debug|Win32 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|x64.ActiveCfg = Debug|x64 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|x64.Build.0 = Debug|x64 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|Win32.ActiveCfg = Release|Win32 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|Win32.Build.0 = Release|Win32 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|x64.ActiveCfg = Release|x64 + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|x64.Build.0 = Release|x64 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|Win32.ActiveCfg = Debug|Win32 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|Win32.Build.0 = Debug|Win32 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|x64.ActiveCfg = Debug|x64 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|x64.Build.0 = Debug|x64 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|Win32.ActiveCfg = Release|Win32 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|Win32.Build.0 = Release|Win32 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|x64.ActiveCfg = Release|x64 + {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|x64.Build.0 = Release|x64 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|Win32.Build.0 = Debug|Win32 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|x64.ActiveCfg = Debug|x64 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|x64.Build.0 = Debug|x64 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|Win32.ActiveCfg = Release|Win32 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|Win32.Build.0 = Release|Win32 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|x64.ActiveCfg = Release|x64 + {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|x64.Build.0 = Release|x64 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|Win32.ActiveCfg = Debug|Win32 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|Win32.Build.0 = Debug|Win32 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|x64.ActiveCfg = Debug|x64 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|x64.Build.0 = Debug|x64 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|Win32.ActiveCfg = Release|Win32 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|Win32.Build.0 = Release|Win32 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|x64.ActiveCfg = Release|x64 + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|x64.Build.0 = Release|x64 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|Win32.ActiveCfg = Debug|Win32 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|Win32.Build.0 = Debug|Win32 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|x64.ActiveCfg = Debug|x64 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|x64.Build.0 = Debug|x64 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|Win32.ActiveCfg = Release|Win32 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|Win32.Build.0 = Release|Win32 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|x64.ActiveCfg = Release|x64 + {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|x64.Build.0 = Release|x64 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|Win32.Build.0 = Debug|Win32 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|x64.ActiveCfg = Debug|x64 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|x64.Build.0 = Debug|x64 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|Win32.ActiveCfg = Release|Win32 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|Win32.Build.0 = Release|Win32 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|x64.ActiveCfg = Release|x64 + {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|x64.Build.0 = Release|x64 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|Win32.ActiveCfg = Debug|Win32 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|Win32.Build.0 = Debug|Win32 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|x64.ActiveCfg = Debug|x64 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|x64.Build.0 = Debug|x64 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|Win32.ActiveCfg = Release|Win32 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|Win32.Build.0 = Release|Win32 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|x64.ActiveCfg = Release|x64 + {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|x64.Build.0 = Release|x64 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|Win32.ActiveCfg = Debug|Win32 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|Win32.Build.0 = Debug|Win32 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|x64.ActiveCfg = Debug|x64 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|x64.Build.0 = Debug|x64 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|Win32.ActiveCfg = Release|Win32 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|Win32.Build.0 = Release|Win32 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|x64.ActiveCfg = Release|x64 + {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|x64.Build.0 = Release|x64 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|Win32.ActiveCfg = Debug|Win32 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|Win32.Build.0 = Debug|Win32 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|x64.ActiveCfg = Debug|x64 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|x64.Build.0 = Debug|x64 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|Win32.ActiveCfg = Release|Win32 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|Win32.Build.0 = Release|Win32 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|x64.ActiveCfg = Release|x64 + {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|x64.Build.0 = Release|x64 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|Win32.ActiveCfg = Debug|Win32 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|Win32.Build.0 = Debug|Win32 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|x64.ActiveCfg = Debug|x64 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|x64.Build.0 = Debug|x64 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|Win32.ActiveCfg = Release|Win32 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|Win32.Build.0 = Release|Win32 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|x64.ActiveCfg = Release|x64 + {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|x64.Build.0 = Release|x64 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|Win32.ActiveCfg = Debug|Win32 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|Win32.Build.0 = Debug|Win32 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|x64.ActiveCfg = Debug|x64 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|x64.Build.0 = Debug|x64 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|Win32.ActiveCfg = Release|Win32 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|Win32.Build.0 = Release|Win32 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|x64.ActiveCfg = Release|x64 + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|x64.Build.0 = Release|x64 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug|Win32.ActiveCfg = Debug|Win32 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug|Win32.Build.0 = Debug|Win32 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug|x64.ActiveCfg = Debug|x64 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Debug|x64.Build.0 = Debug|x64 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release|Win32.ActiveCfg = Release|Win32 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release|Win32.Build.0 = Release|Win32 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release|x64.ActiveCfg = Release|x64 + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B}.Release|x64.Build.0 = Release|x64 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|Win32.ActiveCfg = Debug|Win32 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|Win32.Build.0 = Debug|Win32 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|x64.ActiveCfg = Debug|x64 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|x64.Build.0 = Debug|x64 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|Win32.ActiveCfg = Release|Win32 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|Win32.Build.0 = Release|Win32 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|x64.ActiveCfg = Release|x64 + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|x64.Build.0 = Release|x64 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug|Win32.ActiveCfg = Debug|Win32 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug|Win32.Build.0 = Debug|Win32 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug|x64.ActiveCfg = Debug|x64 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Debug|x64.Build.0 = Debug|x64 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release|Win32.ActiveCfg = Release|Win32 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release|Win32.Build.0 = Release|Win32 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release|x64.ActiveCfg = Release|x64 + {C0C6F651-99D8-404E-B2EC-507B261E820C}.Release|x64.Build.0 = Release|x64 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug|Win32.ActiveCfg = Debug|Win32 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug|Win32.Build.0 = Debug|Win32 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug|x64.ActiveCfg = Debug|x64 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Debug|x64.Build.0 = Debug|x64 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release|Win32.ActiveCfg = Release|Win32 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release|Win32.Build.0 = Release|Win32 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release|x64.ActiveCfg = Release|x64 + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9}.Release|x64.Build.0 = Release|x64 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug|Win32.ActiveCfg = Debug|Win32 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug|Win32.Build.0 = Debug|Win32 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug|x64.ActiveCfg = Debug|x64 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Debug|x64.Build.0 = Debug|x64 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release|Win32.ActiveCfg = Release|Win32 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release|Win32.Build.0 = Release|Win32 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release|x64.ActiveCfg = Release|x64 + {7C361308-3FC8-45AF-9362-1A7C75E7F277}.Release|x64.Build.0 = Release|x64 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug|Win32.ActiveCfg = Debug|Win32 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug|Win32.Build.0 = Debug|Win32 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug|x64.ActiveCfg = Debug|x64 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Debug|x64.Build.0 = Debug|x64 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release|Win32.ActiveCfg = Release|Win32 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release|Win32.Build.0 = Release|Win32 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release|x64.ActiveCfg = Release|x64 + {44D4D0A3-FAFA-4134-9806-BCB830594E28}.Release|x64.Build.0 = Release|x64 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug|Win32.ActiveCfg = Debug|Win32 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug|Win32.Build.0 = Debug|Win32 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug|x64.ActiveCfg = Debug|x64 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Debug|x64.Build.0 = Debug|x64 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release|Win32.ActiveCfg = Release|Win32 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release|Win32.Build.0 = Release|Win32 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release|x64.ActiveCfg = Release|x64 + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {63AF3784-3FFB-46AC-B341-76B55AEE3148} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {434FBB6C-6D3C-466A-86DB-DE999065B5E5} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {66FE475D-D26C-4457-8B1C-B057D770C716} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {07817E6D-9FAB-4261-9D62-C5AD13810258} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {1F8CC79C-876D-4A13-BA92-98A3A51B2749} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {94EF9EE0-6E68-4F5F-9174-D09896518894} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {0A878274-362D-4184-B5C6-A1C80D22A170} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {040B829F-8ED6-4D35-9043-0DF31597F7FB} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {C133DEF0-FAF5-4635-8D5A-2C789B424371} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {CBD762A9-79BC-4AE7-8890-76360F539D76} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {D405C4A0-D62F-4EE7-96D2-76AD808C7319} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {44D4D0A3-FAFA-4134-9806-BCB830594E28} = {92DEA81D-81ED-4283-BBC7-41975647F69E} + {C0C6F651-99D8-404E-B2EC-507B261E820C} = {DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA} + {18B64AA1-A2F7-46BE-8D48-7882AA471FA9} = {DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA} + {0F01EBDC-F988-41DD-BDA8-247DBC870F6B} = {DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA} + {7C361308-3FC8-45AF-9362-1A7C75E7F277} = {DAFB5F7D-6AF3-4D4F-B6D3-C1049A1259DA} + EndGlobalSection +EndGlobal diff --git a/msvc10/log4cplus.vcxproj b/msvc10/log4cplus.vcxproj index d286296c0..9f87df74a 100644 --- a/msvc10/log4cplus.vcxproj +++ b/msvc10/log4cplus.vcxproj @@ -1,1096 +1,1096 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - log4cplus - - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - $(ProjectName)D - $(ProjectName)UD - $(ProjectName)U - $(ProjectName)D - $(ProjectName)UD - $(ProjectName)U - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(OutDir)log4cplus.tlb - - - - - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(OutDir)log4cplus.tlb - - - - - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(OutDir)log4cplusD_dll.tlb - - - - - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(OutDir)log4cplusD_dll.tlb - - - - - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(OutDir)log4cplusUD_dll.tlb - - - - - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(OutDir)log4cplusUD_dll.tlb - - - - - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(OutDir)log4cplusU_dll.tlb - - - - - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(OutDir)log4cplusU_dll.tlb - - - - - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - true - true - true - true - true - true - true - true - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - true - true - true - true - true - true - true - true - - - - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {917836A4-0DDC-47BE-B930-1B3BFDF6C940} + log4cplus + + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + DynamicLibrary + false + Unicode + true + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + $(ProjectName)D + $(ProjectName)UD + $(ProjectName)U + $(ProjectName)D + $(ProjectName)UD + $(ProjectName)U + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(OutDir)log4cplus.tlb + + + + + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + MachineX86 + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(OutDir)log4cplus.tlb + + + + + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + MachineX64 + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(OutDir)log4cplusD_dll.tlb + + + + + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + MachineX86 + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(OutDir)log4cplusD_dll.tlb + + + + + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + MachineX64 + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(OutDir)log4cplusUD_dll.tlb + + + + + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + MachineX86 + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(OutDir)log4cplusUD_dll.tlb + + + + + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + MachineX64 + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(OutDir)log4cplusU_dll.tlb + + + + + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + MachineX86 + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(OutDir)log4cplusU_dll.tlb + + + + + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + MachineX64 + + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + true + true + true + true + true + true + true + true + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + true + true + true + true + true + true + + + + + + + + \ No newline at end of file diff --git a/msvc10/log4cplus.vcxproj.filters b/msvc10/log4cplus.vcxproj.filters index dd1055f14..006162923 100644 --- a/msvc10/log4cplus.vcxproj.filters +++ b/msvc10/log4cplus.vcxproj.filters @@ -1,413 +1,413 @@ - - - - - {1e32fe37-3b95-44dc-9df1-144a36d82a93} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {618ac5bc-5556-4e59-a3c1-285c2d9e80a3} - - - {b8a69ba5-bcc8-4b80-8b60-891bbd52f3b2} - - - {8bacc780-31ab-4337-bd72-9f2322c6030b} - - - {eafab4fe-e4a7-4a1e-8fc3-eae7997ed650} - - - {32a083ed-1e70-4c26-8357-4e4eeff37d56} - - - {5c364c18-addf-4da4-a37c-15a1dee4d137} - - - {78489271-5a5b-4622-96aa-18dae6086c42} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - internal - - - spi - - - spi - - - spi - - - spi - - - spi - - - spi - - - thread - - - thread - - - thread\impl - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - Appenders - - - Source Files - - - helpers - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - internal - - - internal - - - internal - - - config - - - config - - - spi - - - spi - - - spi - - - spi - - - spi - - - spi - - - spi - - - spi - - - thread - - - thread - - - thread - - - thread\impl - - - thread\impl - - - thread\impl - - - thread\impl - - - thread\impl - - - thread\impl - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - Appenders - - - Source Files - - - thread\impl - - - helpers - - - - - - - - - - Appenders - - - config - - - config - - + + + + + {1e32fe37-3b95-44dc-9df1-144a36d82a93} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {618ac5bc-5556-4e59-a3c1-285c2d9e80a3} + + + {b8a69ba5-bcc8-4b80-8b60-891bbd52f3b2} + + + {8bacc780-31ab-4337-bd72-9f2322c6030b} + + + {eafab4fe-e4a7-4a1e-8fc3-eae7997ed650} + + + {32a083ed-1e70-4c26-8357-4e4eeff37d56} + + + {5c364c18-addf-4da4-a37c-15a1dee4d137} + + + {78489271-5a5b-4622-96aa-18dae6086c42} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + internal + + + spi + + + spi + + + spi + + + spi + + + spi + + + spi + + + thread + + + thread + + + thread\impl + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + Appenders + + + Source Files + + + helpers + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + internal + + + internal + + + internal + + + config + + + config + + + spi + + + spi + + + spi + + + spi + + + spi + + + spi + + + spi + + + spi + + + thread + + + thread + + + thread + + + thread\impl + + + thread\impl + + + thread\impl + + + thread\impl + + + thread\impl + + + thread\impl + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + Appenders + + + Source Files + + + thread\impl + + + helpers + + + + + + + + + + Appenders + + + config + + + config + + \ No newline at end of file diff --git a/msvc10/log4cplusS.vcxproj b/msvc10/log4cplusS.vcxproj index a71b46434..4fc1a68ed 100644 --- a/msvc10/log4cplusS.vcxproj +++ b/msvc10/log4cplusS.vcxproj @@ -1,1031 +1,1031 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5} - log4cplusS - - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - $(ProjectName)D - $(ProjectName)UD - $(ProjectName)U - $(ProjectName)D - $(ProjectName)UD - $(ProjectName)U - - - - LOG4CPLUS_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - true - $(IntDir)log4cplusS.bsc - - - - - X64 - - - LOG4CPLUS_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - true - $(IntDir)log4cplusS.bsc - - - - - LOG4CPLUS_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - true - $(IntDir)log4cplusS.bsc - - - - - X64 - - - LOG4CPLUS_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - true - $(IntDir)log4cplusS.bsc - - - - - LOG4CPLUS_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - true - $(IntDir)log4cplusS.bsc - - - - - X64 - - - LOG4CPLUS_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - true - $(IntDir)log4cplusS.bsc - - - - - LOG4CPLUS_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - true - $(IntDir)log4cplusS.bsc - - - - - X64 - - - LOG4CPLUS_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - true - $(IntDir)log4cplusS.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - true - true - true - true - true - true - true - true - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - true - true - true - true - true - true - true - true - - - - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5} + log4cplusS + + + + StaticLibrary + false + Unicode + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + Unicode + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + Unicode + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + Unicode + + + StaticLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + $(ProjectName)D + $(ProjectName)UD + $(ProjectName)U + $(ProjectName)D + $(ProjectName)UD + $(ProjectName)U + + + + LOG4CPLUS_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + $(IntDir)log4cplusS.bsc + + + + + X64 + + + LOG4CPLUS_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + $(IntDir)log4cplusS.bsc + + + + + LOG4CPLUS_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + $(IntDir)log4cplusS.bsc + + + + + X64 + + + LOG4CPLUS_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + $(IntDir)log4cplusS.bsc + + + + + LOG4CPLUS_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + $(IntDir)log4cplusS.bsc + + + + + X64 + + + LOG4CPLUS_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + $(IntDir)log4cplusS.bsc + + + + + LOG4CPLUS_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + $(IntDir)log4cplusS.bsc + + + + + X64 + + + LOG4CPLUS_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + $(IntDir)log4cplusS.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + true + true + true + true + true + true + true + true + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + true + true + true + true + true + true + + + + + + + + \ No newline at end of file diff --git a/msvc10/log4cplusS.vcxproj.filters b/msvc10/log4cplusS.vcxproj.filters index b27c4b338..0d5c56d4a 100644 --- a/msvc10/log4cplusS.vcxproj.filters +++ b/msvc10/log4cplusS.vcxproj.filters @@ -1,410 +1,410 @@ - - - - - {d68eb85c-6091-451f-bef7-c52d0d727210} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {ecdc0d54-5ea7-4dd7-b49e-cd18945336fa} - - - {4079be8a-ab66-450b-ad55-c0f17e9dfe1a} - - - {53582570-1892-48ae-b0e0-6a9084643bf6} - - - {89ab7ed5-db29-4e54-a530-d518934447bd} - - - {075baef2-7a40-487c-b53f-25341a8947ff} - - - {bc4c1ba9-f566-48e3-bf90-077b96967b96} - - - {005e6281-6ebf-4a98-9fd6-6cf600600f1c} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - internal - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - spi - - - spi - - - spi - - - spi - - - spi - - - spi - - - thread - - - thread - - - thread\impl - - - helpers - - - helpers - - - Appenders - - - Source Files - - - helpers - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - Appenders - - - internal - - - internal - - - internal - - - config - - - config - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - spi - - - spi - - - spi - - - spi - - - spi - - - spi - - - spi - - - spi - - - thread - - - thread - - - thread - - - thread\impl - - - thread\impl - - - thread\impl - - - thread\impl - - - thread\impl - - - thread\impl - - - helpers - - - helpers - - - Appenders - - - Source Files - - - helpers - - - - - - - - - - Appenders - - - config - - - config - - + + + + + {d68eb85c-6091-451f-bef7-c52d0d727210} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {ecdc0d54-5ea7-4dd7-b49e-cd18945336fa} + + + {4079be8a-ab66-450b-ad55-c0f17e9dfe1a} + + + {53582570-1892-48ae-b0e0-6a9084643bf6} + + + {89ab7ed5-db29-4e54-a530-d518934447bd} + + + {075baef2-7a40-487c-b53f-25341a8947ff} + + + {bc4c1ba9-f566-48e3-bf90-077b96967b96} + + + {005e6281-6ebf-4a98-9fd6-6cf600600f1c} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + internal + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + spi + + + spi + + + spi + + + spi + + + spi + + + spi + + + thread + + + thread + + + thread\impl + + + helpers + + + helpers + + + Appenders + + + Source Files + + + helpers + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + Appenders + + + internal + + + internal + + + internal + + + config + + + config + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + helpers + + + spi + + + spi + + + spi + + + spi + + + spi + + + spi + + + spi + + + spi + + + thread + + + thread + + + thread + + + thread\impl + + + thread\impl + + + thread\impl + + + thread\impl + + + thread\impl + + + thread\impl + + + helpers + + + helpers + + + Appenders + + + Source Files + + + helpers + + + + + + + + + + Appenders + + + config + + + config + + \ No newline at end of file diff --git a/msvc10/log4cplus_debug.props b/msvc10/log4cplus_debug.props index 5c30e3af6..c564d82f0 100644 --- a/msvc10/log4cplus_debug.props +++ b/msvc10/log4cplus_debug.props @@ -1,14 +1,14 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - - - - Disabled - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - true - - + + + + <_ProjectFileVersion>10.0.40219.1 + + + + Disabled + _DEBUG;DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + + \ No newline at end of file diff --git a/msvc10/log4cplus_release.props b/msvc10/log4cplus_release.props index a9490a5c2..a9fb2c090 100644 --- a/msvc10/log4cplus_release.props +++ b/msvc10/log4cplus_release.props @@ -1,18 +1,18 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - - - - MaxSpeed - AnySuitable - true - Speed - true - true - NDEBUG;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - false - - + + + + <_ProjectFileVersion>10.0.40219.1 + + + + MaxSpeed + AnySuitable + true + Speed + true + true + NDEBUG;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + false + + \ No newline at end of file diff --git a/msvc10/log4cplus_static.props b/msvc10/log4cplus_static.props index 2a31e9a89..8baa8f0c0 100755 --- a/msvc10/log4cplus_static.props +++ b/msvc10/log4cplus_static.props @@ -1,10 +1,10 @@ - - - - - - .lib - - - + + + + + + .lib + + + \ No newline at end of file diff --git a/msvc10/loggingserver.props b/msvc10/loggingserver.props index 73e9d7480..cf72fd08e 100644 --- a/msvc10/loggingserver.props +++ b/msvc10/loggingserver.props @@ -1,19 +1,19 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ - $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ - - - - ..\include;%(AdditionalIncludeDirectories) - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - $(OutDir)$(TargetName).pdb - Level3 - - - $(SolutionDir)$(Platform)\bin.$(Configuration);%(AdditionalLibraryDirectories) - - + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ + $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ + + + + ..\include;%(AdditionalIncludeDirectories) + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + $(OutDir)$(TargetName).pdb + Level3 + + + $(SolutionDir)$(Platform)\bin.$(Configuration);%(AdditionalLibraryDirectories) + + \ No newline at end of file diff --git a/msvc10/loggingserver.vcxproj b/msvc10/loggingserver.vcxproj index db91f4f8d..e7ca6182f 100644 --- a/msvc10/loggingserver.vcxproj +++ b/msvc10/loggingserver.vcxproj @@ -1,458 +1,458 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {B8E88AF6-0427-4839-88AC-0C6E12615B10} - loggingserver - - - - Application - false - Unicode - - - Application - false - Unicode - true - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - - - Application - false - Unicode - true - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - false - false - true - true - false - false - true - true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)loggingserver.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)loggingserver.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;log4cplus.lib;%(AdditionalDependencies) - $(OutDir)loggingserver.exe - true - %(AdditionalLibraryDirectories) - $(OutDir)loggingserver.pdb - Console - MachineX86 - - - true - $(IntDir)loggingserver.bsc - - - - - X64 - $(OutDir)loggingserver.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)loggingserver.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;log4cplus.lib;%(AdditionalDependencies) - $(OutDir)loggingserver.exe - true - %(AdditionalLibraryDirectories) - $(OutDir)loggingserver.pdb - Console - MachineX64 - - - true - $(IntDir)loggingserver.bsc - - - - - $(OutDir)loggingserver.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)loggingserver.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;log4cplusD.lib;%(AdditionalDependencies) - $(OutDir)loggingserver.exe - true - %(AdditionalLibraryDirectories) - true - $(OutDir)loggingserver.pdb - Console - MachineX86 - - - true - $(IntDir)loggingserver.bsc - - - - - X64 - $(OutDir)loggingserver.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)loggingserver.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;log4cplusD.lib;%(AdditionalDependencies) - $(OutDir)loggingserver.exe - true - %(AdditionalLibraryDirectories) - true - $(OutDir)loggingserver.pdb - Console - MachineX64 - - - true - $(IntDir)loggingserver.bsc - - - - - $(OutDir)loggingserver.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)loggingserver.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;log4cplusU.lib;%(AdditionalDependencies) - $(OutDir)loggingserver.exe - true - %(AdditionalLibraryDirectories) - $(OutDir)loggingserver.pdb - Console - MachineX86 - - - true - $(IntDir)loggingserver.bsc - - - - - X64 - $(OutDir)loggingserver.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)loggingserver.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;log4cplusU.lib;%(AdditionalDependencies) - $(OutDir)loggingserver.exe - true - %(AdditionalLibraryDirectories) - $(OutDir)loggingserver.pdb - Console - MachineX64 - - - true - $(IntDir)loggingserver.bsc - - - - - $(OutDir)loggingserver.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)loggingserver.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;log4cplusUD.lib;%(AdditionalDependencies) - $(OutDir)loggingserver.exe - true - %(AdditionalLibraryDirectories) - true - $(OutDir)loggingserver.pdb - Console - MachineX86 - - - true - $(IntDir)loggingserver.bsc - - - - - X64 - $(OutDir)loggingserver.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)loggingserver.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;log4cplusUD.lib;%(AdditionalDependencies) - $(OutDir)loggingserver.exe - true - %(AdditionalLibraryDirectories) - true - $(OutDir)loggingserver.pdb - Console - MachineX64 - - - true - $(IntDir)loggingserver.bsc - - - - - - - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {B8E88AF6-0427-4839-88AC-0C6E12615B10} + loggingserver + + + + Application + false + Unicode + + + Application + false + Unicode + true + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + + + Application + false + Unicode + true + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + false + false + true + true + false + false + true + true + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)loggingserver.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)loggingserver.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + odbc32.lib;odbccp32.lib;log4cplus.lib;%(AdditionalDependencies) + $(OutDir)loggingserver.exe + true + %(AdditionalLibraryDirectories) + $(OutDir)loggingserver.pdb + Console + MachineX86 + + + true + $(IntDir)loggingserver.bsc + + + + + X64 + $(OutDir)loggingserver.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)loggingserver.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + odbc32.lib;odbccp32.lib;log4cplus.lib;%(AdditionalDependencies) + $(OutDir)loggingserver.exe + true + %(AdditionalLibraryDirectories) + $(OutDir)loggingserver.pdb + Console + MachineX64 + + + true + $(IntDir)loggingserver.bsc + + + + + $(OutDir)loggingserver.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)loggingserver.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + odbc32.lib;odbccp32.lib;log4cplusD.lib;%(AdditionalDependencies) + $(OutDir)loggingserver.exe + true + %(AdditionalLibraryDirectories) + true + $(OutDir)loggingserver.pdb + Console + MachineX86 + + + true + $(IntDir)loggingserver.bsc + + + + + X64 + $(OutDir)loggingserver.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)loggingserver.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + odbc32.lib;odbccp32.lib;log4cplusD.lib;%(AdditionalDependencies) + $(OutDir)loggingserver.exe + true + %(AdditionalLibraryDirectories) + true + $(OutDir)loggingserver.pdb + Console + MachineX64 + + + true + $(IntDir)loggingserver.bsc + + + + + $(OutDir)loggingserver.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)loggingserver.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + odbc32.lib;odbccp32.lib;log4cplusU.lib;%(AdditionalDependencies) + $(OutDir)loggingserver.exe + true + %(AdditionalLibraryDirectories) + $(OutDir)loggingserver.pdb + Console + MachineX86 + + + true + $(IntDir)loggingserver.bsc + + + + + X64 + $(OutDir)loggingserver.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)loggingserver.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + odbc32.lib;odbccp32.lib;log4cplusU.lib;%(AdditionalDependencies) + $(OutDir)loggingserver.exe + true + %(AdditionalLibraryDirectories) + $(OutDir)loggingserver.pdb + Console + MachineX64 + + + true + $(IntDir)loggingserver.bsc + + + + + $(OutDir)loggingserver.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)loggingserver.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + odbc32.lib;odbccp32.lib;log4cplusUD.lib;%(AdditionalDependencies) + $(OutDir)loggingserver.exe + true + %(AdditionalLibraryDirectories) + true + $(OutDir)loggingserver.pdb + Console + MachineX86 + + + true + $(IntDir)loggingserver.bsc + + + + + X64 + $(OutDir)loggingserver.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)loggingserver.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + odbc32.lib;odbccp32.lib;log4cplusUD.lib;%(AdditionalDependencies) + $(OutDir)loggingserver.exe + true + %(AdditionalLibraryDirectories) + true + $(OutDir)loggingserver.pdb + Console + MachineX64 + + + true + $(IntDir)loggingserver.bsc + + + + + + + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/loggingserver.vcxproj.filters b/msvc10/loggingserver.vcxproj.filters index eda88dc08..38950e517 100644 --- a/msvc10/loggingserver.vcxproj.filters +++ b/msvc10/loggingserver.vcxproj.filters @@ -1,17 +1,17 @@ - - - - - {fdcfbd77-3762-49ca-ae73-c4a26d9b8c69} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - - - - + + + + + {fdcfbd77-3762-49ca-ae73-c4a26d9b8c69} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + + + + \ No newline at end of file diff --git a/msvc10/tests/appender_test.vcxproj b/msvc10/tests/appender_test.vcxproj index f54f060a2..bd4ddc256 100644 --- a/msvc10/tests/appender_test.vcxproj +++ b/msvc10/tests/appender_test.vcxproj @@ -1,464 +1,464 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {63AF3784-3FFB-46AC-B341-76B55AEE3148} - appender_test - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - false - false - true - true - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)appender_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)appender_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)appender_test.pdb - Console - MachineX86 - - - true - $(IntDir)appender_test.bsc - - - - - X64 - $(OutDir)appender_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)appender_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)appender_test.pdb - Console - MachineX64 - - - true - $(IntDir)appender_test.bsc - - - - - $(OutDir)appender_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)appender_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)appender_test.pdb - Console - MachineX86 - - - true - $(IntDir)appender_test.bsc - - - - - X64 - $(OutDir)appender_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)appender_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)appender_test.pdb - Console - MachineX64 - - - true - $(IntDir)appender_test.bsc - - - - - $(OutDir)appender_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)appender_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)appender_test.pdb - Console - MachineX86 - - - true - $(IntDir)appender_test.bsc - - - - - X64 - $(OutDir)appender_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)appender_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)appender_test.pdb - Console - MachineX64 - - - true - $(IntDir)appender_test.bsc - - - - - $(OutDir)appender_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)appender_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)appender_test.pdb - Console - MachineX86 - - - true - $(IntDir)appender_test.bsc - - - - - X64 - $(OutDir)appender_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)appender_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)appender_test.pdb - Console - MachineX64 - - - true - $(IntDir)appender_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {63AF3784-3FFB-46AC-B341-76B55AEE3148} + appender_test + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + false + false + true + true + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)appender_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)appender_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)appender_test.pdb + Console + MachineX86 + + + true + $(IntDir)appender_test.bsc + + + + + X64 + $(OutDir)appender_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)appender_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)appender_test.pdb + Console + MachineX64 + + + true + $(IntDir)appender_test.bsc + + + + + $(OutDir)appender_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)appender_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)appender_test.pdb + Console + MachineX86 + + + true + $(IntDir)appender_test.bsc + + + + + X64 + $(OutDir)appender_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)appender_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)appender_test.pdb + Console + MachineX64 + + + true + $(IntDir)appender_test.bsc + + + + + $(OutDir)appender_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)appender_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)appender_test.pdb + Console + MachineX86 + + + true + $(IntDir)appender_test.bsc + + + + + X64 + $(OutDir)appender_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)appender_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)appender_test.pdb + Console + MachineX64 + + + true + $(IntDir)appender_test.bsc + + + + + $(OutDir)appender_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)appender_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)appender_test.pdb + Console + MachineX86 + + + true + $(IntDir)appender_test.bsc + + + + + X64 + $(OutDir)appender_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)appender_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)appender_test.pdb + Console + MachineX64 + + + true + $(IntDir)appender_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/appender_test.vcxproj.filters b/msvc10/tests/appender_test.vcxproj.filters index 1e8bb12b9..09d7939ca 100644 --- a/msvc10/tests/appender_test.vcxproj.filters +++ b/msvc10/tests/appender_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {cdb4a051-bd14-43e2-8c16-969d47bbbc52} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {cdb4a051-bd14-43e2-8c16-969d47bbbc52} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/configandwatch_test.vcxproj b/msvc10/tests/configandwatch_test.vcxproj index 53590fd46..a61c2ec8d 100644 --- a/msvc10/tests/configandwatch_test.vcxproj +++ b/msvc10/tests/configandwatch_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {0A878274-362D-4184-B5C6-A1C80D22A170} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - false - false - true - true - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)configandwatch_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)configandwatch_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)configandwatch_test.pdb - Console - MachineX86 - - - true - $(IntDir)configandwatch_test.bsc - - - - - X64 - $(OutDir)configandwatch_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)configandwatch_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)configandwatch_test.pdb - Console - MachineX64 - - - true - $(IntDir)configandwatch_test.bsc - - - - - $(OutDir)configandwatch_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)configandwatch_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)configandwatch_test.pdb - Console - MachineX86 - - - true - $(IntDir)configandwatch_test.bsc - - - - - X64 - $(OutDir)configandwatch_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)configandwatch_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)configandwatch_test.pdb - Console - MachineX64 - - - true - $(IntDir)configandwatch_test.bsc - - - - - $(OutDir)configandwatch_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)configandwatch_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)configandwatch_test.pdb - Console - MachineX86 - - - true - $(IntDir)configandwatch_test.bsc - - - - - X64 - $(OutDir)configandwatch_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)configandwatch_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)configandwatch_test.pdb - Console - MachineX64 - - - true - $(IntDir)configandwatch_test.bsc - - - - - $(OutDir)configandwatch_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)configandwatch_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)configandwatch_test.pdb - Console - MachineX86 - - - true - $(IntDir)configandwatch_test.bsc - - - - - X64 - $(OutDir)configandwatch_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)configandwatch_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)configandwatch_test.pdb - Console - MachineX64 - - - true - $(IntDir)configandwatch_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {0A878274-362D-4184-B5C6-A1C80D22A170} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + false + false + true + true + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)configandwatch_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)configandwatch_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)configandwatch_test.pdb + Console + MachineX86 + + + true + $(IntDir)configandwatch_test.bsc + + + + + X64 + $(OutDir)configandwatch_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)configandwatch_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)configandwatch_test.pdb + Console + MachineX64 + + + true + $(IntDir)configandwatch_test.bsc + + + + + $(OutDir)configandwatch_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)configandwatch_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)configandwatch_test.pdb + Console + MachineX86 + + + true + $(IntDir)configandwatch_test.bsc + + + + + X64 + $(OutDir)configandwatch_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)configandwatch_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)configandwatch_test.pdb + Console + MachineX64 + + + true + $(IntDir)configandwatch_test.bsc + + + + + $(OutDir)configandwatch_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)configandwatch_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)configandwatch_test.pdb + Console + MachineX86 + + + true + $(IntDir)configandwatch_test.bsc + + + + + X64 + $(OutDir)configandwatch_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)configandwatch_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)configandwatch_test.pdb + Console + MachineX64 + + + true + $(IntDir)configandwatch_test.bsc + + + + + $(OutDir)configandwatch_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)configandwatch_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)configandwatch_test.pdb + Console + MachineX86 + + + true + $(IntDir)configandwatch_test.bsc + + + + + X64 + $(OutDir)configandwatch_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)configandwatch_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)configandwatch_test.pdb + Console + MachineX64 + + + true + $(IntDir)configandwatch_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/configandwatch_test.vcxproj.filters b/msvc10/tests/configandwatch_test.vcxproj.filters index aba241783..7e773d161 100644 --- a/msvc10/tests/configandwatch_test.vcxproj.filters +++ b/msvc10/tests/configandwatch_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {cc488b10-6196-4822-84f6-45113dad516f} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {cc488b10-6196-4822-84f6-45113dad516f} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/customloglevel_test.vcxproj b/msvc10/tests/customloglevel_test.vcxproj index 74ecf725b..ff25367d6 100644 --- a/msvc10/tests/customloglevel_test.vcxproj +++ b/msvc10/tests/customloglevel_test.vcxproj @@ -1,499 +1,499 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {040B829F-8ED6-4D35-9043-0DF31597F7FB} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - false - false - true - true - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)customloglevel_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)customloglevel_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)customloglevel_test.pdb - Console - MachineX86 - - - true - $(IntDir)customloglevel_test.bsc - - - - - X64 - $(OutDir)customloglevel_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)customloglevel_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)customloglevel_test.pdb - Console - MachineX64 - - - true - $(IntDir)customloglevel_test.bsc - - - - - $(OutDir)customloglevel_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)customloglevel_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)customloglevel_test.pdb - Console - MachineX86 - - - true - $(IntDir)customloglevel_test.bsc - - - - - X64 - $(OutDir)customloglevel_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)customloglevel_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)customloglevel_test.pdb - Console - MachineX64 - - - true - $(IntDir)customloglevel_test.bsc - - - - - $(OutDir)customloglevel_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)customloglevel_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)customloglevel_test.pdb - Console - MachineX86 - - - true - $(IntDir)customloglevel_test.bsc - - - - - X64 - $(OutDir)customloglevel_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)customloglevel_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)customloglevel_test.pdb - Console - MachineX64 - - - true - $(IntDir)customloglevel_test.bsc - - - - - $(OutDir)customloglevel_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)customloglevel_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)customloglevel_test.pdb - Console - MachineX86 - - - true - $(IntDir)customloglevel_test.bsc - - - - - X64 - $(OutDir)customloglevel_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)customloglevel_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)customloglevel_test.pdb - Console - MachineX64 - - - true - $(IntDir)customloglevel_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {040B829F-8ED6-4D35-9043-0DF31597F7FB} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + false + false + true + true + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)customloglevel_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)customloglevel_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)customloglevel_test.pdb + Console + MachineX86 + + + true + $(IntDir)customloglevel_test.bsc + + + + + X64 + $(OutDir)customloglevel_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)customloglevel_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)customloglevel_test.pdb + Console + MachineX64 + + + true + $(IntDir)customloglevel_test.bsc + + + + + $(OutDir)customloglevel_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)customloglevel_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)customloglevel_test.pdb + Console + MachineX86 + + + true + $(IntDir)customloglevel_test.bsc + + + + + X64 + $(OutDir)customloglevel_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)customloglevel_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)customloglevel_test.pdb + Console + MachineX64 + + + true + $(IntDir)customloglevel_test.bsc + + + + + $(OutDir)customloglevel_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)customloglevel_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)customloglevel_test.pdb + Console + MachineX86 + + + true + $(IntDir)customloglevel_test.bsc + + + + + X64 + $(OutDir)customloglevel_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)customloglevel_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)customloglevel_test.pdb + Console + MachineX64 + + + true + $(IntDir)customloglevel_test.bsc + + + + + $(OutDir)customloglevel_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)customloglevel_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)customloglevel_test.pdb + Console + MachineX86 + + + true + $(IntDir)customloglevel_test.bsc + + + + + X64 + $(OutDir)customloglevel_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)customloglevel_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)customloglevel_test.pdb + Console + MachineX64 + + + true + $(IntDir)customloglevel_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/customloglevel_test.vcxproj.filters b/msvc10/tests/customloglevel_test.vcxproj.filters index 431da6597..04fe5a15a 100644 --- a/msvc10/tests/customloglevel_test.vcxproj.filters +++ b/msvc10/tests/customloglevel_test.vcxproj.filters @@ -1,20 +1,20 @@ - - - - - {d9fa0575-bb83-4a00-b98e-de8fb0099466} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - - Source Files - - - Source Files - - + + + + + {d9fa0575-bb83-4a00-b98e-de8fb0099466} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/fileappender_test.vcxproj b/msvc10/tests/fileappender_test.vcxproj index afb070ed0..a02f1535b 100644 --- a/msvc10/tests/fileappender_test.vcxproj +++ b/msvc10/tests/fileappender_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {434FBB6C-6D3C-466A-86DB-DE999065B5E5} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - false - false - true - true - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)fileappender_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)fileappender_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)fileappender_test.pdb - Console - MachineX86 - - - true - $(IntDir)fileappender_test.bsc - - - - - X64 - $(OutDir)fileappender_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)fileappender_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)fileappender_test.pdb - Console - MachineX64 - - - true - $(IntDir)fileappender_test.bsc - - - - - $(OutDir)fileappender_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)fileappender_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)fileappender_test.pdb - Console - MachineX86 - - - true - $(IntDir)fileappender_test.bsc - - - - - X64 - $(OutDir)fileappender_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)fileappender_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)fileappender_test.pdb - Console - MachineX64 - - - true - $(IntDir)fileappender_test.bsc - - - - - $(OutDir)fileappender_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)fileappender_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)fileappender_test.pdb - Console - MachineX86 - - - true - $(IntDir)fileappender_test.bsc - - - - - X64 - $(OutDir)fileappender_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)fileappender_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)fileappender_test.pdb - Console - MachineX64 - - - true - $(IntDir)fileappender_test.bsc - - - - - $(OutDir)fileappender_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)fileappender_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)fileappender_test.pdb - Console - MachineX86 - - - true - $(IntDir)fileappender_test.bsc - - - - - X64 - $(OutDir)fileappender_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)fileappender_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)fileappender_test.pdb - Console - MachineX64 - - - true - $(IntDir)fileappender_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {434FBB6C-6D3C-466A-86DB-DE999065B5E5} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + false + false + true + true + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)fileappender_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)fileappender_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)fileappender_test.pdb + Console + MachineX86 + + + true + $(IntDir)fileappender_test.bsc + + + + + X64 + $(OutDir)fileappender_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)fileappender_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)fileappender_test.pdb + Console + MachineX64 + + + true + $(IntDir)fileappender_test.bsc + + + + + $(OutDir)fileappender_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)fileappender_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)fileappender_test.pdb + Console + MachineX86 + + + true + $(IntDir)fileappender_test.bsc + + + + + X64 + $(OutDir)fileappender_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)fileappender_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)fileappender_test.pdb + Console + MachineX64 + + + true + $(IntDir)fileappender_test.bsc + + + + + $(OutDir)fileappender_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)fileappender_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)fileappender_test.pdb + Console + MachineX86 + + + true + $(IntDir)fileappender_test.bsc + + + + + X64 + $(OutDir)fileappender_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)fileappender_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)fileappender_test.pdb + Console + MachineX64 + + + true + $(IntDir)fileappender_test.bsc + + + + + $(OutDir)fileappender_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)fileappender_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)fileappender_test.pdb + Console + MachineX86 + + + true + $(IntDir)fileappender_test.bsc + + + + + X64 + $(OutDir)fileappender_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)fileappender_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)fileappender_test.pdb + Console + MachineX64 + + + true + $(IntDir)fileappender_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/fileappender_test.vcxproj.filters b/msvc10/tests/fileappender_test.vcxproj.filters index c7b72d163..48a1b549c 100644 --- a/msvc10/tests/fileappender_test.vcxproj.filters +++ b/msvc10/tests/fileappender_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {f8c4f23f-9b9e-45a5-9398-52ec3d181271} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {f8c4f23f-9b9e-45a5-9398-52ec3d181271} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/filter_test.vcxproj b/msvc10/tests/filter_test.vcxproj index 064bef005..ed45cd381 100644 --- a/msvc10/tests/filter_test.vcxproj +++ b/msvc10/tests/filter_test.vcxproj @@ -1,464 +1,464 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {66FE475D-D26C-4457-8B1C-B057D770C716} - filter_test - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)filter_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)filter_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)filter_test.pdb - Console - MachineX86 - - - true - $(IntDir)filter_test.bsc - - - - - X64 - $(OutDir)filter_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)filter_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)filter_test.pdb - Console - MachineX64 - - - true - $(IntDir)filter_test.bsc - - - - - $(OutDir)filter_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)filter_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)filter_test.pdb - Console - MachineX86 - - - true - $(IntDir)filter_test.bsc - - - - - X64 - $(OutDir)filter_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)filter_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)filter_test.pdb - Console - MachineX64 - - - true - $(IntDir)filter_test.bsc - - - - - $(OutDir)filter_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)filter_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)filter_test.pdb - Console - MachineX86 - - - true - $(IntDir)filter_test.bsc - - - - - X64 - $(OutDir)filter_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)filter_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)filter_test.pdb - Console - MachineX64 - - - true - $(IntDir)filter_test.bsc - - - - - $(OutDir)filter_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)filter_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)filter_test.pdb - Console - MachineX86 - - - true - $(IntDir)filter_test.bsc - - - - - X64 - $(OutDir)filter_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)filter_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)filter_test.pdb - Console - MachineX64 - - - true - $(IntDir)filter_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {66FE475D-D26C-4457-8B1C-B057D770C716} + filter_test + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)filter_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)filter_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)filter_test.pdb + Console + MachineX86 + + + true + $(IntDir)filter_test.bsc + + + + + X64 + $(OutDir)filter_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)filter_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)filter_test.pdb + Console + MachineX64 + + + true + $(IntDir)filter_test.bsc + + + + + $(OutDir)filter_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)filter_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)filter_test.pdb + Console + MachineX86 + + + true + $(IntDir)filter_test.bsc + + + + + X64 + $(OutDir)filter_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)filter_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)filter_test.pdb + Console + MachineX64 + + + true + $(IntDir)filter_test.bsc + + + + + $(OutDir)filter_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)filter_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)filter_test.pdb + Console + MachineX86 + + + true + $(IntDir)filter_test.bsc + + + + + X64 + $(OutDir)filter_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)filter_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)filter_test.pdb + Console + MachineX64 + + + true + $(IntDir)filter_test.bsc + + + + + $(OutDir)filter_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)filter_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)filter_test.pdb + Console + MachineX86 + + + true + $(IntDir)filter_test.bsc + + + + + X64 + $(OutDir)filter_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)filter_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)filter_test.pdb + Console + MachineX64 + + + true + $(IntDir)filter_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/filter_test.vcxproj.filters b/msvc10/tests/filter_test.vcxproj.filters index c3c5a263e..ca643ae22 100644 --- a/msvc10/tests/filter_test.vcxproj.filters +++ b/msvc10/tests/filter_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {fe49f965-3bd7-463e-9488-2f11a50b722e} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {fe49f965-3bd7-463e-9488-2f11a50b722e} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/hierarchy_test.vcxproj b/msvc10/tests/hierarchy_test.vcxproj index 033c62341..101327018 100644 --- a/msvc10/tests/hierarchy_test.vcxproj +++ b/msvc10/tests/hierarchy_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {07817E6D-9FAB-4261-9D62-C5AD13810258} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)hierarchy_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)hierarchy_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)hierarchy_test.pdb - Console - MachineX86 - - - true - $(IntDir)hierarchy_test.bsc - - - - - X64 - $(OutDir)hierarchy_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)hierarchy_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)hierarchy_test.pdb - Console - MachineX64 - - - true - $(IntDir)hierarchy_test.bsc - - - - - $(OutDir)hierarchy_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)hierarchy_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)hierarchy_test.pdb - Console - MachineX86 - - - true - $(IntDir)hierarchy_test.bsc - - - - - X64 - $(OutDir)hierarchy_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)hierarchy_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)hierarchy_test.pdb - Console - MachineX64 - - - true - $(IntDir)hierarchy_test.bsc - - - - - $(OutDir)hierarchy_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)hierarchy_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)hierarchy_test.pdb - Console - MachineX86 - - - true - $(IntDir)hierarchy_test.bsc - - - - - X64 - $(OutDir)hierarchy_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)hierarchy_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)hierarchy_test.pdb - Console - MachineX64 - - - true - $(IntDir)hierarchy_test.bsc - - - - - $(OutDir)hierarchy_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)hierarchy_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)hierarchy_test.pdb - Console - MachineX86 - - - true - $(IntDir)hierarchy_test.bsc - - - - - X64 - $(OutDir)hierarchy_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)hierarchy_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)hierarchy_test.pdb - Console - MachineX64 - - - true - $(IntDir)hierarchy_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {07817E6D-9FAB-4261-9D62-C5AD13810258} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)hierarchy_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)hierarchy_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)hierarchy_test.pdb + Console + MachineX86 + + + true + $(IntDir)hierarchy_test.bsc + + + + + X64 + $(OutDir)hierarchy_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)hierarchy_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)hierarchy_test.pdb + Console + MachineX64 + + + true + $(IntDir)hierarchy_test.bsc + + + + + $(OutDir)hierarchy_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)hierarchy_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)hierarchy_test.pdb + Console + MachineX86 + + + true + $(IntDir)hierarchy_test.bsc + + + + + X64 + $(OutDir)hierarchy_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)hierarchy_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)hierarchy_test.pdb + Console + MachineX64 + + + true + $(IntDir)hierarchy_test.bsc + + + + + $(OutDir)hierarchy_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)hierarchy_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)hierarchy_test.pdb + Console + MachineX86 + + + true + $(IntDir)hierarchy_test.bsc + + + + + X64 + $(OutDir)hierarchy_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)hierarchy_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)hierarchy_test.pdb + Console + MachineX64 + + + true + $(IntDir)hierarchy_test.bsc + + + + + $(OutDir)hierarchy_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)hierarchy_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)hierarchy_test.pdb + Console + MachineX86 + + + true + $(IntDir)hierarchy_test.bsc + + + + + X64 + $(OutDir)hierarchy_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)hierarchy_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)hierarchy_test.pdb + Console + MachineX64 + + + true + $(IntDir)hierarchy_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/hierarchy_test.vcxproj.filters b/msvc10/tests/hierarchy_test.vcxproj.filters index 8fff1006c..9243352f3 100644 --- a/msvc10/tests/hierarchy_test.vcxproj.filters +++ b/msvc10/tests/hierarchy_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {81394ec9-d432-4eb0-aa7a-b8e48e776cec} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {81394ec9-d432-4eb0-aa7a-b8e48e776cec} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/log4cplus_tests.props b/msvc10/tests/log4cplus_tests.props index 36af1f7e0..bbe509aa8 100644 --- a/msvc10/tests/log4cplus_tests.props +++ b/msvc10/tests/log4cplus_tests.props @@ -1,22 +1,22 @@ - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ - $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ - - - - ..\..\include;%(AdditionalIncludeDirectories) - LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) - ProgramDatabase - $(OutDir)$(TargetName).pdb - Level3 - - - $(SolutionDir)$(Platform)\bin.$(Configuration);%(AdditionalLibraryDirectories) - true - false - - + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(PlatformName)\bin.$(Configuration)\ + $(SolutionDir)$(PlatformName)\obj.$(ProjectName).$(Configuration)\ + + + + ..\..\include;%(AdditionalIncludeDirectories) + LOG4CPLUS_BUILD_DLL;%(PreprocessorDefinitions) + ProgramDatabase + $(OutDir)$(TargetName).pdb + Level3 + + + $(SolutionDir)$(Platform)\bin.$(Configuration);%(AdditionalLibraryDirectories) + true + false + + \ No newline at end of file diff --git a/msvc10/tests/loglog_test.vcxproj b/msvc10/tests/loglog_test.vcxproj index a6d050035..1588ec68a 100644 --- a/msvc10/tests/loglog_test.vcxproj +++ b/msvc10/tests/loglog_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {1F8CC79C-876D-4A13-BA92-98A3A51B2749} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)loglog_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)loglog_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)loglog_test.pdb - Console - MachineX86 - - - true - $(IntDir)loglog_test.bsc - - - - - X64 - $(OutDir)loglog_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)loglog_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)loglog_test.pdb - Console - MachineX64 - - - true - $(IntDir)loglog_test.bsc - - - - - $(OutDir)loglog_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)loglog_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)loglog_test.pdb - Console - MachineX86 - - - true - $(IntDir)loglog_test.bsc - - - - - X64 - $(OutDir)loglog_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)loglog_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)loglog_test.pdb - Console - MachineX64 - - - true - $(IntDir)loglog_test.bsc - - - - - $(OutDir)loglog_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)loglog_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)loglog_test.pdb - Console - MachineX86 - - - true - $(IntDir)loglog_test.bsc - - - - - X64 - $(OutDir)loglog_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)loglog_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)loglog_test.pdb - Console - MachineX64 - - - true - $(IntDir)loglog_test.bsc - - - - - $(OutDir)loglog_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)loglog_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)loglog_test.pdb - Console - MachineX86 - - - true - $(IntDir)loglog_test.bsc - - - - - X64 - $(OutDir)loglog_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)loglog_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)loglog_test.pdb - Console - MachineX64 - - - true - $(IntDir)loglog_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {1F8CC79C-876D-4A13-BA92-98A3A51B2749} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)loglog_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)loglog_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)loglog_test.pdb + Console + MachineX86 + + + true + $(IntDir)loglog_test.bsc + + + + + X64 + $(OutDir)loglog_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)loglog_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)loglog_test.pdb + Console + MachineX64 + + + true + $(IntDir)loglog_test.bsc + + + + + $(OutDir)loglog_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)loglog_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)loglog_test.pdb + Console + MachineX86 + + + true + $(IntDir)loglog_test.bsc + + + + + X64 + $(OutDir)loglog_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)loglog_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)loglog_test.pdb + Console + MachineX64 + + + true + $(IntDir)loglog_test.bsc + + + + + $(OutDir)loglog_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)loglog_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)loglog_test.pdb + Console + MachineX86 + + + true + $(IntDir)loglog_test.bsc + + + + + X64 + $(OutDir)loglog_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)loglog_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)loglog_test.pdb + Console + MachineX64 + + + true + $(IntDir)loglog_test.bsc + + + + + $(OutDir)loglog_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)loglog_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)loglog_test.pdb + Console + MachineX86 + + + true + $(IntDir)loglog_test.bsc + + + + + X64 + $(OutDir)loglog_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)loglog_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)loglog_test.pdb + Console + MachineX64 + + + true + $(IntDir)loglog_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/loglog_test.vcxproj.filters b/msvc10/tests/loglog_test.vcxproj.filters index d19cad577..b7a653230 100644 --- a/msvc10/tests/loglog_test.vcxproj.filters +++ b/msvc10/tests/loglog_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {8bee4727-e23d-4e69-b78c-d921095cba8c} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {8bee4727-e23d-4e69-b78c-d921095cba8c} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/ndc_test.vcxproj b/msvc10/tests/ndc_test.vcxproj index 0bc97045c..d73e6be50 100644 --- a/msvc10/tests/ndc_test.vcxproj +++ b/msvc10/tests/ndc_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)ndc_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)ndc_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)ndc_test.pdb - Console - MachineX86 - - - true - $(IntDir)ndc_test.bsc - - - - - X64 - $(OutDir)ndc_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)ndc_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)ndc_test.pdb - Console - MachineX64 - - - true - $(IntDir)ndc_test.bsc - - - - - $(OutDir)ndc_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)ndc_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)ndc_test.pdb - Console - MachineX86 - - - true - $(IntDir)ndc_test.bsc - - - - - X64 - $(OutDir)ndc_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)ndc_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)ndc_test.pdb - Console - MachineX64 - - - true - $(IntDir)ndc_test.bsc - - - - - $(OutDir)ndc_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)ndc_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)ndc_test.pdb - Console - MachineX86 - - - true - $(IntDir)ndc_test.bsc - - - - - X64 - $(OutDir)ndc_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)ndc_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)ndc_test.pdb - Console - MachineX64 - - - true - $(IntDir)ndc_test.bsc - - - - - $(OutDir)ndc_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)ndc_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)ndc_test.pdb - Console - MachineX86 - - - true - $(IntDir)ndc_test.bsc - - - - - X64 - $(OutDir)ndc_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)ndc_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)ndc_test.pdb - Console - MachineX64 - - - true - $(IntDir)ndc_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)ndc_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)ndc_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)ndc_test.pdb + Console + MachineX86 + + + true + $(IntDir)ndc_test.bsc + + + + + X64 + $(OutDir)ndc_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)ndc_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)ndc_test.pdb + Console + MachineX64 + + + true + $(IntDir)ndc_test.bsc + + + + + $(OutDir)ndc_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)ndc_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)ndc_test.pdb + Console + MachineX86 + + + true + $(IntDir)ndc_test.bsc + + + + + X64 + $(OutDir)ndc_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)ndc_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)ndc_test.pdb + Console + MachineX64 + + + true + $(IntDir)ndc_test.bsc + + + + + $(OutDir)ndc_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)ndc_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)ndc_test.pdb + Console + MachineX86 + + + true + $(IntDir)ndc_test.bsc + + + + + X64 + $(OutDir)ndc_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)ndc_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)ndc_test.pdb + Console + MachineX64 + + + true + $(IntDir)ndc_test.bsc + + + + + $(OutDir)ndc_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)ndc_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)ndc_test.pdb + Console + MachineX86 + + + true + $(IntDir)ndc_test.bsc + + + + + X64 + $(OutDir)ndc_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)ndc_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)ndc_test.pdb + Console + MachineX64 + + + true + $(IntDir)ndc_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/ndc_test.vcxproj.filters b/msvc10/tests/ndc_test.vcxproj.filters index cb6868844..6239a39bf 100644 --- a/msvc10/tests/ndc_test.vcxproj.filters +++ b/msvc10/tests/ndc_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {075adf0f-278c-46f6-94c7-90778c810024} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {075adf0f-278c-46f6-94c7-90778c810024} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/ostream_test.vcxproj b/msvc10/tests/ostream_test.vcxproj index 87f395249..677eca35e 100644 --- a/msvc10/tests/ostream_test.vcxproj +++ b/msvc10/tests/ostream_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {C133DEF0-FAF5-4635-8D5A-2C789B424371} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)ostream_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)ostream_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)ostream_test.pdb - Console - MachineX86 - - - true - $(IntDir)ostream_test.bsc - - - - - X64 - $(OutDir)ostream_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)ostream_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)ostream_test.pdb - Console - MachineX64 - - - true - $(IntDir)ostream_test.bsc - - - - - $(OutDir)ostream_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)ostream_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)ostream_test.pdb - Console - MachineX86 - - - true - $(IntDir)ostream_test.bsc - - - - - X64 - $(OutDir)ostream_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)ostream_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)ostream_test.pdb - Console - MachineX64 - - - true - $(IntDir)ostream_test.bsc - - - - - $(OutDir)ostream_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)ostream_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)ostream_test.pdb - Console - MachineX86 - - - true - $(IntDir)ostream_test.bsc - - - - - X64 - $(OutDir)ostream_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)ostream_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)ostream_test.pdb - Console - MachineX64 - - - true - $(IntDir)ostream_test.bsc - - - - - $(OutDir)ostream_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)ostream_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)ostream_test.pdb - Console - MachineX86 - - - true - $(IntDir)ostream_test.bsc - - - - - X64 - $(OutDir)ostream_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)ostream_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)ostream_test.pdb - Console - MachineX64 - - - true - $(IntDir)ostream_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {C133DEF0-FAF5-4635-8D5A-2C789B424371} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)ostream_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)ostream_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)ostream_test.pdb + Console + MachineX86 + + + true + $(IntDir)ostream_test.bsc + + + + + X64 + $(OutDir)ostream_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)ostream_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)ostream_test.pdb + Console + MachineX64 + + + true + $(IntDir)ostream_test.bsc + + + + + $(OutDir)ostream_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)ostream_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)ostream_test.pdb + Console + MachineX86 + + + true + $(IntDir)ostream_test.bsc + + + + + X64 + $(OutDir)ostream_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)ostream_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)ostream_test.pdb + Console + MachineX64 + + + true + $(IntDir)ostream_test.bsc + + + + + $(OutDir)ostream_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)ostream_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)ostream_test.pdb + Console + MachineX86 + + + true + $(IntDir)ostream_test.bsc + + + + + X64 + $(OutDir)ostream_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)ostream_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)ostream_test.pdb + Console + MachineX64 + + + true + $(IntDir)ostream_test.bsc + + + + + $(OutDir)ostream_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)ostream_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)ostream_test.pdb + Console + MachineX86 + + + true + $(IntDir)ostream_test.bsc + + + + + X64 + $(OutDir)ostream_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)ostream_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)ostream_test.pdb + Console + MachineX64 + + + true + $(IntDir)ostream_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/ostream_test.vcxproj.filters b/msvc10/tests/ostream_test.vcxproj.filters index 69231c402..cbc51c361 100644 --- a/msvc10/tests/ostream_test.vcxproj.filters +++ b/msvc10/tests/ostream_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {3fe898d7-09b6-4e73-9cc5-07aec4ed223c} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {3fe898d7-09b6-4e73-9cc5-07aec4ed223c} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/patternlayout_test.vcxproj b/msvc10/tests/patternlayout_test.vcxproj index 15733026b..59647c7bd 100644 --- a/msvc10/tests/patternlayout_test.vcxproj +++ b/msvc10/tests/patternlayout_test.vcxproj @@ -1,472 +1,472 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508} - patternlayout_test - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - false - false - true - true - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)patternlayout_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)patternlayout_test.pch - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)patternlayout_test.pdb - Console - MachineX86 - - - true - $(IntDir)patternlayout_test.bsc - - - - - X64 - $(OutDir)patternlayout_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)patternlayout_test.pch - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)patternlayout_test.pdb - Console - MachineX64 - - - true - $(IntDir)patternlayout_test.bsc - - - - - $(OutDir)patternlayout_test.tlb - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)patternlayout_test.pch - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)patternlayout_test.pdb - Console - MachineX86 - - - true - $(IntDir)patternlayout_test.bsc - - - - - X64 - $(OutDir)patternlayout_test.tlb - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)patternlayout_test.pch - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)patternlayout_test.pdb - Console - MachineX64 - - - true - $(IntDir)patternlayout_test.bsc - - - - - $(OutDir)patternlayout_test.tlb - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)patternlayout_test.pch - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)patternlayout_test.pdb - Console - MachineX86 - - - true - $(IntDir)patternlayout_test.bsc - - - - - X64 - $(OutDir)patternlayout_test.tlb - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)patternlayout_test.pch - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)patternlayout_test.pdb - Console - MachineX64 - - - true - $(IntDir)patternlayout_test.bsc - - - - - $(OutDir)patternlayout_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)patternlayout_test.pch - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)patternlayout_test.pdb - Console - MachineX86 - - - true - $(IntDir)patternlayout_test.bsc - - - - - X64 - $(OutDir)patternlayout_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)patternlayout_test.pch - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)patternlayout_test.pdb - Console - MachineX64 - - - true - $(IntDir)patternlayout_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508} + patternlayout_test + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + false + false + true + true + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)patternlayout_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)patternlayout_test.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)patternlayout_test.pdb + Console + MachineX86 + + + true + $(IntDir)patternlayout_test.bsc + + + + + X64 + $(OutDir)patternlayout_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)patternlayout_test.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)patternlayout_test.pdb + Console + MachineX64 + + + true + $(IntDir)patternlayout_test.bsc + + + + + $(OutDir)patternlayout_test.tlb + + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)patternlayout_test.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)patternlayout_test.pdb + Console + MachineX86 + + + true + $(IntDir)patternlayout_test.bsc + + + + + X64 + $(OutDir)patternlayout_test.tlb + + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)patternlayout_test.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)patternlayout_test.pdb + Console + MachineX64 + + + true + $(IntDir)patternlayout_test.bsc + + + + + $(OutDir)patternlayout_test.tlb + + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)patternlayout_test.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)patternlayout_test.pdb + Console + MachineX86 + + + true + $(IntDir)patternlayout_test.bsc + + + + + X64 + $(OutDir)patternlayout_test.tlb + + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)patternlayout_test.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)patternlayout_test.pdb + Console + MachineX64 + + + true + $(IntDir)patternlayout_test.bsc + + + + + $(OutDir)patternlayout_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)patternlayout_test.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)patternlayout_test.pdb + Console + MachineX86 + + + true + $(IntDir)patternlayout_test.bsc + + + + + X64 + $(OutDir)patternlayout_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)patternlayout_test.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)patternlayout_test.pdb + Console + MachineX64 + + + true + $(IntDir)patternlayout_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/patternlayout_test.vcxproj.filters b/msvc10/tests/patternlayout_test.vcxproj.filters index 88c56732f..0b8433e8b 100644 --- a/msvc10/tests/patternlayout_test.vcxproj.filters +++ b/msvc10/tests/patternlayout_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {ea7894e1-50e7-4774-a121-c1aba8c3dc54} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {ea7894e1-50e7-4774-a121-c1aba8c3dc54} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/performance_test.vcxproj b/msvc10/tests/performance_test.vcxproj index f3bc9ab6d..0be7c72a6 100644 --- a/msvc10/tests/performance_test.vcxproj +++ b/msvc10/tests/performance_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {94EF9EE0-6E68-4F5F-9174-D09896518894} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)performance_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)performance_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)performance_test.pdb - Console - MachineX86 - - - true - $(IntDir)performance_test.bsc - - - - - X64 - $(OutDir)performance_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)performance_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)performance_test.pdb - Console - MachineX64 - - - true - $(IntDir)performance_test.bsc - - - - - $(OutDir)performance_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)performance_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)performance_test.pdb - Console - MachineX86 - - - true - $(IntDir)performance_test.bsc - - - - - X64 - $(OutDir)performance_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)performance_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)performance_test.pdb - Console - MachineX64 - - - true - $(IntDir)performance_test.bsc - - - - - $(OutDir)performance_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)performance_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)performance_test.pdb - Console - MachineX86 - - - true - $(IntDir)performance_test.bsc - - - - - X64 - $(OutDir)performance_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)performance_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)performance_test.pdb - Console - MachineX64 - - - true - $(IntDir)performance_test.bsc - - - - - $(OutDir)performance_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)performance_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)performance_test.pdb - Console - MachineX86 - - - true - $(IntDir)performance_test.bsc - - - - - X64 - $(OutDir)performance_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)performance_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)performance_test.pdb - Console - MachineX64 - - - true - $(IntDir)performance_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {94EF9EE0-6E68-4F5F-9174-D09896518894} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)performance_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)performance_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)performance_test.pdb + Console + MachineX86 + + + true + $(IntDir)performance_test.bsc + + + + + X64 + $(OutDir)performance_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)performance_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)performance_test.pdb + Console + MachineX64 + + + true + $(IntDir)performance_test.bsc + + + + + $(OutDir)performance_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)performance_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)performance_test.pdb + Console + MachineX86 + + + true + $(IntDir)performance_test.bsc + + + + + X64 + $(OutDir)performance_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)performance_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)performance_test.pdb + Console + MachineX64 + + + true + $(IntDir)performance_test.bsc + + + + + $(OutDir)performance_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)performance_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)performance_test.pdb + Console + MachineX86 + + + true + $(IntDir)performance_test.bsc + + + + + X64 + $(OutDir)performance_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)performance_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)performance_test.pdb + Console + MachineX64 + + + true + $(IntDir)performance_test.bsc + + + + + $(OutDir)performance_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)performance_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)performance_test.pdb + Console + MachineX86 + + + true + $(IntDir)performance_test.bsc + + + + + X64 + $(OutDir)performance_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)performance_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)performance_test.pdb + Console + MachineX64 + + + true + $(IntDir)performance_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/performance_test.vcxproj.filters b/msvc10/tests/performance_test.vcxproj.filters index c882cd479..8f32f8a0d 100644 --- a/msvc10/tests/performance_test.vcxproj.filters +++ b/msvc10/tests/performance_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {a5eab79c-b344-477b-92c9-bc33699a92cc} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {a5eab79c-b344-477b-92c9-bc33699a92cc} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/priority_test.vcxproj b/msvc10/tests/priority_test.vcxproj index 62a4f19a4..e7a2d84fe 100644 --- a/msvc10/tests/priority_test.vcxproj +++ b/msvc10/tests/priority_test.vcxproj @@ -1,481 +1,481 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {CBD762A9-79BC-4AE7-8890-76360F539D76} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)priority_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)priority_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)priority_test.pdb - Console - MachineX86 - - - true - $(IntDir)priority_test.bsc - - - - - X64 - $(OutDir)priority_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)priority_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)priority_test.pdb - Console - MachineX64 - - - true - $(IntDir)priority_test.bsc - - - - - $(OutDir)priority_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)priority_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)priority_test.pdb - Console - MachineX86 - - - true - $(IntDir)priority_test.bsc - - - - - X64 - $(OutDir)priority_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)priority_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)priority_test.pdb - Console - MachineX64 - - - true - $(IntDir)priority_test.bsc - - - - - $(OutDir)priority_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)priority_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)priority_test.pdb - Console - MachineX86 - - - true - $(IntDir)priority_test.bsc - - - - - X64 - $(OutDir)priority_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)priority_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)priority_test.pdb - Console - MachineX64 - - - true - $(IntDir)priority_test.bsc - - - - - $(OutDir)priority_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)priority_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)priority_test.pdb - Console - MachineX86 - - - true - $(IntDir)priority_test.bsc - - - - - X64 - $(OutDir)priority_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)priority_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)priority_test.pdb - Console - MachineX64 - - - true - $(IntDir)priority_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {CBD762A9-79BC-4AE7-8890-76360F539D76} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)priority_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)priority_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)priority_test.pdb + Console + MachineX86 + + + true + $(IntDir)priority_test.bsc + + + + + X64 + $(OutDir)priority_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)priority_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)priority_test.pdb + Console + MachineX64 + + + true + $(IntDir)priority_test.bsc + + + + + $(OutDir)priority_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)priority_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)priority_test.pdb + Console + MachineX86 + + + true + $(IntDir)priority_test.bsc + + + + + X64 + $(OutDir)priority_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)priority_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)priority_test.pdb + Console + MachineX64 + + + true + $(IntDir)priority_test.bsc + + + + + $(OutDir)priority_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)priority_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)priority_test.pdb + Console + MachineX86 + + + true + $(IntDir)priority_test.bsc + + + + + X64 + $(OutDir)priority_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)priority_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)priority_test.pdb + Console + MachineX64 + + + true + $(IntDir)priority_test.bsc + + + + + $(OutDir)priority_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)priority_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)priority_test.pdb + Console + MachineX86 + + + true + $(IntDir)priority_test.bsc + + + + + X64 + $(OutDir)priority_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)priority_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)priority_test.pdb + Console + MachineX64 + + + true + $(IntDir)priority_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/priority_test.vcxproj.filters b/msvc10/tests/priority_test.vcxproj.filters index e1f5b10dc..b2139f156 100644 --- a/msvc10/tests/priority_test.vcxproj.filters +++ b/msvc10/tests/priority_test.vcxproj.filters @@ -1,17 +1,17 @@ - - - - - {67d392e9-34ac-45e1-8c74-95d9236fa5bc} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - - Source Files - - + + + + + {67d392e9-34ac-45e1-8c74-95d9236fa5bc} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/propertyconfig_test.vcxproj b/msvc10/tests/propertyconfig_test.vcxproj index 283121de8..fe8a8eecd 100755 --- a/msvc10/tests/propertyconfig_test.vcxproj +++ b/msvc10/tests/propertyconfig_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {44D4D0A3-FAFA-4134-9806-BCB830594E28} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)propertyconfig_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)propertyconfig_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)propertyconfig_test.pdb - Console - MachineX86 - - - true - $(IntDir)propertyconfig_test.bsc - - - - - X64 - $(OutDir)propertyconfig_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)propertyconfig_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)propertyconfig_test.pdb - Console - MachineX64 - - - true - $(IntDir)propertyconfig_test.bsc - - - - - $(OutDir)propertyconfig_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)propertyconfig_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)propertyconfig_test.pdb - Console - MachineX86 - - - true - $(IntDir)propertyconfig_test.bsc - - - - - X64 - $(OutDir)propertyconfig_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)propertyconfig_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)propertyconfig_test.pdb - Console - MachineX64 - - - true - $(IntDir)propertyconfig_test.bsc - - - - - $(OutDir)propertyconfig_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)propertyconfig_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)propertyconfig_test.pdb - Console - MachineX86 - - - true - $(IntDir)propertyconfig_test.bsc - - - - - X64 - $(OutDir)propertyconfig_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)propertyconfig_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)propertyconfig_test.pdb - Console - MachineX64 - - - true - $(IntDir)propertyconfig_test.bsc - - - - - $(OutDir)propertyconfig_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)propertyconfig_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)propertyconfig_test.pdb - Console - MachineX86 - - - true - $(IntDir)propertyconfig_test.bsc - - - - - X64 - $(OutDir)propertyconfig_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)propertyconfig_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)propertyconfig_test.pdb - Console - MachineX64 - - - true - $(IntDir)propertyconfig_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {44D4D0A3-FAFA-4134-9806-BCB830594E28} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)propertyconfig_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)propertyconfig_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)propertyconfig_test.pdb + Console + MachineX86 + + + true + $(IntDir)propertyconfig_test.bsc + + + + + X64 + $(OutDir)propertyconfig_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)propertyconfig_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)propertyconfig_test.pdb + Console + MachineX64 + + + true + $(IntDir)propertyconfig_test.bsc + + + + + $(OutDir)propertyconfig_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)propertyconfig_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)propertyconfig_test.pdb + Console + MachineX86 + + + true + $(IntDir)propertyconfig_test.bsc + + + + + X64 + $(OutDir)propertyconfig_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)propertyconfig_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)propertyconfig_test.pdb + Console + MachineX64 + + + true + $(IntDir)propertyconfig_test.bsc + + + + + $(OutDir)propertyconfig_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)propertyconfig_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)propertyconfig_test.pdb + Console + MachineX86 + + + true + $(IntDir)propertyconfig_test.bsc + + + + + X64 + $(OutDir)propertyconfig_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)propertyconfig_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)propertyconfig_test.pdb + Console + MachineX64 + + + true + $(IntDir)propertyconfig_test.bsc + + + + + $(OutDir)propertyconfig_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)propertyconfig_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)propertyconfig_test.pdb + Console + MachineX86 + + + true + $(IntDir)propertyconfig_test.bsc + + + + + X64 + $(OutDir)propertyconfig_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)propertyconfig_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)propertyconfig_test.pdb + Console + MachineX64 + + + true + $(IntDir)propertyconfig_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/propertyconfig_test.vcxproj.filters b/msvc10/tests/propertyconfig_test.vcxproj.filters index 67cef8e30..4e36eac10 100755 --- a/msvc10/tests/propertyconfig_test.vcxproj.filters +++ b/msvc10/tests/propertyconfig_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {34631475-FC1B-4856-9E3F-95323D5701B7} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {34631475-FC1B-4856-9E3F-95323D5701B7} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/socket_test.vcxproj b/msvc10/tests/socket_test.vcxproj index 58d18019b..91f65228c 100644 --- a/msvc10/tests/socket_test.vcxproj +++ b/msvc10/tests/socket_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {D405C4A0-D62F-4EE7-96D2-76AD808C7319} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - false - false - true - true - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)socket_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)socket_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)socket_test.pdb - Console - MachineX86 - - - true - $(IntDir)socket_test.bsc - - - - - X64 - $(OutDir)socket_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)socket_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)socket_test.pdb - Console - MachineX64 - - - true - $(IntDir)socket_test.bsc - - - - - $(OutDir)socket_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)socket_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)socket_test.pdb - Console - MachineX86 - - - true - $(IntDir)socket_test.bsc - - - - - X64 - $(OutDir)socket_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)socket_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)socket_test.pdb - Console - MachineX64 - - - true - $(IntDir)socket_test.bsc - - - - - $(OutDir)socket_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)socket_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)socket_test.pdb - Console - MachineX86 - - - true - $(IntDir)socket_test.bsc - - - - - X64 - $(OutDir)socket_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)socket_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)socket_test.pdb - Console - MachineX64 - - - true - $(IntDir)socket_test.bsc - - - - - $(OutDir)socket_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)socket_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)socket_test.pdb - Console - MachineX86 - - - true - $(IntDir)socket_test.bsc - - - - - X64 - $(OutDir)socket_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)socket_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)socket_test.pdb - Console - MachineX64 - - - true - $(IntDir)socket_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {D405C4A0-D62F-4EE7-96D2-76AD808C7319} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + false + false + true + true + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)socket_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)socket_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)socket_test.pdb + Console + MachineX86 + + + true + $(IntDir)socket_test.bsc + + + + + X64 + $(OutDir)socket_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)socket_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)socket_test.pdb + Console + MachineX64 + + + true + $(IntDir)socket_test.bsc + + + + + $(OutDir)socket_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)socket_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)socket_test.pdb + Console + MachineX86 + + + true + $(IntDir)socket_test.bsc + + + + + X64 + $(OutDir)socket_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)socket_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)socket_test.pdb + Console + MachineX64 + + + true + $(IntDir)socket_test.bsc + + + + + $(OutDir)socket_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)socket_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)socket_test.pdb + Console + MachineX86 + + + true + $(IntDir)socket_test.bsc + + + + + X64 + $(OutDir)socket_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)socket_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)socket_test.pdb + Console + MachineX64 + + + true + $(IntDir)socket_test.bsc + + + + + $(OutDir)socket_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)socket_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)socket_test.pdb + Console + MachineX86 + + + true + $(IntDir)socket_test.bsc + + + + + X64 + $(OutDir)socket_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)socket_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)socket_test.pdb + Console + MachineX64 + + + true + $(IntDir)socket_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/socket_test.vcxproj.filters b/msvc10/tests/socket_test.vcxproj.filters index 73117a50a..fe3cbbcdd 100644 --- a/msvc10/tests/socket_test.vcxproj.filters +++ b/msvc10/tests/socket_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {e70368a7-53a0-4f2c-90cb-856e304783b0} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {e70368a7-53a0-4f2c-90cb-856e304783b0} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/thread_test.vcxproj b/msvc10/tests/thread_test.vcxproj index 74e5c4621..7f52d1a70 100644 --- a/msvc10/tests/thread_test.vcxproj +++ b/msvc10/tests/thread_test.vcxproj @@ -1,463 +1,463 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)thread_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)thread_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)thread_test.pdb - Console - MachineX86 - - - true - $(IntDir)thread_test.bsc - - - - - X64 - $(OutDir)thread_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)thread_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)thread_test.pdb - Console - MachineX64 - - - true - $(IntDir)thread_test.bsc - - - - - $(OutDir)thread_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)thread_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)thread_test.pdb - Console - MachineX86 - - - true - $(IntDir)thread_test.bsc - - - - - X64 - $(OutDir)thread_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)thread_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)thread_test.pdb - Console - MachineX64 - - - true - $(IntDir)thread_test.bsc - - - - - $(OutDir)thread_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)thread_test.pch - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)thread_test.pdb - Console - MachineX86 - - - true - $(IntDir)thread_test.bsc - - - - - X64 - $(OutDir)thread_test.tlb - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)thread_test.pch - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)thread_test.pdb - Console - MachineX64 - - - true - $(IntDir)thread_test.bsc - - - - - $(OutDir)thread_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)thread_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)thread_test.pdb - Console - MachineX86 - - - true - $(IntDir)thread_test.bsc - - - - - X64 - $(OutDir)thread_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)thread_test.pch - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)thread_test.pdb - Console - MachineX64 - - - true - $(IntDir)thread_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)thread_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)thread_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)thread_test.pdb + Console + MachineX86 + + + true + $(IntDir)thread_test.bsc + + + + + X64 + $(OutDir)thread_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)thread_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)thread_test.pdb + Console + MachineX64 + + + true + $(IntDir)thread_test.bsc + + + + + $(OutDir)thread_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)thread_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)thread_test.pdb + Console + MachineX86 + + + true + $(IntDir)thread_test.bsc + + + + + X64 + $(OutDir)thread_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)thread_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)thread_test.pdb + Console + MachineX64 + + + true + $(IntDir)thread_test.bsc + + + + + $(OutDir)thread_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)thread_test.pch + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)thread_test.pdb + Console + MachineX86 + + + true + $(IntDir)thread_test.bsc + + + + + X64 + $(OutDir)thread_test.tlb + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)thread_test.pch + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)thread_test.pdb + Console + MachineX64 + + + true + $(IntDir)thread_test.bsc + + + + + $(OutDir)thread_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)thread_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)thread_test.pdb + Console + MachineX86 + + + true + $(IntDir)thread_test.bsc + + + + + X64 + $(OutDir)thread_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)thread_test.pch + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)thread_test.pdb + Console + MachineX64 + + + true + $(IntDir)thread_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/thread_test.vcxproj.filters b/msvc10/tests/thread_test.vcxproj.filters index a1a134058..65bb835c5 100644 --- a/msvc10/tests/thread_test.vcxproj.filters +++ b/msvc10/tests/thread_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {a457e09c-4ed8-402a-8a23-706d67b89295} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {a457e09c-4ed8-402a-8a23-706d67b89295} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/msvc10/tests/timeformat_test.vcxproj b/msvc10/tests/timeformat_test.vcxproj index a9eb60877..5f7af317b 100644 --- a/msvc10/tests/timeformat_test.vcxproj +++ b/msvc10/tests/timeformat_test.vcxproj @@ -1,471 +1,471 @@ - - - - - Debug_Unicode - Win32 - - - Debug_Unicode - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Unicode - Win32 - - - Release_Unicode - x64 - - - Release - Win32 - - - Release - x64 - - - - {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B} - - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - Unicode - true - - - Application - false - Unicode - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - true - true - false - false - true - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - $(OutDir)timeformat_test.tlb - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)timeformat_test.pch - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)timeformat_test.pdb - Console - MachineX86 - - - true - $(IntDir)timeformat_test.bsc - - - - - X64 - $(OutDir)timeformat_test.tlb - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)timeformat_test.pch - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusd.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)timeformat_test.pdb - Console - MachineX64 - - - true - $(IntDir)timeformat_test.bsc - - - - - $(OutDir)timeformat_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)timeformat_test.pch - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)timeformat_test.pdb - Console - MachineX86 - - - true - $(IntDir)timeformat_test.bsc - - - - - X64 - $(OutDir)timeformat_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)timeformat_test.pch - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplus.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)timeformat_test.pdb - Console - MachineX64 - - - true - $(IntDir)timeformat_test.bsc - - - - - $(OutDir)timeformat_test.tlb - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)timeformat_test.pch - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)timeformat_test.pdb - Console - MachineX86 - - - true - $(IntDir)timeformat_test.bsc - - - - - X64 - $(OutDir)timeformat_test.tlb - - - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)timeformat_test.pch - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusud.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - true - $(OutDir)timeformat_test.pdb - Console - MachineX64 - - - true - $(IntDir)timeformat_test.bsc - - - - - $(OutDir)timeformat_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)timeformat_test.pch - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)timeformat_test.pdb - Console - MachineX86 - - - true - $(IntDir)timeformat_test.bsc - - - - - X64 - $(OutDir)timeformat_test.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)timeformat_test.pch - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - log4cplusu.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) - $(OutDir)timeformat_test.pdb - Console - MachineX64 - - - true - $(IntDir)timeformat_test.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - {917836a4-0ddc-47be-b930-1b3bfdf6c940} - false - - - - - + + + + + Debug_Unicode + Win32 + + + Debug_Unicode + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_Unicode + Win32 + + + Release_Unicode + x64 + + + Release + Win32 + + + Release + x64 + + + + {7EFABA06-71CD-498F-BF10-C41A7D2DCF3B} + + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + Unicode + true + + + Application + false + Unicode + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + true + false + false + true + true + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + $(OutDir)timeformat_test.tlb + + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)timeformat_test.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)timeformat_test.pdb + Console + MachineX86 + + + true + $(IntDir)timeformat_test.bsc + + + + + X64 + $(OutDir)timeformat_test.tlb + + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)timeformat_test.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusd.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)timeformat_test.pdb + Console + MachineX64 + + + true + $(IntDir)timeformat_test.bsc + + + + + $(OutDir)timeformat_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)timeformat_test.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)timeformat_test.pdb + Console + MachineX86 + + + true + $(IntDir)timeformat_test.bsc + + + + + X64 + $(OutDir)timeformat_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)timeformat_test.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplus.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)timeformat_test.pdb + Console + MachineX64 + + + true + $(IntDir)timeformat_test.bsc + + + + + $(OutDir)timeformat_test.tlb + + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)timeformat_test.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)timeformat_test.pdb + Console + MachineX86 + + + true + $(IntDir)timeformat_test.bsc + + + + + X64 + $(OutDir)timeformat_test.tlb + + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)timeformat_test.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusud.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + true + $(OutDir)timeformat_test.pdb + Console + MachineX64 + + + true + $(IntDir)timeformat_test.bsc + + + + + $(OutDir)timeformat_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)timeformat_test.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)timeformat_test.pdb + Console + MachineX86 + + + true + $(IntDir)timeformat_test.bsc + + + + + X64 + $(OutDir)timeformat_test.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + $(IntDir)timeformat_test.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + log4cplusu.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + $(OutDir)timeformat_test.pdb + Console + MachineX64 + + + true + $(IntDir)timeformat_test.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + {917836a4-0ddc-47be-b930-1b3bfdf6c940} + false + + + + + \ No newline at end of file diff --git a/msvc10/tests/timeformat_test.vcxproj.filters b/msvc10/tests/timeformat_test.vcxproj.filters index de2386637..c7211f484 100644 --- a/msvc10/tests/timeformat_test.vcxproj.filters +++ b/msvc10/tests/timeformat_test.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {98660f6a-7434-46af-8fb0-0f533de1c647} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - + + + + + {98660f6a-7434-46af-8fb0-0f533de1c647} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + \ No newline at end of file diff --git a/scripts/clean_cmake_files.bat b/scripts/clean_cmake_files.bat index 75b0b7235..3d84faf3d 100755 --- a/scripts/clean_cmake_files.bat +++ b/scripts/clean_cmake_files.bat @@ -1,21 +1,21 @@ - -REM Make changes to environment local -setlocal - -SET RMDIR=rmdir /S /Q -SET DEL=del /Q - -%RMDIR% CMakeFiles -%RMDIR% debug -%RMDIR% log4cplus.dir -%RMDIR% loggingserver.dir -%RMDIR% minsizerel -%RMDIR% release -%RMDIR% relwithdebinfo -%RMDIR% ZERO_CHECK.dir - -%DEL% cmake_install.cmake -%DEL% CMakeCache.txt - -REM Clean up changes to environment. -endlocal + +REM Make changes to environment local +setlocal + +SET RMDIR=rmdir /S /Q +SET DEL=del /Q + +%RMDIR% CMakeFiles +%RMDIR% debug +%RMDIR% log4cplus.dir +%RMDIR% loggingserver.dir +%RMDIR% minsizerel +%RMDIR% release +%RMDIR% relwithdebinfo +%RMDIR% ZERO_CHECK.dir + +%DEL% cmake_install.cmake +%DEL% CMakeCache.txt + +REM Clean up changes to environment. +endlocal diff --git a/scripts/msvc10_to_msvc11.cmd b/scripts/msvc10_to_msvc11.cmd index a73633c2c..9c04a098a 100755 --- a/scripts/msvc10_to_msvc11.cmd +++ b/scripts/msvc10_to_msvc11.cmd @@ -1,34 +1,34 @@ -@echo on -setlocal -set "THIS_SCRIPT_FILE=%~nx0" - -if "%1" == "" ( - echo. - echo USAGE: %THIS_SCRIPT_FILE% log4cplus.sln - echo. - exit /b 1 -) - -if not defined VS110COMNTOOLS ( - echo. - echo VS110COMNTOOLS environment variable is not defined - echo. - exit /b 2 -) - -set "SLN_PATH=%~f1" -set "SLN_BASE_DIR=%~dp1" -set "SLN_FILE_NAME=%~nx1" -set "MSVC11_BASE_DIR=%SLN_BASE_DIR%\..\msvc11" - -rmdir /S /Q "%MSVC11_BASE_DIR%" -mkdir "%MSVC11_BASE_DIR%" -xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\*.*" "%MSVC11_BASE_DIR%" -xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\tests\*.*" "%MSVC11_BASE_DIR%\tests" - -call "%VS110COMNTOOLS%\..\IDE\devenv.com" "%MSVC11_BASE_DIR%\%SLN_FILE_NAME%" /Upgrade - -start "Migration log" "%MSVC11_BASE_DIR%\UpgradeLog.htm" - -endlocal - +@echo on +setlocal +set "THIS_SCRIPT_FILE=%~nx0" + +if "%1" == "" ( + echo. + echo USAGE: %THIS_SCRIPT_FILE% log4cplus.sln + echo. + exit /b 1 +) + +if not defined VS110COMNTOOLS ( + echo. + echo VS110COMNTOOLS environment variable is not defined + echo. + exit /b 2 +) + +set "SLN_PATH=%~f1" +set "SLN_BASE_DIR=%~dp1" +set "SLN_FILE_NAME=%~nx1" +set "MSVC11_BASE_DIR=%SLN_BASE_DIR%\..\msvc11" + +rmdir /S /Q "%MSVC11_BASE_DIR%" +mkdir "%MSVC11_BASE_DIR%" +xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\*.*" "%MSVC11_BASE_DIR%" +xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\tests\*.*" "%MSVC11_BASE_DIR%\tests" + +call "%VS110COMNTOOLS%\..\IDE\devenv.com" "%MSVC11_BASE_DIR%\%SLN_FILE_NAME%" /Upgrade + +start "Migration log" "%MSVC11_BASE_DIR%\UpgradeLog.htm" + +endlocal + diff --git a/scripts/msvc10_to_msvc12.cmd b/scripts/msvc10_to_msvc12.cmd index 4d2d04398..080172a17 100755 --- a/scripts/msvc10_to_msvc12.cmd +++ b/scripts/msvc10_to_msvc12.cmd @@ -1,34 +1,34 @@ -@echo on -setlocal -set "THIS_SCRIPT_FILE=%~nx0" - -if "%1" == "" ( - echo. - echo USAGE: %THIS_SCRIPT_FILE% log4cplus.sln - echo. - exit /b 1 -) - -if not defined VS120COMNTOOLS ( - echo. - echo VS120COMNTOOLS environment variable is not defined - echo. - exit /b 2 -) - -set "SLN_PATH=%~f1" -set "SLN_BASE_DIR=%~dp1" -set "SLN_FILE_NAME=%~nx1" -set "MSVC12_BASE_DIR=%SLN_BASE_DIR%\..\msvc12" - -rmdir /S /Q "%MSVC12_BASE_DIR%" -mkdir "%MSVC12_BASE_DIR%" -xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\*.*" "%MSVC12_BASE_DIR%" -xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\tests\*.*" "%MSVC12_BASE_DIR%\tests" - -call "%VS120COMNTOOLS%\..\IDE\devenv.com" "%MSVC12_BASE_DIR%\%SLN_FILE_NAME%" /Upgrade - -start "Migration log" "%MSVC12_BASE_DIR%\UpgradeLog.htm" - -endlocal - +@echo on +setlocal +set "THIS_SCRIPT_FILE=%~nx0" + +if "%1" == "" ( + echo. + echo USAGE: %THIS_SCRIPT_FILE% log4cplus.sln + echo. + exit /b 1 +) + +if not defined VS120COMNTOOLS ( + echo. + echo VS120COMNTOOLS environment variable is not defined + echo. + exit /b 2 +) + +set "SLN_PATH=%~f1" +set "SLN_BASE_DIR=%~dp1" +set "SLN_FILE_NAME=%~nx1" +set "MSVC12_BASE_DIR=%SLN_BASE_DIR%\..\msvc12" + +rmdir /S /Q "%MSVC12_BASE_DIR%" +mkdir "%MSVC12_BASE_DIR%" +xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\*.*" "%MSVC12_BASE_DIR%" +xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\tests\*.*" "%MSVC12_BASE_DIR%\tests" + +call "%VS120COMNTOOLS%\..\IDE\devenv.com" "%MSVC12_BASE_DIR%\%SLN_FILE_NAME%" /Upgrade + +start "Migration log" "%MSVC12_BASE_DIR%\UpgradeLog.htm" + +endlocal + From cfdd4b33e725d37f51c8521bc922edd68528d38f Mon Sep 17 00:00:00 2001 From: Alexey Morozov Date: Wed, 28 Oct 2015 12:30:57 +0600 Subject: [PATCH 090/165] Some whitespaces cleared --- src/configurator.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/configurator.cxx b/src/configurator.cxx index 0e79f177b..8dd61b6b5 100644 --- a/src/configurator.cxx +++ b/src/configurator.cxx @@ -140,7 +140,7 @@ namespace dest = val; return false; } - + key.assign (pattern, var_start + DELIM_START_LEN, var_end - (var_start + DELIM_START_LEN)); replacement.clear (); @@ -148,7 +148,7 @@ namespace replacement = props.getProperty (key); if (! shadow_env || (! empty_vars && replacement.empty ())) internal::get_env_var (replacement, key); - + if (empty_vars || ! replacement.empty ()) { // Substitute the variable with its value in place. @@ -340,7 +340,7 @@ PropertyConfigurator::replaceEnvironVariables() = !! (flags & PropertyConfigurator::fRecursiveExpansion); bool changed; - do + do { changed = false; properties.propertyNames().swap (keys); @@ -461,7 +461,7 @@ PropertyConfigurator::configureAppenders() if( it->find( LOG4CPLUS_TEXT('.') ) == tstring::npos ) { factoryName = appenderProperties.getProperty(*it); - spi::AppenderFactory* factory + spi::AppenderFactory* factory = spi::getAppenderFactoryRegistry().get(factoryName); if (! factory) { @@ -586,7 +586,7 @@ BasicConfigurator::doConfigure(Hierarchy& h, bool logToStdErr) // ConfigurationWatchDogThread implementation ////////////////////////////////////////////////////////////////////////////// -class ConfigurationWatchDogThread +class ConfigurationWatchDogThread : public thread::AbstractThread, public PropertyConfigurator { @@ -606,7 +606,7 @@ class ConfigurationWatchDogThread virtual ~ConfigurationWatchDogThread () { } - + void terminate () { shouldTerminate.signal (); @@ -617,10 +617,10 @@ class ConfigurationWatchDogThread virtual void run(); virtual Logger getLogger(const tstring& name); virtual void addAppender(Logger &logger, SharedAppenderPtr& appender); - + bool checkForFileModification(); void updateLastModInfo(); - + private: ConfigurationWatchDogThread (ConfigurationWatchDogThread const &); ConfigurationWatchDogThread & operator = ( From 97dc8bc94f2f961703648c90dde677f45e61c664 Mon Sep 17 00:00:00 2001 From: Alexey Morozov Date: Mon, 30 Nov 2015 16:34:11 +0600 Subject: [PATCH 091/165] 'RollOnClose' property is introduced to be able to disable log rotation upon shutdown By default the property is set to true for compatibility purposes. This resolves github issue #120 --- include/log4cplus/fileappender.h | 10 +++++++++- src/fileappender.cxx | 12 ++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/include/log4cplus/fileappender.h b/include/log4cplus/fileappender.h index 54bf922ec..dd215ae69 100644 --- a/include/log4cplus/fileappender.h +++ b/include/log4cplus/fileappender.h @@ -285,6 +285,12 @@ namespace log4cplus * single logging period; e.g. how many log.2009-11-07.1, * log.2009-11-07.2 etc. files are kept. * + *
RollOnClose
+ *
This property specifies whether to rollover log files upon + * shutdown. By default it's set to true to retain compatibility + * with legacy code, however it may lead to undesired behaviour + * as described in the github issue #120.
+ * * */ class LOG4CPLUS_EXPORT DailyRollingFileAppender : public FileAppender { @@ -294,7 +300,8 @@ namespace log4cplus DailyRollingFileSchedule schedule = DAILY, bool immediateFlush = true, int maxBackupIndex = 10, - bool createDirs = false); + bool createDirs = false, + bool rollOnClose = true); DailyRollingFileAppender(const log4cplus::helpers::Properties& properties); // Dtor @@ -314,6 +321,7 @@ namespace log4cplus log4cplus::tstring scheduledFilename; log4cplus::helpers::Time nextRolloverTime; int maxBackupIndex; + bool rollOnClose; private: LOG4CPLUS_PRIVATE void init(DailyRollingFileSchedule schedule); diff --git a/src/fileappender.cxx b/src/fileappender.cxx index b610f7622..d6c5d1e1d 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -632,9 +632,10 @@ RollingFileAppender::rollover(bool alreadyLocked) DailyRollingFileAppender::DailyRollingFileAppender( const tstring& filename_, DailyRollingFileSchedule schedule_, - bool immediateFlush_, int maxBackupIndex_, bool createDirs_) + bool immediateFlush_, int maxBackupIndex_, bool createDirs_, + bool rollOnClose_) : FileAppender(filename_, std::ios_base::app, immediateFlush_, createDirs_) - , maxBackupIndex(maxBackupIndex_) + , maxBackupIndex(maxBackupIndex_), rollOnClose(rollOnClose_) { init(schedule_); } @@ -645,6 +646,7 @@ DailyRollingFileAppender::DailyRollingFileAppender( const Properties& properties) : FileAppender(properties, std::ios_base::app) , maxBackupIndex(10) + , rollOnClose(true) { DailyRollingFileSchedule theSchedule = DAILY; tstring scheduleStr (helpers::toUpper ( @@ -669,7 +671,8 @@ DailyRollingFileAppender::DailyRollingFileAppender( + properties.getProperty(LOG4CPLUS_TEXT("Schedule"))); theSchedule = DAILY; } - + + properties.getBool (rollOnClose, LOG4CPLUS_TEXT("RollOnClose")); properties.getInt (maxBackupIndex, LOG4CPLUS_TEXT("MaxBackupIndex")); init(theSchedule); @@ -773,7 +776,8 @@ DailyRollingFileAppender::~DailyRollingFileAppender() void DailyRollingFileAppender::close() { - rollover(); + if (rollOnClose) + rollover(); FileAppender::close(); } From 68c2805b43bc520234da32ddbc2b1df0997f4d37 Mon Sep 17 00:00:00 2001 From: Alexey Morozov Date: Mon, 30 Nov 2015 17:56:32 +0600 Subject: [PATCH 092/165] 'RollOnClose' property for TimeBasedRollingFileAppender is implemented All the considerations for DailyRollingFileAppender are applicable to TimeBasedRollingFileAppender too. Issue-Fix: #120 --- include/log4cplus/fileappender.h | 10 +++++++++- src/fileappender.cxx | 9 +++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/log4cplus/fileappender.h b/include/log4cplus/fileappender.h index dd215ae69..d0feec8e6 100644 --- a/include/log4cplus/fileappender.h +++ b/include/log4cplus/fileappender.h @@ -357,6 +357,12 @@ namespace log4cplus *
If set to true, archive removal will be executed on appender start * up. By default this property is set to false.
* + *
RollOnClose
+ *
This property specifies whether to rollover log files upon + * shutdown. By default it's set to true to retain compatibility + * with legacy code, however it may lead to undesired behaviour + * as described in the github issue #120.
+ * * */ class LOG4CPLUS_EXPORT TimeBasedRollingFileAppender : public FileAppenderBase { @@ -367,7 +373,8 @@ namespace log4cplus int maxHistory = 10, bool cleanHistoryOnStart = false, bool immediateFlush = true, - bool createDirs = false); + bool createDirs = false, + bool rollOnClose = true); TimeBasedRollingFileAppender(const helpers::Properties& properties); // Dtor @@ -390,6 +397,7 @@ namespace log4cplus bool cleanHistoryOnStart; helpers::Time lastHeartBeat; helpers::Time nextRolloverTime; + bool rollOnClose; private: LOG4CPLUS_PRIVATE void init(); diff --git a/src/fileappender.cxx b/src/fileappender.cxx index d6c5d1e1d..41eaef437 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -1159,12 +1159,14 @@ TimeBasedRollingFileAppender::TimeBasedRollingFileAppender( int maxHistory_, bool cleanHistoryOnStart_, bool immediateFlush_, - bool createDirs_) + bool createDirs_, + bool rollOnClose_) : FileAppenderBase(filename_, std::ios_base::app, immediateFlush_, createDirs_) , filenamePattern(filenamePattern_) , schedule(DAILY) , maxHistory(maxHistory_) , cleanHistoryOnStart(cleanHistoryOnStart_) + , rollOnClose(rollOnClose_) { } TimeBasedRollingFileAppender::TimeBasedRollingFileAppender( @@ -1174,10 +1176,12 @@ TimeBasedRollingFileAppender::TimeBasedRollingFileAppender( , schedule(DAILY) , maxHistory(10) , cleanHistoryOnStart(false) + , rollOnClose(true) { filenamePattern = properties.getProperty(LOG4CPLUS_TEXT("FilenamePattern")); properties.getInt(maxHistory, LOG4CPLUS_TEXT("MaxHistory")); properties.getBool(cleanHistoryOnStart, LOG4CPLUS_TEXT("CleanHistoryOnStart")); + properties.getBool(rollOnClose, LOG4CPLUS_TEXT("RollOnClose")); filenamePattern = preprocessFilenamePattern(filenamePattern, schedule); init(); @@ -1245,7 +1249,8 @@ TimeBasedRollingFileAppender::open(std::ios_base::openmode mode) void TimeBasedRollingFileAppender::close() { - rollover(); + if (rollOnClose) + rollover(); FileAppenderBase::close(); } From e88885b8aef7842567d9cef9d2ce43fba92783f2 Mon Sep 17 00:00:00 2001 From: Alexey Morozov Date: Mon, 30 Nov 2015 13:44:43 +0600 Subject: [PATCH 093/165] Added property "DatePattern" to DailyRollingFileAppender settings The property controls the suffix of the backup files name. Previously the suffix has been formed internally based on the schedule type. This behavior is left intact if the property isn't specified. Although this option is named after the corresponding property of the corresponding class in Log4J, their meanings are slightly different. In Log4J's DailyRollingFileAppender this option also specifies the schedule much like `FilenamePattern` in Log4Cplus' `TimeBasedRollingFileAppender`. Log4CPlus' `DailyRollingFileAppender` uses a separate `Schedule` option, so `DatePattern` is used only to form backup file names. --- include/log4cplus/fileappender.h | 13 ++++++- src/fileappender.cxx | 59 +++++++++++++++++--------------- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/include/log4cplus/fileappender.h b/include/log4cplus/fileappender.h index d0feec8e6..23df4411d 100644 --- a/include/log4cplus/fileappender.h +++ b/include/log4cplus/fileappender.h @@ -291,6 +291,15 @@ namespace log4cplus * with legacy code, however it may lead to undesired behaviour * as described in the github issue #120. * + *
DatePattern
+ *
This property specifies filename suffix pattern to use for + * periodical backups of the logfile. The patern should be in + * format supported by {@link log4cplus::helpers::Time::getFormatterTime()}. + * Please notice that the format of the pattern is similar but not identical + * to the one used for this option in the corresponding Log4J class. + * If the property isn't specified a reasonable default for a given + * schedule type is used.
+ * * */ class LOG4CPLUS_EXPORT DailyRollingFileAppender : public FileAppender { @@ -301,7 +310,8 @@ namespace log4cplus bool immediateFlush = true, int maxBackupIndex = 10, bool createDirs = false, - bool rollOnClose = true); + bool rollOnClose = true, + const log4cplus::tstring& datePattern = log4cplus::tstring()); DailyRollingFileAppender(const log4cplus::helpers::Properties& properties); // Dtor @@ -322,6 +332,7 @@ namespace log4cplus log4cplus::helpers::Time nextRolloverTime; int maxBackupIndex; bool rollOnClose; + log4cplus::tstring datePattern; private: LOG4CPLUS_PRIVATE void init(DailyRollingFileSchedule schedule); diff --git a/src/fileappender.cxx b/src/fileappender.cxx index 41eaef437..d16df3e9d 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -633,9 +633,10 @@ RollingFileAppender::rollover(bool alreadyLocked) DailyRollingFileAppender::DailyRollingFileAppender( const tstring& filename_, DailyRollingFileSchedule schedule_, bool immediateFlush_, int maxBackupIndex_, bool createDirs_, - bool rollOnClose_) + bool rollOnClose_, const tstring& datePattern_) : FileAppender(filename_, std::ios_base::app, immediateFlush_, createDirs_) , maxBackupIndex(maxBackupIndex_), rollOnClose(rollOnClose_) + , datePattern(datePattern_) { init(schedule_); } @@ -673,6 +674,7 @@ DailyRollingFileAppender::DailyRollingFileAppender( } properties.getBool (rollOnClose, LOG4CPLUS_TEXT("RollOnClose")); + properties.getString (datePattern, LOG4CPLUS_TEXT("DatePattern")); properties.getInt (maxBackupIndex, LOG4CPLUS_TEXT("MaxBackupIndex")); init(theSchedule); @@ -933,38 +935,41 @@ tstring DailyRollingFileAppender::getFilename(const Time& t) const { tchar const * pattern = 0; - switch (schedule) - { - case MONTHLY: - pattern = LOG4CPLUS_TEXT("%Y-%m"); - break; + if (datePattern.empty()) { + switch (schedule) + { + case MONTHLY: + pattern = LOG4CPLUS_TEXT("%Y-%m"); + break; - case WEEKLY: - pattern = LOG4CPLUS_TEXT("%Y-%W"); - break; + case WEEKLY: + pattern = LOG4CPLUS_TEXT("%Y-%W"); + break; - default: - helpers::getLogLog ().error ( - LOG4CPLUS_TEXT ("DailyRollingFileAppender::getFilename()-") - LOG4CPLUS_TEXT (" invalid schedule value")); - // Fall through. + default: + helpers::getLogLog ().error ( + LOG4CPLUS_TEXT ("DailyRollingFileAppender::getFilename()-") + LOG4CPLUS_TEXT (" invalid schedule value")); + // Fall through. - case DAILY: - pattern = LOG4CPLUS_TEXT("%Y-%m-%d"); - break; + case DAILY: + pattern = LOG4CPLUS_TEXT("%Y-%m-%d"); + break; - case TWICE_DAILY: - pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%p"); - break; + case TWICE_DAILY: + pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%p"); + break; - case HOURLY: - pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%H"); - break; + case HOURLY: + pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%H"); + break; - case MINUTELY: - pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%H-%M"); - break; - }; + case MINUTELY: + pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%H-%M"); + break; + }; + } else + pattern = datePattern.c_str(); tstring result (filename); result += LOG4CPLUS_TEXT("."); From 968534d424a29fdb24e75a2b81f0a469d51bc2af Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 7 Dec 2015 15:33:45 +0100 Subject: [PATCH 094/165] Small whitespace and formatting fixes. --- src/fileappender.cxx | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index d16df3e9d..b7fd968a4 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -69,7 +69,7 @@ namespace long const LOG4CPLUS_FILE_NOT_FOUND = ENOENT; -static +static long file_rename (tstring const & src, tstring const & target) { @@ -118,8 +118,8 @@ loglog_renaming_result (helpers::LogLog & loglog, tstring const & src, if (ret == 0) { loglog.debug ( - LOG4CPLUS_TEXT("Renamed file ") - + src + LOG4CPLUS_TEXT("Renamed file ") + + src + LOG4CPLUS_TEXT(" to ") + target); } @@ -145,7 +145,7 @@ loglog_opening_result (helpers::LogLog & loglog, if (! os) { loglog.error ( - LOG4CPLUS_TEXT("Failed to open file ") + LOG4CPLUS_TEXT("Failed to open file ") + filename); } } @@ -342,11 +342,11 @@ FileAppenderBase::append(const spi::InternalLoggingEvent& event) { if(!out.good()) { if(!reopen()) { - getErrorHandler()->error( LOG4CPLUS_TEXT("file is not open: ") + getErrorHandler()->error( LOG4CPLUS_TEXT("file is not open: ") + filename); return; } - // Resets the error handler to make it + // Resets the error handler to make it // ready to handle a future append error. else getErrorHandler()->reset(); @@ -557,7 +557,7 @@ RollingFileAppender::rollover(bool alreadyLocked) out.close(); // Reset flags since the C++ standard specified that all the flags // should remain unchanged on a close. - out.clear(); + out.clear(); if (useLockFile) { @@ -608,8 +608,8 @@ RollingFileAppender::rollover(bool alreadyLocked) #endif loglog.debug ( - LOG4CPLUS_TEXT("Renaming file ") - + filename + LOG4CPLUS_TEXT("Renaming file ") + + filename + LOG4CPLUS_TEXT(" to ") + target); ret = file_rename (filename, target); @@ -856,12 +856,12 @@ DailyRollingFileAppender::rollover(bool alreadyLocked) // possible to rename over existing file, e.g. "log.2009-11-07". ret = file_remove (scheduledFilename); #endif - + // Rename filename to scheduledFilename, // e.g. rename "log" to "log.2009-11-07". loglog.debug( LOG4CPLUS_TEXT("Renaming file ") - + filename + + filename + LOG4CPLUS_TEXT(" to ") + scheduledFilename); ret = file_rename (filename, scheduledFilename); @@ -935,7 +935,8 @@ tstring DailyRollingFileAppender::getFilename(const Time& t) const { tchar const * pattern = 0; - if (datePattern.empty()) { + if (datePattern.empty()) + { switch (schedule) { case MONTHLY: @@ -968,7 +969,8 @@ DailyRollingFileAppender::getFilename(const Time& t) const pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%H-%M"); break; }; - } else + } + else pattern = datePattern.c_str(); tstring result (filename); From edea5c3770999eed38f4d794731a8656ddcf93f3 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 11 Dec 2015 13:05:15 +0100 Subject: [PATCH 095/165] Remove redundant comparison in socket-unix.cxx. Resolve SF#321. Patch provided by: Garima at users dot sourceforge dot net --- src/socket-unix.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket-unix.cxx b/src/socket-unix.cxx index 92f586d18..40571786c 100644 --- a/src/socket-unix.cxx +++ b/src/socket-unix.cxx @@ -373,7 +373,7 @@ getHostname (bool fqdn) break; } #if defined (LOG4CPLUS_HAVE_ENAMETOOLONG) - else if (ret != 0 && errno == ENAMETOOLONG) + else if (errno == ENAMETOOLONG) // Out buffer was too short. Retry with buffer twice the size. hn.resize (hn.size () * 2, 0); #endif From 9ab7c6404527a71ec1cc67fc42c19d913fa25b27 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 14 Dec 2015 16:23:45 +0100 Subject: [PATCH 096/165] Fix build issue (SF#322) on Windows. Fix missing `FreeAddrInfoW()` and `FreeAddrInfoA()` symbols by bumping required version of Windows from XP SP1 to XP SP2. --- msvc10/log4cplus.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msvc10/log4cplus.props b/msvc10/log4cplus.props index 671cc0c3a..499cfb0ee 100644 --- a/msvc10/log4cplus.props +++ b/msvc10/log4cplus.props @@ -10,7 +10,7 @@ ..\include;%(AdditionalIncludeDirectories) - WIN32;_WIN32_WINNT=0x0501;WINVER=0x0501;INSIDE_LOG4CPLUS;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x05010200;INSIDE_LOG4CPLUS;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true $(IntDir)$(ProjectName).pch $(IntDir) From 82c7b791f91bb5b0c42f4bd186fa895f5dc3af53 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 15 Dec 2015 07:58:40 +0100 Subject: [PATCH 097/165] Fix compilation with Visual Studio 2010 (SF#322). Avoid delete'd constructor and move assignment operator since Visual Studio 2010 does not support it. --- include/log4cplus/internal/socket.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/log4cplus/internal/socket.h b/include/log4cplus/internal/socket.h index 2f8c5f844..988c1a1b9 100644 --- a/include/log4cplus/internal/socket.h +++ b/include/log4cplus/internal/socket.h @@ -171,18 +171,13 @@ struct socket_holder return s; } -#if defined (LOG4CPLUS_HAVE_CXX11_SUPPORT) - socket_holder (socket_holder &&) = delete; - socket_holder (socket_holder const &) = delete; - - socket_holder operator = (socket_holder &&) = delete; - socket_holder operator = (socket_holder const &) = delete; - -#else private: socket_holder (socket_holder const &); socket_holder operator = (socket_holder const &); +#if defined (LOG4CPLUS_HAVE_CXX11_SUPPORT) + socket_holder (socket_holder &&); + socket_holder operator = (socket_holder &&); #endif }; From e45c1de2169eebcd3275e32a2ec568037eadde9b Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Thu, 17 Dec 2015 13:49:38 +0100 Subject: [PATCH 098/165] Use _WINSOCK_DEPRECATED_NO_WARNINGS for Windows builds. --- msvc10/log4cplus.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msvc10/log4cplus.props b/msvc10/log4cplus.props index 499cfb0ee..95adaec6c 100644 --- a/msvc10/log4cplus.props +++ b/msvc10/log4cplus.props @@ -10,7 +10,7 @@ ..\include;%(AdditionalIncludeDirectories) - WIN32;_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x05010200;INSIDE_LOG4CPLUS;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x05010200;INSIDE_LOG4CPLUS;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) true $(IntDir)$(ProjectName).pch $(IntDir) From c6f931a4f2c34c9bbd32c885cc5e10da2e759823 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Thu, 17 Dec 2015 13:50:52 +0100 Subject: [PATCH 099/165] Fix warning in src/fileappender.cxx. --- src/fileappender.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index b7fd968a4..58e89ca28 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -1323,12 +1323,12 @@ TimeBasedRollingFileAppender::clean(Time time) interval += Time(1); int periodDuration = getRolloverPeriodDuration(); - int periods = interval.sec() / periodDuration; + long periods = static_cast(interval.sec() / periodDuration); helpers::LogLog & loglog = helpers::getLogLog(); - for (int i = 0; i < periods; i++) + for (long i = 0; i < periods; i++) { - int periodToRemove = (-maxHistory - 1) - i; + long periodToRemove = (-maxHistory - 1) - i; Time timeToRemove = time + Time(periodToRemove * periodDuration); tstring filenameToRemove = timeToRemove.getFormattedTime(filenamePattern, false); loglog.debug(LOG4CPLUS_TEXT("Removing file ") + filenameToRemove); From 123168936d25486ef1f835cb2477b515aff4eee6 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Thu, 17 Dec 2015 17:56:59 +0100 Subject: [PATCH 100/165] Use InterlockedAdd() to load WinSock state. --- src/socket-win32.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/socket-win32.cxx b/src/socket-win32.cxx index aad3e25d1..07482014a 100644 --- a/src/socket-win32.cxx +++ b/src/socket-win32.cxx @@ -89,7 +89,8 @@ init_winsock_worker () // Wait for state change. while (true) { - switch (winsock_state) + LONG state = InterlockedAdd (&winsock_state, 0); + switch (state) { case WS_INITIALIZED: return; From dd97f5f0ca79a1f824d4f637031e06fc55f67861 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Thu, 17 Dec 2015 17:57:51 +0100 Subject: [PATCH 101/165] Avoid warning about zero in CloseHandle(). --- src/clfsappender.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/clfsappender.cxx b/src/clfsappender.cxx index 6e21cb02b..026ed7fdd 100644 --- a/src/clfsappender.cxx +++ b/src/clfsappender.cxx @@ -214,7 +214,8 @@ CLFSAppender::init (tstring const & logname, unsigned long logsize, return; error: - if (data->log_handle != INVALID_HANDLE_VALUE) + if (data->log_handle != INVALID_HANDLE_VALUE + && data->log_handle) { CloseHandle (data->log_handle); data->log_handle = INVALID_HANDLE_VALUE; From 7fdb081de24977e3b1279f7c5c7507cd60b98812 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 18 Dec 2015 09:12:45 +0100 Subject: [PATCH 102/165] Fix possibly broken format of .dir-locals.el. --- .dir-locals.el | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 9a7bcdb11..ef507e566 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,15 +1,14 @@ ;;; Directory Local Variables ;;; See Info node `(emacs) Directory Variables' for more information. -((nil - (fill-column . 79) - (indent-tabs-mode) - (show-trailing-whitespace . t) - (whitespace-style face trailing lines-tail space-before-tab indentation empty) - (whitespace-newline . t)) - (c++-mode - (tab-width . 4) - (whitespace-action warn-read-only auto-cleanup)) - (cmake-mode - (whitespace-action warn-read-only auto-cleanup))) - +((nil . + ((fill-column . 79) + (indent-tabs-mode) + (show-trailing-whitespace . t) + (whitespace-style face trailing lines-tail space-before-tab indentation empty) + (whitespace-newline . t))) + (c++-mode . + ((tab-width . 4) + (whitespace-action warn-read-only auto-cleanup))) + (cmake-mode . + ((whitespace-action warn-read-only auto-cleanup)))) From 322c3f33a4893bcd53eed641f0b8d659196a383d Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 1 Jan 2016 22:39:44 +0100 Subject: [PATCH 103/165] Add ChangeLog entries for 1.2.0-RC6. --- ChangeLog | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index f665c24c2..92601585c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +log4cplus 1.2.0-RC6 +------------------- + + - Fixed Visual Studio build issue #322 related to WinSock functions being + used and second about C++11 syntax. **This forces minimum version of + Windows supported by this release is Windows XP SP3.** + + - Added `DatePattern` property to `DailyRollingFileAppender` configuration + -- This property specifies filename suffix pattern to use for periodical + backups of the logfile. + + - Added `RollOnClose` property to `DailyRollingFileAppender` and + `TimeBasedRollingFileAppender` configuration -- This property specifies + whether to rollover log files upon shutdown. By default it's set to + `true` to retain compatibility with legacy code. (Alexey Morozov) + + - Normalized line endings, used `.gitattributes` to enforce it. + log4cplus 1.2.0-RC5 ------------------- From 3c7298ca9963bea4c82eb906ba51be6a84db2262 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 1 Jan 2016 22:47:13 +0100 Subject: [PATCH 104/165] Bump SO version age. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c8fb623e7..909d8d024 100755 --- a/configure +++ b/configure @@ -4470,7 +4470,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=5:2:0 +LT_VERSION=5:3:0 LT_RELEASE=1.2 diff --git a/configure.ac b/configure.ac index eb1831781..1ea160a3d 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AM_PROG_AR # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=5:2:0 +LT_VERSION=5:3:0 LT_RELEASE=1.2 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) From 21416992eb0d1365fe5513a95ef1449d3d67ebb0 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 2 Jan 2016 23:47:51 +0100 Subject: [PATCH 105/165] Correct minor issues in ChangeLog. --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92601585c..174eb629a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,11 +3,11 @@ log4cplus 1.2.0-RC6 - Fixed Visual Studio build issue #322 related to WinSock functions being used and second about C++11 syntax. **This forces minimum version of - Windows supported by this release is Windows XP SP3.** + Windows supported by this release to Windows XP SP2.** - Added `DatePattern` property to `DailyRollingFileAppender` configuration -- This property specifies filename suffix pattern to use for periodical - backups of the logfile. + backups of the logfile. (Alexey Morozov) - Added `RollOnClose` property to `DailyRollingFileAppender` and `TimeBasedRollingFileAppender` configuration -- This property specifies From 3636758821e8c3c393644e5c25bd057e392b5445 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 8 Jan 2016 19:59:19 +0100 Subject: [PATCH 106/165] Use InterlockedExchangeAdd. Use InterlockedExchangeAdd instead of InterlockedAdd. The former is supported by older MinGW and in this situation it does not matter which one we use in this situation. This fixes SF#324. --- src/socket-win32.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket-win32.cxx b/src/socket-win32.cxx index 07482014a..9b895604a 100644 --- a/src/socket-win32.cxx +++ b/src/socket-win32.cxx @@ -89,7 +89,7 @@ init_winsock_worker () // Wait for state change. while (true) { - LONG state = InterlockedAdd (&winsock_state, 0); + LONG state = InterlockedExchangeAdd (&winsock_state, 0); switch (state) { case WS_INITIALIZED: From 39fb7012ebb851d6452e8aa6c87c0c58002a43bd Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 15 Jan 2016 19:32:44 +0100 Subject: [PATCH 107/165] Detect GCC attribute __deprecated__. Detec GCC attribute `__deprecated__` and define `LOG4CPLUS_ATTRIBUTE_DEPRECATED` if it found. Related to GitHub bug #137. (cherry picked from commit 5a9e82a6f30834d705e96f855e58c8a1f78ff306) --- include/log4cplus/config.hxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/log4cplus/config.hxx b/include/log4cplus/config.hxx index 7b96a1a81..b523e167b 100644 --- a/include/log4cplus/config.hxx +++ b/include/log4cplus/config.hxx @@ -131,12 +131,14 @@ #if defined (__GNUC__) && __GNUC__ >= 3 # define LOG4CPLUS_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) # define LOG4CPLUS_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# define LOG4CPLUS_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) # define LOG4CPLUS_BUILTIN_EXPECT(exp, c) __builtin_expect ((exp), (c)) #else # if ! defined (LOG4CPLUS_ATTRIBUTE_NORETURN) # define LOG4CPLUS_ATTRIBUTE_NORETURN /* empty */ # endif # define LOG4CPLUS_ATTRIBUTE_PURE /* empty */ +# define LOG4CPLUS_ATTRIBUTE_DEPRECATED /* empty */ # define LOG4CPLUS_BUILTIN_EXPECT(exp, c) (exp) #endif From d3e11432688a0d6e7108e69d27d8e9fcb33b6ab0 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 15 Jan 2016 22:33:44 +0100 Subject: [PATCH 108/165] Fix missing thread's alternative name. GitHub bug #137. --- include/log4cplus/spi/loggingevent.h | 10 ++++++++++ src/loggingevent.cxx | 30 ++++++++++++++++++++++++++-- src/socketappender.cxx | 7 ++++--- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/include/log4cplus/spi/loggingevent.h b/include/log4cplus/spi/loggingevent.h index 161814b16..c1486e355 100644 --- a/include/log4cplus/spi/loggingevent.h +++ b/include/log4cplus/spi/loggingevent.h @@ -73,6 +73,16 @@ namespace log4cplus { const log4cplus::tstring& message, const log4cplus::tstring& thread, log4cplus::helpers::Time time, const log4cplus::tstring& file, + int line, const log4cplus::tstring & function + = log4cplus::tstring ()) LOG4CPLUS_ATTRIBUTE_DEPRECATED; + + InternalLoggingEvent(const log4cplus::tstring& logger, + LogLevel loglevel, const log4cplus::tstring& ndc, + MappedDiagnosticContextMap const & mdc, + const log4cplus::tstring& message, + const log4cplus::tstring& thread, + const log4cplus::tstring& thread2, + log4cplus::helpers::Time time, const log4cplus::tstring& file, int line, const log4cplus::tstring & function = log4cplus::tstring ()); diff --git a/src/loggingevent.cxx b/src/loggingevent.cxx index 4ca916554..7fb1450a7 100644 --- a/src/loggingevent.cxx +++ b/src/loggingevent.cxx @@ -44,7 +44,7 @@ InternalLoggingEvent::InternalLoggingEvent(const log4cplus::tstring& logger, , thread() , timestamp(log4cplus::helpers::Time::gettimeofday()) , file(filename - ? LOG4CPLUS_C_STR_TO_TSTRING(filename) + ? LOG4CPLUS_C_STR_TO_TSTRING(filename) : log4cplus::tstring()) , function (function_ ? LOG4CPLUS_C_STR_TO_TSTRING(function_) @@ -82,6 +82,31 @@ InternalLoggingEvent::InternalLoggingEvent(const log4cplus::tstring& logger, } +InternalLoggingEvent::InternalLoggingEvent(const log4cplus::tstring& logger, + LogLevel loglevel, const log4cplus::tstring& ndc_, + MappedDiagnosticContextMap const & mdc_, const log4cplus::tstring& message_, + const log4cplus::tstring& thread_, const log4cplus::tstring& thread2_, + log4cplus::helpers::Time time, const log4cplus::tstring& file_, int line_, + const log4cplus::tstring & function_) + : message(message_) + , loggerName(logger) + , ll(loglevel) + , ndc(ndc_) + , mdc(mdc_) + , thread(thread_) + , thread2(thread2_) + , timestamp(time) + , file(file_) + , function (function_) + , line(line_) + , threadCached(true) + , thread2Cached(true) + , ndcCached(true) + , mdcCached(true) +{ +} + + InternalLoggingEvent::InternalLoggingEvent () : ll (NOT_SET_LOG_LEVEL) , function () @@ -101,6 +126,7 @@ InternalLoggingEvent::InternalLoggingEvent( , ndc(rhs.getNDC()) , mdc(rhs.getMDCCopy()) , thread(rhs.getThread()) + , thread2(rhs.getThread2()) , timestamp(rhs.getTimestamp()) , file(rhs.getFile()) , function(rhs.getFunction()) @@ -187,7 +213,7 @@ InternalLoggingEvent::setFunction (log4cplus::tstring const & func) } -const log4cplus::tstring& +const log4cplus::tstring& InternalLoggingEvent::getMessage() const { return message; diff --git a/src/socketappender.cxx b/src/socketappender.cxx index a36aba09b..13c5ba6c5 100644 --- a/src/socketappender.cxx +++ b/src/socketappender.cxx @@ -26,6 +26,7 @@ #include #include #include +#include namespace log4cplus { @@ -74,7 +75,7 @@ SocketAppender::~SocketAppender() // SocketAppender public methods ////////////////////////////////////////////////////////////////////////////// -void +void SocketAppender::close() { helpers::getLogLog().debug( @@ -251,8 +252,8 @@ readFromBuffer(SocketBuffer& buffer) // TODO: Pass MDC through. spi::InternalLoggingEvent ev (loggerName, ll, ndc, - MappedDiagnosticContextMap (), message, thread, Time(sec, usec), file, - line, function); + MappedDiagnosticContextMap (), message, thread, internal::empty_str, + Time(sec, usec), file, line, function); return ev; } From b4842d5f6a926f04fefe843f0f858d3a84f9ea32 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 16 Jan 2016 18:39:52 +0100 Subject: [PATCH 109/165] Another small fix for GitHub bug #137. --- src/loggingevent.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/loggingevent.cxx b/src/loggingevent.cxx index 7fb1450a7..d7bc439a6 100644 --- a/src/loggingevent.cxx +++ b/src/loggingevent.cxx @@ -284,6 +284,7 @@ InternalLoggingEvent::swap (InternalLoggingEvent & other) swap (function, other.function); swap (line, other.line); swap (threadCached, other.threadCached); + swap (thread2Cached, other.thread2Cached); swap (ndcCached, other.ndcCached); } From 18e5219808ba4a6760d3a903942887eb2074cb59 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 16 Jan 2016 20:27:55 +0100 Subject: [PATCH 110/165] Bump SO versions. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 909d8d024..d1c349d51 100755 --- a/configure +++ b/configure @@ -4470,7 +4470,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=5:3:0 +LT_VERSION=6:4:1 LT_RELEASE=1.2 diff --git a/configure.ac b/configure.ac index 1ea160a3d..a171740ee 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AM_PROG_AR # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=5:3:0 +LT_VERSION=6:4:1 LT_RELEASE=1.2 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) From 71704a2ad5621f4de1ba3680bdf8dac227579820 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 16 Jan 2016 20:28:31 +0100 Subject: [PATCH 111/165] Update ChangeLog for release. --- ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 174eb629a..828527d62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +log4cplus 1.2.0 +--------------- + + - Fixed SourceForge bug #324, MinGW compilation issue. Use + `InterlockedExchangeAdd` instead of `InterlockedAdd`. The former is + supported by older MinGW. + + - Fixed GitHub bug #137. Fix missing thread's alternative name. + + log4cplus 1.2.0-RC6 ------------------- @@ -16,6 +26,7 @@ log4cplus 1.2.0-RC6 - Normalized line endings, used `.gitattributes` to enforce it. + log4cplus 1.2.0-RC5 ------------------- From 15c118d19828108c1564f980537eb6d2a370c6b6 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 17 Jan 2016 18:31:53 +0100 Subject: [PATCH 112/165] Fix GitHub bug #136. Adjust weekly, daily and twice daily rollover time for `DailyRollingFileAppender` by time zone offset so that the rollover happens at midnight, etc., of local time instead of UTC time. --- src/fileappender.cxx | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index 58e89ca28..a1d8d2337 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -705,6 +705,33 @@ round_time_and_add (Time const & t, Time const & seconds) } +static +long +local_time_offset (Time t) +{ + tm time_local, time_gmt; + + t.localtime (&time_local); + t.gmtime (&time_gmt); + + t.setTime (&time_local); + Time t2 = t; + + t.setTime (&time_gmt); + Time t3 = t; + + return t2.sec () - t3.sec (); +} + + +static +Time +adjust_for_time_zone (Time const & t, long tzoffset) +{ + return t - Time (tzoffset); +} + + } // namespace @@ -907,7 +934,10 @@ DailyRollingFileAppender::calculateNextRolloverTime(const Time& t) const } case WEEKLY: - return round_time (t, 24 * 60 * 60) + Time (7 * 24 * 60 * 60); + { + Time next = round_time (t, 24 * 60 * 60) + Time (7 * 24 * 60 * 60); + return adjust_for_time_zone (next, local_time_offset (next)); + } default: helpers::getLogLog ().error ( @@ -916,10 +946,16 @@ DailyRollingFileAppender::calculateNextRolloverTime(const Time& t) const // Fall through. case DAILY: - return round_time_and_add (t, Time (24 * 60 * 60)); + { + Time next = round_time_and_add (t, Time (24 * 60 * 60)); + return adjust_for_time_zone (next, local_time_offset (next)); + } case TWICE_DAILY: - return round_time_and_add (t, Time (12 * 60 * 60)); + { + Time next = round_time_and_add (t, Time (12 * 60 * 60)); + return adjust_for_time_zone (next, local_time_offset (next)); + } case HOURLY: return round_time_and_add (t, Time (60 * 60)); From 78a51c38b3d1d0dc169896db80aff48e568e4ada Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 2 Mar 2016 08:59:00 +0100 Subject: [PATCH 113/165] Fix GitHub bug #148. TTCCLayotu boolean members could be left uninitialized. Initialize them. --- src/layout.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/layout.cxx b/src/layout.cxx index b2a944e59..c666a0853 100644 --- a/src/layout.cxx +++ b/src/layout.cxx @@ -99,7 +99,7 @@ SimpleLayout::formatAndAppend(log4cplus::tostream& output, // log4cplus::TTCCLayout ctors and dtor /////////////////////////////////////////////////////////////////////////////// - TTCCLayout::TTCCLayout(bool use_gmtime_, bool thread_printing_, +TTCCLayout::TTCCLayout(bool use_gmtime_, bool thread_printing_, bool category_prefixing_, bool context_printing_) : dateFormat() , use_gmtime(use_gmtime_) @@ -114,6 +114,10 @@ TTCCLayout::TTCCLayout(const log4cplus::helpers::Properties& properties) : Layout(properties) , dateFormat(properties.getProperty (LOG4CPLUS_TEXT("DateFormat"), internal::empty_str)) + , use_gmtime (false) + , thread_printing (true) + , category_prefixing (true) + , context_printing (true) { properties.getBool (use_gmtime, LOG4CPLUS_TEXT("Use_gmtime")); properties.getBool (thread_printing, LOG4CPLUS_TEXT("ThreadPrinting")); From 3efec35f19893296fd3d4c2406f005ad5e51662f Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 14 Mar 2016 13:41:29 +0100 Subject: [PATCH 114/165] Fix/work around GitHub bug #155. Here we check that we can get CRT's heap handle because if we do not then the following `delete` will fail with access violation in `RtlFreeHeap()`. How is it possible that the CRT heap handle is NULL? This function can be called from TLS initializer/terminator by loader when log4cplus is compiled and linked to as a static library. In case of other threads temination, it should do its job and free per-thread data. However, when the whole process is being terminated, it is called after the CRT has been uninitialized and the CRT heap is not available any more. In such case, instead of crashing, we just give up and leak the memory for the short while before the process terminates anyway. It is possible to work around this situation in user application by calling `threadCleanup()` manually before `main()` exits. --- src/global-init.cxx | 78 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 70 insertions(+), 8 deletions(-) diff --git a/src/global-init.cxx b/src/global-init.cxx index afbf9b499..1a1d53f46 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -387,9 +387,38 @@ initialize () void threadCleanup () { - // Do thread-specific cleanup. - internal::per_thread_data * ptd = internal::get_ptd (false); - delete ptd; + // Here we check that we can get CRT's heap handle because if we do not + // then the following `delete` will fail with access violation in + // `RtlFreeHeap()`. + // + // How is it possible that the CRT heap handle is NULL? + // + // This function can be called from TLS initializer/terminator by loader + // when log4cplus is compiled and linked to as a static library. In case of + // other threads temination, it should do its job and free per-thread + // data. However, when the whole process is being terminated, it is called + // after the CRT has been uninitialized and the CRT heap is not available + // any more. In such case, instead of crashing, we just give up and leak + // the memory for the short while before the process terminates anyway. + // + // It is possible to work around this situation in user application by + // calling `threadCleanup()` manually before `main()` exits. +#if defined (_WIN32) + if (_get_heap_handle() != 0) + { +#endif + // Do thread-specific cleanup. + internal::per_thread_data * ptd = internal::get_ptd (false); + delete ptd; +#if defined (_WIN32) + } + else + { + OutputDebugString ( + LOG4CPLUS_TEXT ("log4cplus: ") + LOG4CPLUS_TEXT ("CRT heap is already gone in threadCleanup()\n")); + } +#endif internal::set_ptd (0); } @@ -463,6 +492,25 @@ thread_callback (LPVOID /*hinstDLL*/, DWORD fdwReason, LPVOID /*lpReserved*/) } // switch } + +static +void NTAPI +thread_callback_initializer(LPVOID hinstDLL, DWORD fdwReason, LPVOID lpReserved) +{ + if (fdwReason == DLL_PROCESS_ATTACH + || fdwReason == DLL_THREAD_ATTACH) + thread_callback(hinstDLL, fdwReason, lpReserved); +} + +static +void NTAPI +thread_callback_terminator(LPVOID hinstDLL, DWORD fdwReason, LPVOID lpReserved) +{ + if (fdwReason == DLL_THREAD_DETACH + || fdwReason == DLL_PROCESS_DETACH) + thread_callback(hinstDLL, fdwReason, lpReserved); +} + #endif @@ -489,22 +537,36 @@ extern "C" // This magic has been pieced together from several sources: // - // - +// - `internal_shared.h` in CRT source in Visual Studio 2015 + +#pragma data_seg (push, old_seg) +#ifdef _WIN64 +#pragma const_seg (".CRT$XLY") +extern const +#else +#pragma data_seg (".CRT$XLY") +#endif +PIMAGE_TLS_CALLBACK log4cplus_p_thread_callback_initializer = log4cplus::thread_callback_initializer; +#pragma data_seg (pop, old_seg) #pragma data_seg (push, old_seg) #ifdef _WIN64 -#pragma const_seg (".CRT$XLX") +#pragma const_seg (".CRT$XLAA") extern const #else -#pragma data_seg (".CRT$XLX") +#pragma data_seg (".CRT$XLAA") #endif -PIMAGE_TLS_CALLBACK log4cplus_p_thread_callback = log4cplus::thread_callback; +PIMAGE_TLS_CALLBACK log4cplus_p_thread_callback_terminator = log4cplus::thread_callback_terminator; #pragma data_seg (pop, old_seg) + #ifdef _WIN64 #pragma comment (linker, "/INCLUDE:_tls_used") -#pragma comment (linker, "/INCLUDE:log4cplus_p_thread_callback") +#pragma comment (linker, "/INCLUDE:log4cplus_p_thread_callback_initializer") +#pragma comment (linker, "/INCLUDE:log4cplus_p_thread_callback_terminator") #else #pragma comment (linker, "/INCLUDE:__tls_used") -#pragma comment (linker, "/INCLUDE:_log4cplus_p_thread_callback") +#pragma comment (linker, "/INCLUDE:_log4cplus_p_thread_callback_initializer") +#pragma comment (linker, "/INCLUDE:_log4cplus_p_thread_callback_terminator") #endif } // extern "C" From 8dbe4abc2975a38957869adda2d78b64bc667a21 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 18 Mar 2016 09:56:50 +0100 Subject: [PATCH 115/165] Fix Visual Studio 2015 build with CMake. Compilation fails not finding `FreeAddrInfoW()`. GitHub bug #163. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3de896e52..e4709abd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ option(ENABLE_SYMBOLS_VISIBILITY "Enable compiler and platform specific options for symbols visibility" ON) -set(_WIN32_WINNT 0x0500 CACHE STRING "Define Windows API version to use.") +set(_WIN32_WINNT 0x0502 CACHE STRING "Define Windows API version to use.") option(LOG4CPLUS_ENABLE_DECORATED_LIBRARY_NAME "Turns on resulting file name decoration for static and UNICODE builds." ON) From 5cab569641a1d16a3d968857449e37f6d7da4ff1 Mon Sep 17 00:00:00 2001 From: Sergei Nikulov Date: Thu, 17 Mar 2016 22:26:05 +0300 Subject: [PATCH 116/165] - Added AppVeyor-CI for log4cplus - Added CI status bages to README.md --- README.md | 4 ++++ appveyor.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 appveyor.yml diff --git a/README.md b/README.md index ee4402994..223665af6 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ configuration. It is modeled after the Java log4j API. [log4cplus]: https://sourceforge.net/projects/log4cplus/ +Branches | Travis-CI | AppVeyor-CI | +----------------|--------------- |-------------|- +master | [![Build Status](https://travis-ci.org/log4cplus/log4cplus.svg?branch=1.2.x)](https://travis-ci.org/log4cplus/log4cplus) | TBD | +------------------------------------------------- Latest Project Information ========================== diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..020cc7684 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,28 @@ +version: 1.2.0.{build} + +install: + - git submodule update --init --recursive + +environment: + matrix: + # + # >>> Enable for 1.x + # - PRJ_GEN: "Visual Studio 11 2012 Win64" + # BDIR: msvc2012 + # PRJ_CFG: Release + - PRJ_GEN: "Visual Studio 12 2013 Win64" + BDIR: msvc2013 + PRJ_CFG: Release + - PRJ_GEN: "Visual Studio 14 2015 Win64" + BDIR: msvc2015 + PRJ_CFG: Release + +build_script: + - mkdir build.%BDIR% + - cd build.%BDIR% + - cmake .. -G"%PRJ_GEN%" -DCMAKE_BUILD_TYPE=%PRJ_CFG% + - cmake --build . --config %PRJ_CFG% --clean-first + +test_script: + - ctest -V --output-on-failure -C %PRJ_CFG% + From 7faec1604dd4fada75f162c5b9706bdf3885a997 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 18 Mar 2016 10:37:56 +0100 Subject: [PATCH 117/165] Remove commented out lines from appveyor.yml. --- appveyor.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 020cc7684..caec22712 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,11 +5,6 @@ install: environment: matrix: - # - # >>> Enable for 1.x - # - PRJ_GEN: "Visual Studio 11 2012 Win64" - # BDIR: msvc2012 - # PRJ_CFG: Release - PRJ_GEN: "Visual Studio 12 2013 Win64" BDIR: msvc2013 PRJ_CFG: Release From f03071ace482277ecc78a9bbfef7afcad1a6b02f Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 18 Mar 2016 10:57:18 +0100 Subject: [PATCH 118/165] Add log4cplus shutdown call to timeformat_test. --- tests/timeformat_test/main.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/timeformat_test/main.cxx b/tests/timeformat_test/main.cxx index 2fc99fd48..b6bc4f60e 100644 --- a/tests/timeformat_test/main.cxx +++ b/tests/timeformat_test/main.cxx @@ -1,5 +1,6 @@ #include #include +#include #include using namespace log4cplus; @@ -62,5 +63,6 @@ main() } std::cout << "Exiting main()..." << std::endl; + log4cplus::Logger::shutdown(); return 0; } From 086a99c09c2d97549d8bb2a13ed4f825182f2c36 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 18 Mar 2016 12:15:18 +0100 Subject: [PATCH 119/165] Improve tests. Allow passing log4cplus.properties to tests on command line. --- tests/CMakeLists.txt | 6 ++++- tests/configandwatch_test/main.cxx | 26 +++++++++++++----- tests/filter_test/main.cxx | 24 ++++++++++++++--- tests/hierarchy_test/main.cxx | 22 +++++++--------- tests/performance_test/main.cxx | 42 +++++++++++++++++++++--------- tests/propertyconfig_test/main.cxx | 29 ++++++++++++++++----- 6 files changed, 106 insertions(+), 43 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3e5b37d8d..8d09dad89 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -12,7 +12,11 @@ function(log4cplus_add_test _name) # message (STATUS "${_name} sources: ${_srcs}") add_executable (${_name} ${_srcs}) target_link_libraries (${_name} ${log4cplus}) - add_test(NAME ${_name} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${_name}) + get_filename_component (_log4cplus_properties "log4cplus.properties.in" + ABSOLUTE) + add_test(NAME ${_name} + WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + COMMAND ${_name} ${_log4cplus_properties}) endfunction() diff --git a/tests/configandwatch_test/main.cxx b/tests/configandwatch_test/main.cxx index eb74fe3fe..d5f14ee6a 100644 --- a/tests/configandwatch_test/main.cxx +++ b/tests/configandwatch_test/main.cxx @@ -1,9 +1,9 @@ - #include #include #include #include #include +#include #include using namespace std; @@ -27,18 +27,33 @@ printMsgs(Logger& logger) } +log4cplus::tstring +getPropertiesFileArgument (int argc, char * argv[]) +{ + if (argc >= 2) + { + char const * arg = argv[1]; + log4cplus::tstring file = LOG4CPLUS_C_STR_TO_TSTRING (arg); + log4cplus::helpers::FileInfo fi; + if (getFileInfo (&fi, file) == 0) + return file; + } + + return LOG4CPLUS_TEXT ("log4cplus.properties"); +} + int -main() +main(int argc, char * argv[]) { tcout << LOG4CPLUS_TEXT("Entering main()...") << endl; log4cplus::initialize (); LogLog::getLogLog()->setInternalDebugging(true); Logger root = Logger::getRoot(); - try + try { ConfigureAndWatchThread configureThread( - LOG4CPLUS_TEXT("log4cplus.properties"), 5 * 1000); + getPropertiesFileArgument (argc, argv), 5 * 1000); LOG4CPLUS_WARN(root, "Testing...."); @@ -46,7 +61,7 @@ main() printMsgs(log_1); printMsgs(log_2); printMsgs(log_3); - log4cplus::helpers::sleep(1); + log4cplus::helpers::sleep(1); } } catch(...) { @@ -57,4 +72,3 @@ main() tcout << LOG4CPLUS_TEXT("Exiting main()...") << endl; return 0; } - diff --git a/tests/filter_test/main.cxx b/tests/filter_test/main.cxx index b3fb3e7fa..54ce1e9f5 100644 --- a/tests/filter_test/main.cxx +++ b/tests/filter_test/main.cxx @@ -1,8 +1,8 @@ - #include #include #include #include +#include #include using namespace std; @@ -24,15 +24,32 @@ printDebug() } +log4cplus::tstring +getPropertiesFileArgument (int argc, char * argv[]) +{ + if (argc >= 2) + { + char const * arg = argv[1]; + log4cplus::tstring file = LOG4CPLUS_C_STR_TO_TSTRING (arg); + log4cplus::helpers::FileInfo fi; + if (getFileInfo (&fi, file) == 0) + return file; + } + + return LOG4CPLUS_TEXT ("log4cplus.properties"); +} + + int -main() +main(int argc, char * argv[]) { tcout << "Entering main()..." << endl; log4cplus::initialize (); LogLog::getLogLog()->setInternalDebugging(true); Logger root = Logger::getRoot(); try { - PropertyConfigurator::doConfigure(LOG4CPLUS_TEXT("log4cplus.properties")); + PropertyConfigurator::doConfigure( + getPropertiesFileArgument (argc, argv)); LOG4CPLUS_WARN(root, "Testing...."); printDebug(); @@ -45,4 +62,3 @@ main() tcout << "Exiting main()..." << endl; return 0; } - diff --git a/tests/hierarchy_test/main.cxx b/tests/hierarchy_test/main.cxx index a01971c9f..65d7c354e 100644 --- a/tests/hierarchy_test/main.cxx +++ b/tests/hierarchy_test/main.cxx @@ -1,4 +1,3 @@ - #include #include #include "log4cplus/hierarchy.h" @@ -22,43 +21,43 @@ main() Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("test")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test2")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a.b.c")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a.b.c")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a.b.c.d")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a.b.c")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; - + logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest")); log4cplus::tcout << "Logger name: " << logger.getName() << " Parent = " << logger.getParent().getName() << endl; @@ -144,4 +143,3 @@ main() log4cplus::tcout << "Exiting main()..." << endl; return 0; } - diff --git a/tests/performance_test/main.cxx b/tests/performance_test/main.cxx index 5b2cc0f5b..649f95d15 100644 --- a/tests/performance_test/main.cxx +++ b/tests/performance_test/main.cxx @@ -1,10 +1,10 @@ - #include #include #include #include #include #include +#include #include @@ -22,12 +22,28 @@ log4cplus::tostream& operator <<(log4cplus::tostream& s, const Time& t) #define LOOP_COUNT 100000 +log4cplus::tstring +getPropertiesFileArgument (int argc, char * argv[]) +{ + if (argc >= 2) + { + char const * arg = argv[1]; + log4cplus::tstring file = LOG4CPLUS_C_STR_TO_TSTRING (arg); + log4cplus::helpers::FileInfo fi; + if (getFileInfo (&fi, file) == 0) + return file; + } + + return LOG4CPLUS_TEXT ("log4cplus.properties"); +} + + int -main() +main(int argc, char * argv[]) { tcout << LOG4CPLUS_TEXT("Entering main()...") << endl; log4cplus::initialize (); - PropertyConfigurator::doConfigure(LOG4CPLUS_TEXT("log4cplus.properties")); + PropertyConfigurator::doConfigure(getPropertiesFileArgument (argc, argv)); Logger root = Logger::getRoot(); try { Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("testlogger")); @@ -47,8 +63,8 @@ main() start = Time::gettimeofday(); for(i=0; i #include #include +#include #include @@ -10,9 +11,24 @@ using namespace log4cplus; using namespace log4cplus::helpers; +log4cplus::tstring +getPropertiesFileArgument (int argc, char * argv[]) +{ + if (argc >= 2) + { + char const * arg = argv[1]; + log4cplus::tstring file = LOG4CPLUS_C_STR_TO_TSTRING (arg); + log4cplus::helpers::FileInfo fi; + if (getFileInfo (&fi, file) == 0) + return file; + } + + return LOG4CPLUS_TEXT ("log4cplus.properties"); +} + int -main() +main(int argc, char * argv[]) { tcout << LOG4CPLUS_TEXT("Entering main()...") << endl; log4cplus::initialize (); @@ -20,13 +36,13 @@ main() Logger root = Logger::getRoot(); try { PropertyConfigurator::doConfigure( - LOG4CPLUS_TEXT("log4cplus.properties")); + getPropertiesFileArgument (argc, argv)); Logger fileCat = Logger::getInstance(LOG4CPLUS_TEXT("filelogger")); - LOG4CPLUS_WARN(root, LOG4CPLUS_TEXT("Testing....")); - LOG4CPLUS_WARN(root, LOG4CPLUS_TEXT("Writing messages to log....")); + LOG4CPLUS_WARN(root, LOG4CPLUS_TEXT("Testing....")); + LOG4CPLUS_WARN(root, LOG4CPLUS_TEXT("Writing messages to log....")); for (int i=0; i<10000; ++i) - LOG4CPLUS_WARN(fileCat, LOG4CPLUS_TEXT("This is a WARNING...") + LOG4CPLUS_WARN(fileCat, LOG4CPLUS_TEXT("This is a WARNING...") << i); // Test that DOS EOLs in property files get removed. @@ -39,10 +55,9 @@ main() } catch(...) { tcout << LOG4CPLUS_TEXT("Exception...") << endl; - LOG4CPLUS_FATAL(root, LOG4CPLUS_TEXT("Exception occured...")); + LOG4CPLUS_FATAL(root, LOG4CPLUS_TEXT("Exception occured...")); } tcout << LOG4CPLUS_TEXT("Exiting main()...") << endl; return 0; } - From 7cca7f2f355856068bcc4b6448877d0d99aa03f2 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 12 Apr 2016 09:09:27 +0200 Subject: [PATCH 120/165] Fix type conversion warnings. --- src/fileappender.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index a1d8d2337..bb14d25bd 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -720,7 +720,7 @@ local_time_offset (Time t) t.setTime (&time_gmt); Time t3 = t; - return t2.sec () - t3.sec (); + return static_cast(t2.sec () - t3.sec ()); } @@ -1034,7 +1034,7 @@ preprocessDateTimePattern(const tstring& pattern, DailyRollingFileSchedule& sche { tchar c = pattern[i]; size_t end_pos = pattern.find_first_not_of(c, i); - int len = (end_pos == tstring::npos ? pattern.length() : end_pos) - i; + size_t len = (end_pos == tstring::npos ? pattern.length() : end_pos) - i; switch (c) { From 365ced6041550fab3885722b1f77d02a1e8392aa Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 13 Jul 2016 10:30:09 +0200 Subject: [PATCH 121/165] Disable use of `__thread` on iOS. This is related to GitHub issue #178. --- iOS/ConfigureChecks.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/iOS/ConfigureChecks.cmake b/iOS/ConfigureChecks.cmake index 196fff021..4e6d4414a 100644 --- a/iOS/ConfigureChecks.cmake +++ b/iOS/ConfigureChecks.cmake @@ -110,8 +110,10 @@ set(LOG4CPLUS_DECLSPEC_EXPORT "__attribute__ ((visibility(\"default\")))" ) set(LOG4CPLUS_DECLSPEC_IMPORT "__attribute__ ((visibility(\"default\")))" ) set(LOG4CPLUS_DECLSPEC_PRIVATE "__attribute__ ((visibility(\"hidden\")))" ) -set(LOG4CPLUS_HAVE_TLS_SUPPORT 1) -set(LOG4CPLUS_THREAD_LOCAL_VAR "__thread") +# According to and other sources, +# thread local storage is not supported on iOS. +#set(LOG4CPLUS_HAVE_TLS_SUPPORT 1) +#set(LOG4CPLUS_THREAD_LOCAL_VAR "__thread") #set(LOG4CPLUS_HAVE_CXX11_ATOMICS ) From c365d71dc94f84e124cb036785fd2f1fcceb058c Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 13 Jul 2016 14:27:25 +0200 Subject: [PATCH 122/165] .travis.yml: Comment out Qt5 builds. Comment out Qt5 builds to fix Travis CI builds. --- .travis.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 98f525b33..020271363 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,28 +3,28 @@ compiler: - gcc - clang env: - - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-c-locale" - CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev - - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-locale" - CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev - - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-locale" - CXXFLAGS="-DUNICODE" SWIG_FLAGS="-DUNICODE" QT=qtbase5-dev - - PARAM_THREADS="--disable-threads --with-python --with-qt5 --with-working-locale" - CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev - - PARAM_THREADS="--disable-threads --with-python --with-qt5 --with-working-locale" - CXXFLAGS="-DUNICODE" SWIG_FLAGS="-DUNICODE" QT=qtbase5-dev - - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-iconv" - CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev - - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-iconv" - CXXFLAGS="-DUNICODE" SWIG_FLAGS="-DUNICODE" QT=qtbase5-dev - - PARAM_THREADS="--disable-threads --with-python --with-qt5 --with-iconv" - CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev - - PARAM_THREADS="--disable-threads --with-python --with-qt5 --with-iconv" - CXXFLAGS="-DUNICODE" SWIG_FLAGS="-DUNICODE" QT=qtbase5-dev - - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-locale" - CXXFLAGS="-std=c++98" SWIG_FLAGS="" QT=qtbase5-dev - - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-locale" - CXXFLAGS="-std=c++0x" SWIG_FLAGS="" QT=qtbase5-dev + # - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-c-locale" + # CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev + # - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-locale" + # CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev + # - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-locale" + # CXXFLAGS="-DUNICODE" SWIG_FLAGS="-DUNICODE" QT=qtbase5-dev + # - PARAM_THREADS="--disable-threads --with-python --with-qt5 --with-working-locale" + # CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev + # - PARAM_THREADS="--disable-threads --with-python --with-qt5 --with-working-locale" + # CXXFLAGS="-DUNICODE" SWIG_FLAGS="-DUNICODE" QT=qtbase5-dev + # - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-iconv" + # CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev + # - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-iconv" + # CXXFLAGS="-DUNICODE" SWIG_FLAGS="-DUNICODE" QT=qtbase5-dev + # - PARAM_THREADS="--disable-threads --with-python --with-qt5 --with-iconv" + # CXXFLAGS="" SWIG_FLAGS="" QT=qtbase5-dev + # - PARAM_THREADS="--disable-threads --with-python --with-qt5 --with-iconv" + # CXXFLAGS="-DUNICODE" SWIG_FLAGS="-DUNICODE" QT=qtbase5-dev + # - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-locale" + # CXXFLAGS="-std=c++98" SWIG_FLAGS="" QT=qtbase5-dev + # - PARAM_THREADS="--enable-threads --with-python --with-qt5 --with-working-locale" + # CXXFLAGS="-std=c++0x" SWIG_FLAGS="" QT=qtbase5-dev - PARAM_THREADS="--enable-threads --with-python --with-qt --with-working-c-locale" CXXFLAGS="" SWIG_FLAGS="" - PARAM_THREADS="--enable-threads --with-python --with-qt --with-working-locale" From 366c4af2af1b8f7d91efd528f1b080cd7cb580fc Mon Sep 17 00:00:00 2001 From: Dmitry Belous Date: Wed, 13 Jul 2016 18:19:01 +0300 Subject: [PATCH 123/165] configure.ac: added conditional around AX_TLS_SUPPORT to not call it if iOS target system --- configure.ac | 12 +++-- m4/ax_check_host_and_build_os.m4 | 85 ++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 m4/ax_check_host_and_build_os.m4 diff --git a/configure.ac b/configure.ac index eb1831781..2ebc53b2d 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,8 @@ dnl libtool-2.4.2 AC_INIT([log4cplus],[1.2.0]) AC_CANONICAL_TARGET +m4_include([m4/ax_check_host_and_build_os.m4]) + AC_CONFIG_SRCDIR([src/logger.cxx]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.14 no-define no-dist nostdinc foreign subdir-objects -Wall]) @@ -511,11 +513,11 @@ dnl Multi threaded library. AH_TEMPLATE([LOG4CPLUS_HAVE___SYNC_ADD_AND_FETCH]) AS_IF([test "x$ac_cv___sync_add_and_fetch" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE___SYNC_ADD_AND_FETCH])]) - + AH_TEMPLATE([LOG4CPLUS_HAVE___SYNC_SUB_AND_FETCH]) AS_IF([test "x$ac_cv___sync_sub_and_fetch" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE___SYNC_SUB_AND_FETCH])]) - + AH_TEMPLATE([LOG4CPLUS_HAVE_CXX11_ATOMICS]) AS_IF([test "x$ac_cv_cxx11_atomics" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE_CXX11_ATOMICS])]) @@ -523,7 +525,7 @@ dnl Multi threaded library. AH_TEMPLATE([LOG4CPLUS_HAVE___ATOMIC_ADD_FETCH]) AS_IF([test "x$ac_cv___atomic_add_fetch" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE___ATOMIC_ADD_FETCH])]) - + AH_TEMPLATE([LOG4CPLUS_HAVE___ATOMIC_SUB_FETCH]) AS_IF([test "x$ac_cv___atomic_sub_fetch" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE___ATOMIC_SUB_FETCH])]) @@ -536,7 +538,9 @@ dnl Multi threaded library. AS_IF([test "x$ac_cv_atomic_dec_uint_nv" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV])]) - AX_TLS_SUPPORT + if test "$os_iphone" != "yes"; then + AX_TLS_SUPPORT + fi AH_TEMPLATE([LOG4CPLUS_HAVE_TLS_SUPPORT]) AH_TEMPLATE([LOG4CPLUS_THREAD_LOCAL_VAR]) AS_IF([test "x$ac_cv_thread_local" = "xyes"], diff --git a/m4/ax_check_host_and_build_os.m4 b/m4/ax_check_host_and_build_os.m4 new file mode 100644 index 000000000..2cd5ef20b --- /dev/null +++ b/m4/ax_check_host_and_build_os.m4 @@ -0,0 +1,85 @@ +dnl | HOST +dnl | the type of system on which the package runs. By default it is the same as +dnl | the build machine. Specifying a host-type that differs from build-type, +dnl | when build-type was also explicitly specified, enables cross-compilation +dnl | mode. +dnl | +dnl | BUILD +dnl | the type of system on which the package is being configured and compiled. +dnl | It defaults to the result of running config.guess. Specifying a build-type +dnl | that differs from host-type enables cross-compilation mode. +dnl | +dnl | ref. https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Specifying-Target-Triplets.html#Specifying-Target-Triplets + +AC_CANONICAL_BUILD +AC_CANONICAL_HOST + +os_win32=no +os_linux=no +os_freebsd=no +os_gnu=no +os_iphone=no + +case "$host" in + *-mingw*|*-*-cygwin*) + os_win32=yes + TARGET_OS=windows + ;; + *-*-*netbsd*) + os_netbsd=yes + TARGET_OS=unix + ;; + *-*-*freebsd*) + os_freebsd=yes + TARGET_OS=unix + ;; + *-*-*openbsd*) + os_openbsd=yes + TARGET_OS=unix + ;; + *-*-linux*) + os_linux=yes + os_gnu=yes + TARGET_OS=unix + ;; + *-*-solaris*) + os_solaris=yes + TARGET_OS=unix + ;; + arm*-*-darwin*) + os_darwin=yes + os_iphone=yes + TARGET_OS=unix + ;; + *-*-darwin*) + os_darwin=yes + TARGET_OS=unix + ;; + gnu*|k*bsd*-gnu*) + os_gnu=yes + TARGET_OS=unix + ;; + *) + AC_MSG_WARN([*** Please add $host to configure.ac checks!]) + ;; +esac + + +dnl | you can use enable_crosscompile to check that we are cross compiling +enable_crosscompile=no +if test "x$host" != "x$build"; then + enable_crosscompile=yes +fi + +dnl | Now, based on above values you can make decisions, e.g. +dnl | define constants in config.h +dnl | +dnl | if test "$TARGET_OS" = "unix"; then +dnl | AC_SUBST(POSIX_OS, 1) +dnl | AC_DEFINE_UNQUOTED([POSIX_OS], [1], [Whether OS is POSIX compliant]) +dnl | fi +dnl | +dnl | if test "$os_iphone" = "yes"; then +dnl | AC_SUBST(IPHONE_OS, 1) +dnl | AC_DEFINE_UNQUOTED([IPHONE_OS], [1], [Whether OS is iOS]) +dnl | fi \ No newline at end of file From f5ad73417b0e8a2bb5020aa962ce01fb437bbb7b Mon Sep 17 00:00:00 2001 From: Dmitry Belous Date: Thu, 21 Jul 2016 12:02:22 +0300 Subject: [PATCH 124/165] removed m4/ax_check_host_and_build_os.m4 and wrote guard to AX_TLS_SUPPORT using target_os and target_cpu variables from AC_CANONICAL_TARGET --- configure.ac | 7 +-- m4/ax_check_host_and_build_os.m4 | 85 -------------------------------- 2 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 m4/ax_check_host_and_build_os.m4 diff --git a/configure.ac b/configure.ac index 2ebc53b2d..24688f374 100644 --- a/configure.ac +++ b/configure.ac @@ -6,8 +6,6 @@ dnl libtool-2.4.2 AC_INIT([log4cplus],[1.2.0]) AC_CANONICAL_TARGET -m4_include([m4/ax_check_host_and_build_os.m4]) - AC_CONFIG_SRCDIR([src/logger.cxx]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.14 no-define no-dist nostdinc foreign subdir-objects -Wall]) @@ -538,9 +536,8 @@ dnl Multi threaded library. AS_IF([test "x$ac_cv_atomic_dec_uint_nv" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV])]) - if test "$os_iphone" != "yes"; then - AX_TLS_SUPPORT - fi + AS_IF([test "$target_os" != "darwin" -o "$target_cpu" != "arm", + [AX_TLS_SUPPORT]]) AH_TEMPLATE([LOG4CPLUS_HAVE_TLS_SUPPORT]) AH_TEMPLATE([LOG4CPLUS_THREAD_LOCAL_VAR]) AS_IF([test "x$ac_cv_thread_local" = "xyes"], diff --git a/m4/ax_check_host_and_build_os.m4 b/m4/ax_check_host_and_build_os.m4 deleted file mode 100644 index 2cd5ef20b..000000000 --- a/m4/ax_check_host_and_build_os.m4 +++ /dev/null @@ -1,85 +0,0 @@ -dnl | HOST -dnl | the type of system on which the package runs. By default it is the same as -dnl | the build machine. Specifying a host-type that differs from build-type, -dnl | when build-type was also explicitly specified, enables cross-compilation -dnl | mode. -dnl | -dnl | BUILD -dnl | the type of system on which the package is being configured and compiled. -dnl | It defaults to the result of running config.guess. Specifying a build-type -dnl | that differs from host-type enables cross-compilation mode. -dnl | -dnl | ref. https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Specifying-Target-Triplets.html#Specifying-Target-Triplets - -AC_CANONICAL_BUILD -AC_CANONICAL_HOST - -os_win32=no -os_linux=no -os_freebsd=no -os_gnu=no -os_iphone=no - -case "$host" in - *-mingw*|*-*-cygwin*) - os_win32=yes - TARGET_OS=windows - ;; - *-*-*netbsd*) - os_netbsd=yes - TARGET_OS=unix - ;; - *-*-*freebsd*) - os_freebsd=yes - TARGET_OS=unix - ;; - *-*-*openbsd*) - os_openbsd=yes - TARGET_OS=unix - ;; - *-*-linux*) - os_linux=yes - os_gnu=yes - TARGET_OS=unix - ;; - *-*-solaris*) - os_solaris=yes - TARGET_OS=unix - ;; - arm*-*-darwin*) - os_darwin=yes - os_iphone=yes - TARGET_OS=unix - ;; - *-*-darwin*) - os_darwin=yes - TARGET_OS=unix - ;; - gnu*|k*bsd*-gnu*) - os_gnu=yes - TARGET_OS=unix - ;; - *) - AC_MSG_WARN([*** Please add $host to configure.ac checks!]) - ;; -esac - - -dnl | you can use enable_crosscompile to check that we are cross compiling -enable_crosscompile=no -if test "x$host" != "x$build"; then - enable_crosscompile=yes -fi - -dnl | Now, based on above values you can make decisions, e.g. -dnl | define constants in config.h -dnl | -dnl | if test "$TARGET_OS" = "unix"; then -dnl | AC_SUBST(POSIX_OS, 1) -dnl | AC_DEFINE_UNQUOTED([POSIX_OS], [1], [Whether OS is POSIX compliant]) -dnl | fi -dnl | -dnl | if test "$os_iphone" = "yes"; then -dnl | AC_SUBST(IPHONE_OS, 1) -dnl | AC_DEFINE_UNQUOTED([IPHONE_OS], [1], [Whether OS is iOS]) -dnl | fi \ No newline at end of file From b1e26b367a0beab0186c7b783132951c125d4110 Mon Sep 17 00:00:00 2001 From: Dmitry Belous Date: Thu, 21 Jul 2016 12:10:31 +0300 Subject: [PATCH 125/165] configure.ac added comment about TLS check guards for iOS --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 24688f374..b558dee7b 100644 --- a/configure.ac +++ b/configure.ac @@ -536,6 +536,8 @@ dnl Multi threaded library. AS_IF([test "x$ac_cv_atomic_dec_uint_nv" = "xyes"], [AC_DEFINE([LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV])]) + dnl Check if TLS is supported, but only if it isn't iOS target, because it + dnl is forbidden by Apple Store to use __tlv_* functions. AS_IF([test "$target_os" != "darwin" -o "$target_cpu" != "arm", [AX_TLS_SUPPORT]]) AH_TEMPLATE([LOG4CPLUS_HAVE_TLS_SUPPORT]) From c1a1ae76766c2bde2719d17e460522cbc64244bf Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 25 Jul 2016 19:54:33 +0200 Subject: [PATCH 126/165] Fix 366c4af2af1b8f7d91efd528f1b080cd7cb580fc. Fix braces nesting. Regenerate the `configure` script. --- configure | 3 +++ configure.ac | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d1c349d51..2765cefcb 100755 --- a/configure +++ b/configure @@ -10585,6 +10585,7 @@ fi fi + if test "$target_os" != "darwin" -o "$target_cpu" != "arm"; then : @@ -10757,6 +10758,8 @@ fi fi +fi + if test "x$ac_cv_thread_local" = "xyes"; then : diff --git a/configure.ac b/configure.ac index 3d8f0993a..e5823a75c 100644 --- a/configure.ac +++ b/configure.ac @@ -538,8 +538,9 @@ dnl Multi threaded library. dnl Check if TLS is supported, but only if it isn't iOS target, because it dnl is forbidden by Apple Store to use __tlv_* functions. - AS_IF([test "$target_os" != "darwin" -o "$target_cpu" != "arm", - [AX_TLS_SUPPORT]]) + AS_IF([test "$target_os" != "darwin" -o "$target_cpu" != "arm"], + [AX_TLS_SUPPORT]) + AH_TEMPLATE([LOG4CPLUS_HAVE_TLS_SUPPORT]) AH_TEMPLATE([LOG4CPLUS_THREAD_LOCAL_VAR]) AS_IF([test "x$ac_cv_thread_local" = "xyes"], From 1465daef459d8bbca9df7a1ff36d603d3338eb0f Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 2 Aug 2016 20:55:21 +0200 Subject: [PATCH 127/165] Update config.{guess,sub} from upstream. --- config.guess | 350 ++++++++++++++++++--------------------------------- config.sub | 91 +++++++++----- 2 files changed, 187 insertions(+), 254 deletions(-) diff --git a/config.guess b/config.guess index b79252d6b..c4bd827a7 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2016-05-15' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ timestamp='2013-06-10' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -235,6 +256,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -251,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -359,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -393,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -579,8 +603,9 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -617,13 +642,13 @@ EOF sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -662,11 +687,11 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -679,12 +704,12 @@ EOF # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -789,14 +814,14 @@ EOF echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -826,7 +851,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -878,7 +903,7 @@ EOF exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -901,7 +926,7 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -932,6 +957,9 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -944,6 +972,9 @@ EOF ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -969,10 +1000,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1020,7 +1051,7 @@ EOF echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1099,7 +1130,7 @@ EOF # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1248,6 +1279,9 @@ EOF SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1260,22 +1294,32 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1306,7 +1350,7 @@ EOF # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1348,7 +1392,7 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1359,171 +1403,25 @@ EOF x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; -esac - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi +esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff --git a/config.sub b/config.sub index 8b612ab89..9feb73bf0 100755 --- a/config.sub +++ b/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2016-06-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ timestamp='2013-04-24' # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ timestamp='2013-04-24' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ timestamp='2013-04-24' me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -255,16 +254,18 @@ case $basic_machine in | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,14 +298,14 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -310,6 +313,7 @@ case $basic_machine in | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -324,7 +328,10 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -369,18 +376,20 @@ case $basic_machine in | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +409,10 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,16 +424,18 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -430,6 +443,7 @@ case $basic_machine in | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -506,6 +520,9 @@ case $basic_machine in basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -626,6 +643,14 @@ case $basic_machine in basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -767,6 +792,9 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -794,7 +822,7 @@ case $basic_machine in os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,6 +850,10 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -830,7 +862,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1354,27 +1386,28 @@ case $os in | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1506,6 +1539,8 @@ case $os in ;; -nacl*) ;; + -ios) + ;; -none) ;; *) @@ -1546,6 +1581,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1589,9 +1627,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; From 6adafa9d7bc9e56539cba90226dcd8d83955548d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Haisman?= Date: Fri, 19 Aug 2016 07:11:03 +0200 Subject: [PATCH 128/165] Fix SF#333. AsyncAppender's appenders need to be closed so that accumulated logs get flushed onto disk. --- src/asyncappender.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/asyncappender.cxx b/src/asyncappender.cxx index 4d06af829..4dd2e756e 100644 --- a/src/asyncappender.cxx +++ b/src/asyncappender.cxx @@ -160,6 +160,8 @@ AsyncAppender::close () getErrorHandler ()->error ( LOG4CPLUS_TEXT ("Error in AsyncAppender::close")); queue_thread->join (); + + removeAllAppenders(); } From 0bb509c195900246413a4ed189361642b4168dbd Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 3 Oct 2016 18:56:36 +0200 Subject: [PATCH 129/165] Fix GitHub bug #195. Check if queue thread pointer is not NULL and if it is running before trying to join it. --- src/asyncappender.cxx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/asyncappender.cxx b/src/asyncappender.cxx index 4dd2e756e..fe55bf7ff 100644 --- a/src/asyncappender.cxx +++ b/src/asyncappender.cxx @@ -1,15 +1,15 @@ -// Copyright (C) 2009-2015, Vaclav Haisman. All rights reserved. -// +// Copyright (C) 2009-2016, Vaclav Haisman. All rights reserved. +// // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: -// +// // 1. Redistributions of source code must retain the above copyright notice, // this list of conditions and the following disclaimer. -// +// // 2. Redistributions in binary form must reproduce the above copyright notice, // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. -// +// // THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND // FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -159,8 +159,10 @@ AsyncAppender::close () if (ret & (thread::Queue::ERROR_BIT | thread::Queue::ERROR_AFTER)) getErrorHandler ()->error ( LOG4CPLUS_TEXT ("Error in AsyncAppender::close")); - queue_thread->join (); - + + if (queue_thread && queue_thread->isRunning ()) + queue_thread->join (); + removeAllAppenders(); } From 2bd0a131f4c39fe287b9b37c4dd3259a4da25b76 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 11 Nov 2016 23:04:00 +0100 Subject: [PATCH 130/165] Update android.toolchain.cmake from OpenCV. --- android/android.toolchain.cmake | 82 +++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 18 deletions(-) diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake index 07100ee33..1d69b7504 100644 --- a/android/android.toolchain.cmake +++ b/android/android.toolchain.cmake @@ -65,6 +65,7 @@ # "armeabi" - ARMv5TE based CPU with software floating point operations # "armeabi-v7a" - ARMv7 based devices with hardware FPU instructions # this ABI target is used by default +# "armeabi-v7a-hard with NEON" - ARMv7 based devices with hardware FPU instructions and hardfp # "armeabi-v7a with NEON" - same as armeabi-v7a, but # sets NEON as floating-point unit # "armeabi-v7a with VFPV3" - same as armeabi-v7a, but @@ -154,6 +155,10 @@ # Implies -frtti -fno-exceptions. # Available for NDK r7b and newer. # Silently degrades to gnustl_static if not available. +# c++_static -> Use the LLVM libc++ runtime as a static library. +# Implies -frtti -fexceptions. +# c++_shared -> Use the LLVM libc++ runtime as a static library. +# Implies -frtti -fno-exceptions. # # ANDROID_STL_FORCE_FEATURES=ON - turn rtti and exceptions support based on # chosen runtime. If disabled, then the user is responsible for settings @@ -178,7 +183,7 @@ # ANDROID and BUILD_ANDROID will be set to true, you may test any of these # variables to make necessary Android-specific configuration changes. # -# Also ARMEABI or ARMEABI_V7A or X86 or MIPS or ARM64_V8A or X86_64 or MIPS64 +# Also ARMEABI or ARMEABI_V7A or ARMEABI_V7A_HARD or X86 or MIPS or ARM64_V8A or X86_64 or MIPS64 # will be set true, mutually exclusive. NEON option will be set true # if VFP is set to NEON. # @@ -231,7 +236,7 @@ if( NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH ) endif() # known ABIs -set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" ) +set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a-hard with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" ) set( ANDROID_SUPPORTED_ABIS_arm64 "arm64-v8a" ) set( ANDROID_SUPPORTED_ABIS_x86 "x86" ) set( ANDROID_SUPPORTED_ABIS_x86_64 "x86_64" ) @@ -239,7 +244,7 @@ set( ANDROID_SUPPORTED_ABIS_mips "mips" ) set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" ) # API level defaults -set( ANDROID_DEFAULT_NDK_API_LEVEL 8 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL 9 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 ) @@ -598,7 +603,7 @@ if( BUILD_WITH_ANDROID_NDK ) endif() if( NOT __availableToolchains ) file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK_TOOLCHAINS_PATH}" "${ANDROID_NDK_TOOLCHAINS_PATH}/*" ) - if( __availableToolchains ) + if( __availableToolchainsLst ) list(SORT __availableToolchainsLst) # we need clang to go after gcc endif() __LIST_FILTER( __availableToolchainsLst "^[.]" ) @@ -711,6 +716,14 @@ elseif( ANDROID_ABI STREQUAL "armeabi-v7a with NEON" ) set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) set( VFPV3 true ) set( NEON true ) +elseif( ANDROID_ABI STREQUAL "armeabi-v7a-hard with NEON" ) + set( ARMEABI_V7A_HARD true ) + set( ANDROID_NDK_ABI_NAME "armeabi-v7a-hard" ) + set( ANDROID_ARCH_NAME "arm" ) + set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) + set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) + set( VFPV3 true ) + set( NEON true ) else() message( SEND_ERROR "Unknown ANDROID_ABI=\"${ANDROID_ABI}\" is specified." ) endif() @@ -833,7 +846,7 @@ set( ANDROID_STL_FORCE_FEATURES ON CACHE BOOL "automatically configure rtti and mark_as_advanced( ANDROID_STL ANDROID_STL_FORCE_FEATURES ) if( BUILD_WITH_ANDROID_NDK ) - if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared)$") + if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared|c\\+\\+_static|c\\+\\+_shared)$") message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". The possible values are: none -> Do not configure the runtime. @@ -845,15 +858,19 @@ The possible values are: stlport_shared -> Use the STLport runtime as a shared library. gnustl_static -> (default) Use the GNU STL as a static library. gnustl_shared -> Use the GNU STL as a shared library. + c++_shared -> Use the LLVM libc++ runtime as a shared library. + c++_static -> Use the LLVM libc++ runtime as a static library. " ) endif() elseif( BUILD_WITH_STANDALONE_TOOLCHAIN ) - if( NOT "${ANDROID_STL}" MATCHES "^(none|gnustl_static|gnustl_shared)$") + if( NOT "${ANDROID_STL}" MATCHES "^(none|gnustl_static|gnustl_shared|c\\+\\+_static|c\\+\\+_shared)$") message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". The possible values are: none -> Do not configure the runtime. gnustl_static -> (default) Use the GNU STL as a static library. gnustl_shared -> Use the GNU STL as a shared library. + c++_shared -> Use the LLVM libc++ runtime as a shared library. + c++_static -> Use the LLVM libc++ runtime as a static library. " ) endif() endif() @@ -904,7 +921,7 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) # old location ( pre r8c ) set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" ) endif() - if( ARMEABI_V7A AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}/bits" ) + if( (ARMEABI_V7A OR ARMEABI_V7A_HARD) AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}/bits" ) list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}" ) elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb/bits" ) list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb" ) @@ -912,9 +929,9 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" ) endif() # always search static GNU STL to get the location of libsupc++.a - if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" ) + if( (ARMEABI_V7A OR ARMEABI_V7A_HARD) AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" ) set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" ) - elseif( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libstdc++.a" ) + elseif( (ARMEABI_V7A OR ARMEABI_V7A_HARD) AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libstdc++.a" ) set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}" ) elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libstdc++.a" ) set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb" ) @@ -935,7 +952,7 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) " ) endif() if( ANDROID_STL STREQUAL "gnustl_shared" ) - if( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) + if( (ARMEABI_V7A OR ARMEABI_V7A_HARD) AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" ) set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" ) @@ -987,7 +1004,7 @@ if( BUILD_WITH_ANDROID_NDK ) set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" ) elseif( ANDROID_STL MATCHES "gabi" ) if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 - message( FATAL_ERROR "gabi++ is not awailable in your NDK. You have to upgrade to NDK r7 or newer to use gabi++.") + message( FATAL_ERROR "gabi++ is not available in your NDK. You have to upgrade to NDK r7 or newer to use gabi++.") endif() set( ANDROID_RTTI ON ) set( ANDROID_EXCEPTIONS OFF ) @@ -1026,9 +1043,16 @@ if( BUILD_WITH_ANDROID_NDK ) else() set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libstdc++.a" ) endif() + elseif( ANDROID_STL MATCHES "c\\+\\+" ) + set( ANDROID_EXCEPTIONS ON ) + set( ANDROID_RTTI ON ) + set( __libstl "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++" ) + set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libc++_static.a" ) + set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/android/support/include" "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include" "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" ) else() message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" ) endif() + # find libsupc++.a - rtti & exceptions if( ANDROID_STL STREQUAL "system_re" OR ANDROID_STL MATCHES "gnustl" ) set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r8b or newer @@ -1058,7 +1082,9 @@ endif() # case of shared STL linkage if( ANDROID_STL MATCHES "shared" AND DEFINED __libstl ) string( REPLACE "_static.a" "_shared.so" __libstl "${__libstl}" ) - # TODO: check if .so file exists before the renaming + if( NOT EXISTS "${__libstl}" ) + message( FATAL_ERROR "Unable to find shared library ${__libstl}" ) + endif() endif() @@ -1098,7 +1124,12 @@ if( NOT CMAKE_C_COMPILER ) endif() set( CMAKE_ASM_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "assembler" ) set( CMAKE_STRIP "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-strip${TOOL_OS_SUFFIX}" CACHE PATH "strip" ) - set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) + if( EXISTS "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}" ) + # Use gcc-ar if we have it for better LTO support. + set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) + else() + set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) + endif() set( CMAKE_LINKER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ld${TOOL_OS_SUFFIX}" CACHE PATH "linker" ) set( CMAKE_NM "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-nm${TOOL_OS_SUFFIX}" CACHE PATH "nm" ) set( CMAKE_OBJCOPY "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objcopy${TOOL_OS_SUFFIX}" CACHE PATH "objcopy" ) @@ -1193,7 +1224,7 @@ if (ARM64_V8A ) if( NOT ANDROID_COMPILER_IS_CLANG ) set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" ) endif() -elseif( ARMEABI OR ARMEABI_V7A) +elseif( ARMEABI OR ARMEABI_V7A OR ARMEABI_V7A_HARD) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) if( NOT ANDROID_FORCE_ARM_BUILD AND NOT ARMEABI_V6 ) set( ANDROID_CXX_FLAGS_RELEASE "-mthumb -fomit-frame-pointer -fno-strict-aliasing" ) @@ -1240,7 +1271,16 @@ if( NOT ANDROID_COMPILER_VERSION VERSION_LESS "4.6" ) endif() # ABI-specific flags -if( ARMEABI_V7A ) +if( ARMEABI_V7A_HARD ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a -mfloat-abi=hard -mhard-float -D_NDK_MATH_NO_SOFTFP=1" ) + if( NEON ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=neon" ) + elseif( VFPV3 ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3" ) + else() + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3-d16" ) + endif() +elseif( ARMEABI_V7A ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a -mfloat-abi=softfp" ) if( NEON ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=neon" ) @@ -1249,6 +1289,7 @@ if( ARMEABI_V7A ) else() set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3-d16" ) endif() + elseif( ARMEABI_V6 ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv6 -mfloat-abi=softfp -mfpu=vfp" ) # vfp == vfpv2 elseif( ARMEABI ) @@ -1325,6 +1366,10 @@ if( ARMEABI_V7A ) set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--fix-cortex-a8" ) endif() +if( ARMEABI_V7A_HARD ) + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-warn-mismatch -lm_hard" ) +endif() + if( ANDROID_NO_UNDEFINED ) if( MIPS ) # there is some sysroot-related problem in mips linker... @@ -1346,7 +1391,7 @@ if( ANDROID_FUNCTION_LEVEL_LINKING ) endif() if( ANDROID_COMPILER_VERSION VERSION_EQUAL "4.6" ) - if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE_NUM GREATER 8002) AND (ARMEABI OR ARMEABI_V7A OR X86) ) + if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE_NUM GREATER 8002) AND (ARMEABI OR ARMEABI_V7A OR ARMEABI_V7A_HARD OR X86) ) set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=gold" ) elseif( ANDROID_NDK_RELEASE_NUM GREATER 8002 ) # after r8b set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=bfd" ) @@ -1621,7 +1666,7 @@ endif() # Variables controlling behavior or set by cmake toolchain: -# ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips", "arm64-v8a", "x86_64", "mips64" +# ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a-hard with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips", "arm64-v8a", "x86_64", "mips64" # ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14,15,16,17,18,19,21 (depends on NDK version) # ANDROID_STL : gnustl_static/gnustl_shared/stlport_static/stlport_shared/gabi++_static/gabi++_shared/system_re/system/none # ANDROID_FORBID_SYGWIN : ON/OFF @@ -1648,6 +1693,7 @@ endif() # ARMEABI : TRUE for arm v6 and older devices # ARMEABI_V6 : TRUE for arm v6 # ARMEABI_V7A : TRUE for arm v7a +# ARMEABI_V7A_HARD : TRUE for arm v7a with hardfp # ARM64_V8A : TRUE for arm64-v8a # NEON : TRUE if NEON unit is enabled # VFPV3 : TRUE if VFP version 3 is enabled @@ -1658,7 +1704,7 @@ endif() # BUILD_WITH_ANDROID_NDK : TRUE if NDK is used # BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used # ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform -# ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86", "mips", "arm64-v8a", "x86_64", "mips64" depending on ANDROID_ABI +# ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "armeabi-v7a-hard", "x86", "mips", "arm64-v8a", "x86_64", "mips64" depending on ANDROID_ABI # ANDROID_NDK_RELEASE : from r5 to r10d; set only for NDK # ANDROID_NDK_RELEASE_NUM : numeric ANDROID_NDK_RELEASE version (1000*major+minor) # ANDROID_ARCH_NAME : "arm", "x86", "mips", "arm64", "x86_64", "mips64" depending on ANDROID_ABI From 429e0252850397040d9b04c1c30604ad00eaa3a8 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 17 Jan 2017 19:50:24 +0100 Subject: [PATCH 131/165] Update version to 1.2.1. --- README.md | 4 ---- configure | 22 +++++++++++----------- configure.ac | 4 ++-- cygport/log4cplus.cygport | 2 +- docs/doxygen.config | 4 ++-- docs/webpage_doxygen.config | 4 ++-- include/log4cplus/version.h | 12 ++++++------ log4cplus.spec | 2 +- mingw-log4cplus.spec | 4 ++-- 9 files changed, 27 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 223665af6..ee4402994 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,6 @@ configuration. It is modeled after the Java log4j API. [log4cplus]: https://sourceforge.net/projects/log4cplus/ -Branches | Travis-CI | AppVeyor-CI | -----------------|--------------- |-------------|- -master | [![Build Status](https://travis-ci.org/log4cplus/log4cplus.svg?branch=1.2.x)](https://travis-ci.org/log4cplus/log4cplus) | TBD | -------------------------------------------------- Latest Project Information ========================== diff --git a/configure b/configure index 2765cefcb..ae093e969 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for log4cplus 1.2.0. +# Generated by GNU Autoconf 2.69 for log4cplus 1.2.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='log4cplus' PACKAGE_TARNAME='log4cplus' -PACKAGE_VERSION='1.2.0' -PACKAGE_STRING='log4cplus 1.2.0' +PACKAGE_VERSION='1.2.1' +PACKAGE_STRING='log4cplus 1.2.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1402,7 +1402,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures log4cplus 1.2.0 to adapt to many kinds of systems. +\`configure' configures log4cplus 1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1473,7 +1473,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of log4cplus 1.2.0:";; + short | recursive ) echo "Configuration of log4cplus 1.2.1:";; esac cat <<\_ACEOF @@ -1621,7 +1621,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -log4cplus configure 1.2.0 +log4cplus configure 1.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2168,7 +2168,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by log4cplus $as_me 1.2.0, which was +It was created by log4cplus $as_me 1.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3143,7 +3143,7 @@ fi # Define the identity of the package. PACKAGE='log4cplus' - VERSION='1.2.0' + VERSION='1.2.1' # Some tools Automake needs. @@ -4470,7 +4470,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=6:4:1 +LT_VERSION=6:5:1 LT_RELEASE=1.2 @@ -23833,7 +23833,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by log4cplus $as_me 1.2.0, which was +This file was extended by log4cplus $as_me 1.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23899,7 +23899,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -log4cplus config.status 1.2.0 +log4cplus config.status 1.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e5823a75c..0726209fa 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl autoconf-2.69 dnl automake-1.14.1 dnl libtool-2.4.2 -AC_INIT([log4cplus],[1.2.0]) +AC_INIT([log4cplus],[1.2.1]) AC_CANONICAL_TARGET AC_CONFIG_SRCDIR([src/logger.cxx]) AC_CONFIG_MACRO_DIR([m4]) @@ -20,7 +20,7 @@ AM_PROG_AR # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=6:4:1 +LT_VERSION=6:5:1 LT_RELEASE=1.2 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) diff --git a/cygport/log4cplus.cygport b/cygport/log4cplus.cygport index d6be0a9a1..f12fb9fcd 100644 --- a/cygport/log4cplus.cygport +++ b/cygport/log4cplus.cygport @@ -1,5 +1,5 @@ NAME=log4cplus -VERSION=1.2.0-rc1 +VERSION=1.2.1-rc1 RELEASE=1 CATEGORY="Libs" SUMMARY="C++ logging library" diff --git a/docs/doxygen.config b/docs/doxygen.config index 35397790b..1d4911092 100644 --- a/docs/doxygen.config +++ b/docs/doxygen.config @@ -32,7 +32,7 @@ PROJECT_NAME = log4cplus # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.2.0 +PROJECT_NUMBER = 1.2.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer @@ -52,7 +52,7 @@ PROJECT_LOGO = # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = log4cplus-1.2.0/docs +OUTPUT_DIRECTORY = log4cplus-1.2.1/docs # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output diff --git a/docs/webpage_doxygen.config b/docs/webpage_doxygen.config index 67adfffa6..c9ca54060 100644 --- a/docs/webpage_doxygen.config +++ b/docs/webpage_doxygen.config @@ -32,7 +32,7 @@ PROJECT_NAME = log4cplus # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.2.0 +PROJECT_NUMBER = 1.2.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer @@ -52,7 +52,7 @@ PROJECT_LOGO = # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = webpage_docs-1.2.0 +OUTPUT_DIRECTORY = webpage_docs-1.2.1 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output diff --git a/include/log4cplus/version.h b/include/log4cplus/version.h index b562a75d2..151ad1644 100644 --- a/include/log4cplus/version.h +++ b/include/log4cplus/version.h @@ -1,16 +1,16 @@ // -*- C++ -*- // Copyright (C) 2010-2015, Vaclav Haisman. All rights reserved. -// +// // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: -// +// // 1. Redistributions of source code must retain the above copyright notice, // this list of conditions and the following disclaimer. -// +// // 2. Redistributions in binary form must reproduce the above copyright notice, // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. -// +// // THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND // FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -41,10 +41,10 @@ //! This is log4cplus version number as unsigned integer. This must //! be kept on a single line. It is used by Autotool and CMake build //! systems to parse version number. -#define LOG4CPLUS_VERSION LOG4CPLUS_MAKE_VERSION(1, 2, 0) +#define LOG4CPLUS_VERSION LOG4CPLUS_MAKE_VERSION(1, 2, 1) //! This is log4cplus version number as a string. -#define LOG4CPLUS_VERSION_STR LOG4CPLUS_MAKE_VERSION_STR(1, 2, 0) +#define LOG4CPLUS_VERSION_STR LOG4CPLUS_MAKE_VERSION_STR(1, 2, 1) namespace log4cplus diff --git a/log4cplus.spec b/log4cplus.spec index 35a3ce3d5..68471732f 100644 --- a/log4cplus.spec +++ b/log4cplus.spec @@ -1,5 +1,5 @@ Name: log4cplus -Version: 1.2.0 +Version: 1.2.1 Release: 1 Summary: log4cplus, C++ logging library diff --git a/mingw-log4cplus.spec b/mingw-log4cplus.spec index b8fbb544a..b5d020c71 100755 --- a/mingw-log4cplus.spec +++ b/mingw-log4cplus.spec @@ -1,12 +1,12 @@ Name: log4cplus -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: log4cplus, C++ logging library License: Apache Group: Development/Libraries URL: http://log4cplus.sourceforge.net/ -Source0: http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/1.2.0/log4cplus-1.2.0.tar.gz +Source0: http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/1.2.1/log4cplus-1.2.1.tar.gz BuildArch: noarch From fd78998b970dcc76d6016427f0134de49656eec3 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Thu, 20 Oct 2016 22:12:18 +0200 Subject: [PATCH 132/165] Fix NULL pointer dereference. Fix NULL pointer dereference of queue in AsyncAppender code. GH#205. --- src/asyncappender.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/asyncappender.cxx b/src/asyncappender.cxx index fe55bf7ff..f45d11f0b 100644 --- a/src/asyncappender.cxx +++ b/src/asyncappender.cxx @@ -155,15 +155,21 @@ AsyncAppender::init_queue_thread (unsigned queue_len) void AsyncAppender::close () { - unsigned ret = queue->signal_exit (); - if (ret & (thread::Queue::ERROR_BIT | thread::Queue::ERROR_AFTER)) - getErrorHandler ()->error ( - LOG4CPLUS_TEXT ("Error in AsyncAppender::close")); + if (queue) + { + unsigned ret = queue->signal_exit (); + if (ret & (thread::Queue::ERROR_BIT | thread::Queue::ERROR_AFTER)) + getErrorHandler ()->error ( + LOG4CPLUS_TEXT ("Error in AsyncAppender::close")); + } if (queue_thread && queue_thread->isRunning ()) queue_thread->join (); removeAllAppenders(); + + queue_thread = nullptr; + queue = nullptr; } From 2f6ea6ccb3fe97dd54f75e4afbeee2e484dfd1f7 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 17 Jan 2017 20:45:09 +0100 Subject: [PATCH 133/165] Update ChangeLog for 1.2.1-RC1. --- ChangeLog | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 828527d62..8f81be625 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,36 @@ +log4cplus 1.2.1-RC1 +--------------- + + - GitHub issue #205. Fixed `AsyncAppender` shutdown crash. + + - Fix GitHub bug #195. Check if queue thread pointer is not NULL and if it + is running before trying to join it. + + - Fixed GitHub bug #136. Adjust weekly, daily and twice daily rollover time + for `DailyRollingFileAppender` by time zone offset so that the rollover + happens at midnight, etc., of local time instead of UTC time. + + - Fixed GitHub bug #148. `TTCCLayout` boolean members could be left + uninitialized. Initialize them. + + - Fixed GitHub bug #163. Fixed Visual Studio 2015 build with + CMake. Compilation fails not finding `FreeAddrInfoW()`. + + - Disabled use of `__thread` on iOS. + + - Fixed SF#333. `AsyncAppender`'s appenders need to be closed so that + accumulated logs get flushed onto disk. + + - Updated `android.toolchain.cmake` from OpenCV project. + + log4cplus 1.2.0 --------------- - Fixed SourceForge bug #324, MinGW compilation issue. Use `InterlockedExchangeAdd` instead of `InterlockedAdd`. The former is supported by older MinGW. - + - Fixed GitHub bug #137. Fix missing thread's alternative name. From cbdc1eb76487be87055c20d643d89986b3d6a3c3 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 17 Jan 2017 20:48:03 +0100 Subject: [PATCH 134/165] Avoid `nullptr` on 1.2.x branch. --- src/asyncappender.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/asyncappender.cxx b/src/asyncappender.cxx index f45d11f0b..2013d100c 100644 --- a/src/asyncappender.cxx +++ b/src/asyncappender.cxx @@ -168,8 +168,8 @@ AsyncAppender::close () removeAllAppenders(); - queue_thread = nullptr; - queue = nullptr; + queue_thread = 0; + queue = 0; } From 9dc15d6b86ef3dd479f27f18ce871b9dc5821d83 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 23 Jan 2017 12:56:50 +0100 Subject: [PATCH 135/165] Make sure HierarchyLocker dtor does not call terminate(). GitHub issue #215. Mark `~HierarchyLocker()` with `noexcept(false)` to avoid unlikely but possible `terminate()` call and a warning message during compilation. --- include/log4cplus/config.hxx | 7 +++++++ include/log4cplus/hierarchylocker.h | 15 +++++++-------- src/hierarchylocker.cxx | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/include/log4cplus/config.hxx b/include/log4cplus/config.hxx index b523e167b..eca2a0470 100644 --- a/include/log4cplus/config.hxx +++ b/include/log4cplus/config.hxx @@ -109,6 +109,13 @@ # define LOG4CPLUS_HAVE_RVALUE_REFS #endif +#if defined (LOG4CPLUS_HAVE_CXX11_SUPPORT) \ + || __has_feature(cxx_noexcept) +# define LOG4CPLUS_NOEXCEPT_FALSE noexcept(false) +#else +# define LOG4CPLUS_NOEXCEPT_FALSE /* empty */ +#endif + #if ! defined (UNICODE) && defined (__GNUC__) && __GNUC__ >= 3 # define LOG4CPLUS_FORMAT_ATTRIBUTE(archetype, format_index, first_arg_index) \ __attribute__ ((format (archetype, format_index, first_arg_index))) diff --git a/include/log4cplus/hierarchylocker.h b/include/log4cplus/hierarchylocker.h index caec7c32d..dda136769 100644 --- a/include/log4cplus/hierarchylocker.h +++ b/include/log4cplus/hierarchylocker.h @@ -48,25 +48,25 @@ namespace log4cplus public: // ctor & dtor HierarchyLocker(Hierarchy& h); - ~HierarchyLocker(); - + ~HierarchyLocker() LOG4CPLUS_NOEXCEPT_FALSE; + /** * Calls the resetConfiguration() method on the locked Hierarchy. */ - void resetConfiguration(); - + void resetConfiguration(); + /** * Calls the getInstance() method on the locked Hierarchy. */ Logger getInstance(const log4cplus::tstring& name); - + /** * Calls the getInstance() method on the locked Hierarchy. */ Logger getInstance(const log4cplus::tstring& name, spi::LoggerFactory& factory); - + void addAppender(Logger &logger, log4cplus::SharedAppenderPtr& appender); - + private: // Data Hierarchy& h; @@ -77,4 +77,3 @@ namespace log4cplus } // end namespace log4cplus #endif // LOG4CPLUS_HIERARCHY_LOCKER_HEADER_ - diff --git a/src/hierarchylocker.cxx b/src/hierarchylocker.cxx index 3badc2d12..9351a8a40 100644 --- a/src/hierarchylocker.cxx +++ b/src/hierarchylocker.cxx @@ -61,7 +61,7 @@ HierarchyLocker::HierarchyLocker(Hierarchy& _h) } -HierarchyLocker::~HierarchyLocker() +HierarchyLocker::~HierarchyLocker() LOG4CPLUS_NOEXCEPT_FALSE { try { for(LoggerList::iterator it=loggerList.begin(); it!=loggerList.end(); ++it) { From cca0dd5127b364a1f574f48ed9f76bb91f17e8c9 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 23 Jan 2017 13:37:52 +0100 Subject: [PATCH 136/165] Define `LOG4CPLUS_NOEXCEPT_FALSE` for Visual Studio 2015+. --- include/log4cplus/config.hxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/log4cplus/config.hxx b/include/log4cplus/config.hxx index eca2a0470..471e0f3aa 100644 --- a/include/log4cplus/config.hxx +++ b/include/log4cplus/config.hxx @@ -109,8 +109,9 @@ # define LOG4CPLUS_HAVE_RVALUE_REFS #endif -#if defined (LOG4CPLUS_HAVE_CXX11_SUPPORT) \ - || __has_feature(cxx_noexcept) +#if defined (LOG4CPLUS_HAVE_CXX11_SUPPORT) \ + && (__has_feature(cxx_noexcept) \ + || (defined (_MSC_VER) && _MSC_VER >= 1900)) # define LOG4CPLUS_NOEXCEPT_FALSE noexcept(false) #else # define LOG4CPLUS_NOEXCEPT_FALSE /* empty */ From d7b3afe69f455924811619461cc92b2211e2d839 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 29 Jan 2017 19:23:51 +0100 Subject: [PATCH 137/165] Fix syncprims error message format. --- src/syncprims.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/syncprims.cxx b/src/syncprims.cxx index fdda272de..44ae0859a 100644 --- a/src/syncprims.cxx +++ b/src/syncprims.cxx @@ -40,7 +40,7 @@ syncprims_throw_exception (char const * const msg, char const * const file, int line) { std::ostringstream oss; - oss << file << ":" << line << msg; + oss << file << ":" << line << ": " << msg; throw std::runtime_error (oss.str ()); } From c53506db7cc7402cd3dbb906377fc32f2d591c60 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 29 Jan 2017 19:26:32 +0100 Subject: [PATCH 138/165] Print exception message in Queue implementation. It is better to print the error message than to hide it. --- src/queue.cxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/queue.cxx b/src/queue.cxx index 08e8896a7..635e3984a 100644 --- a/src/queue.cxx +++ b/src/queue.cxx @@ -79,7 +79,9 @@ Queue::put_event (spi::InternalLoggingEvent const & ev) } catch (std::runtime_error const & e) { - (void)e; + log4cplus::helpers::getLogLog().error( + LOG4CPLUS_TEXT("put_event() exception: ") + + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); return ret_flags; } @@ -114,7 +116,9 @@ Queue::signal_exit (bool drain) } catch (std::runtime_error const & e) { - (void)e; + log4cplus::helpers::getLogLog().error( + LOG4CPLUS_TEXT("signal_exit() exception: ") + + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); ret_flags |= ERROR_BIT; return ret_flags; } @@ -174,7 +178,9 @@ Queue::get_events (queue_storage_type * buf) } catch (std::runtime_error const & e) { - (void)e; + log4cplus::helpers::getLogLog().error( + LOG4CPLUS_TEXT("get_events() exception: ") + + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); ret_flags |= ERROR_BIT; } From 57930a14fa6da97dfecb07496d0017f53f8d3bce Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 29 Jan 2017 22:56:59 +0100 Subject: [PATCH 139/165] `sem_wait` is interruptible by signals, handle it. SF#334. --- include/log4cplus/thread/impl/syncprims-pthreads.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/log4cplus/thread/impl/syncprims-pthreads.h b/include/log4cplus/thread/impl/syncprims-pthreads.h index 3a8f7dff0..46b2c85f9 100644 --- a/include/log4cplus/thread/impl/syncprims-pthreads.h +++ b/include/log4cplus/thread/impl/syncprims-pthreads.h @@ -245,11 +245,17 @@ inline void Semaphore::lock () const { + int ret; + while (LOG4CPLUS_UNLIKELY (( #if defined (LOG4CPLUS_USE_NAMED_POSIX_SEMAPHORE) - int ret = sem_wait (sem); + ret = sem_wait (sem) #else - int ret = sem_wait (&sem); + ret = sem_wait (&sem) #endif + ) == -1) + && errno == EINTR) + { /* try again after signal */ } + if (LOG4CPLUS_UNLIKELY (ret != 0)) LOG4CPLUS_THROW_RTE ("Semaphore::lock"); } From 04fcd97d3afb529e6cf00d72eef1ae78d1cb8c00 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 30 Jan 2017 12:27:50 +0100 Subject: [PATCH 140/165] Don't try to use language level TLS on Cygwin. Cygwin passes the compilation and link test in configure script but fails during linking of the real code, so we want to avoid it. See GCC PR64697. --- configure | 3 ++- configure.ac | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ae093e969..f18b8894e 100755 --- a/configure +++ b/configure @@ -10585,7 +10585,8 @@ fi fi - if test "$target_os" != "darwin" -o "$target_cpu" != "arm"; then : + if test \( "$target_os" != "darwin" -o "$target_cpu" != "arm" \) \ + -a "$target_os" != "cygwin"; then : diff --git a/configure.ac b/configure.ac index 0726209fa..d68573e9c 100644 --- a/configure.ac +++ b/configure.ac @@ -537,8 +537,11 @@ dnl Multi threaded library. [AC_DEFINE([LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV])]) dnl Check if TLS is supported, but only if it isn't iOS target, because it - dnl is forbidden by Apple Store to use __tlv_* functions. - AS_IF([test "$target_os" != "darwin" -o "$target_cpu" != "arm"], + dnl is forbidden by Apple Store to use __tlv_* functions. Also, Cygwin + dnl passes the compilation and link test here but fails during linking of + dnl the real code, so we want to avoid it too. See GCC PR64697. + AS_IF([test \( "$target_os" != "darwin" -o "$target_cpu" != "arm" \) \ + -a "$target_os" != "cygwin"], [AX_TLS_SUPPORT]) AH_TEMPLATE([LOG4CPLUS_HAVE_TLS_SUPPORT]) From 4529e6876314af3ce35fca24749fbd870817cc61 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 30 Jan 2017 21:35:53 +0100 Subject: [PATCH 141/165] Avoid warning. Rearrange loop around `sem_wait()` to avoid "embedding a directive within macro arguments is not portable" warning. --- include/log4cplus/thread/impl/syncprims-pthreads.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/log4cplus/thread/impl/syncprims-pthreads.h b/include/log4cplus/thread/impl/syncprims-pthreads.h index 46b2c85f9..a35cad249 100644 --- a/include/log4cplus/thread/impl/syncprims-pthreads.h +++ b/include/log4cplus/thread/impl/syncprims-pthreads.h @@ -246,13 +246,12 @@ void Semaphore::lock () const { int ret; - while (LOG4CPLUS_UNLIKELY (( + while ( #if defined (LOG4CPLUS_USE_NAMED_POSIX_SEMAPHORE) - ret = sem_wait (sem) + LOG4CPLUS_UNLIKELY ((ret = sem_wait (sem)) == -1) #else - ret = sem_wait (&sem) + LOG4CPLUS_UNLIKELY ((ret = sem_wait (&sem)) == -1) #endif - ) == -1) && errno == EINTR) { /* try again after signal */ } From 83e91a5da0c2205a1aca3abb064da1fe3942621e Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Mon, 30 Jan 2017 21:50:49 +0100 Subject: [PATCH 142/165] Allow filters configuration for AsyncAppender. Allow filters configuration (and other properties) for AsyncAppender by calling base Appender ctor with properties argument. This was suggested in SF#297 by Markus von Arx. --- src/asyncappender.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/asyncappender.cxx b/src/asyncappender.cxx index 2013d100c..d0f239326 100644 --- a/src/asyncappender.cxx +++ b/src/asyncappender.cxx @@ -100,6 +100,7 @@ AsyncAppender::AsyncAppender (SharedAppenderPtr const & app, AsyncAppender::AsyncAppender (helpers::Properties const & props) + : Appender (props) { tstring const & appender_name ( props.getProperty (LOG4CPLUS_TEXT ("Appender"))); From f3e4218aa9978a8d31804045513d9496a6a9b62d Mon Sep 17 00:00:00 2001 From: Enrico Jorns Date: Thu, 7 Apr 2016 11:14:42 +0200 Subject: [PATCH 143/165] Fix cmake_minimum_required to be 2.8.12 The src/CMakeLists.txt makes use of the `INCLUDES DESTINATION` install argument which was introduced into CMake with rev '650e61f'. The first CMake release including this rev is 2.8.12. Thus the minimum required CMake version must be adjusted to 2.8.12. Signed-off-by: Enrico Jorns --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4709abd1..f335ea19f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ endif () set (CMAKE_LEGACY_CYGWIN_WIN32 0) project (log4cplus) -cmake_minimum_required (VERSION 2.8.4) +cmake_minimum_required (VERSION 2.8.12) enable_language (CXX) include(GNUInstallDirs) From e73655b25fbfc4f5c62ea381142baf63d8ddc66b Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 28 Feb 2017 09:43:51 +0100 Subject: [PATCH 144/165] Fix GitHub issue #136. --- src/fileappender.cxx | 206 +++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 107 deletions(-) diff --git a/src/fileappender.cxx b/src/fileappender.cxx index bb14d25bd..11ff00479 100644 --- a/src/fileappender.cxx +++ b/src/fileappender.cxx @@ -742,48 +742,6 @@ DailyRollingFileAppender::init(DailyRollingFileSchedule sch) Time now = Time::gettimeofday(); now.usec(0); - struct tm time; - now.localtime(&time); - - time.tm_sec = 0; - switch (schedule) - { - case MONTHLY: - time.tm_mday = 1; - time.tm_hour = 0; - time.tm_min = 0; - break; - - case WEEKLY: - time.tm_mday -= (time.tm_wday % 7); - time.tm_hour = 0; - time.tm_min = 0; - break; - - case DAILY: - time.tm_hour = 0; - time.tm_min = 0; - break; - - case TWICE_DAILY: - if(time.tm_hour >= 12) { - time.tm_hour = 12; - } - else { - time.tm_hour = 0; - } - time.tm_min = 0; - break; - - case HOURLY: - time.tm_min = 0; - break; - - case MINUTELY: - break; - }; - now.setTime(&time); - scheduledFilename = getFilename(now); nextRolloverTime = calculateNextRolloverTime(now); } @@ -908,57 +866,127 @@ DailyRollingFileAppender::rollover(bool alreadyLocked) } - +static Time -DailyRollingFileAppender::calculateNextRolloverTime(const Time& t) const +calculateNextRolloverTime(const Time& t, DailyRollingFileSchedule schedule) { + struct tm next; switch(schedule) { case MONTHLY: { - struct tm nextMonthTime; - t.localtime(&nextMonthTime); - nextMonthTime.tm_mon += 1; - nextMonthTime.tm_isdst = 0; + t.localtime (&next); + next.tm_mon += 1; + next.tm_mday = 1; // Round up to next month start + next.tm_hour = 0; + next.tm_min = 0; + next.tm_sec = 0; + next.tm_isdst = -1; Time ret; - if(ret.setTime(&nextMonthTime) == -1) { + if (ret.setTime (&next) == -1) + { helpers::getLogLog().error( LOG4CPLUS_TEXT("DailyRollingFileAppender::calculateNextRolloverTime()-") LOG4CPLUS_TEXT(" setTime() returned error")); // Set next rollover to 31 days in future. - ret = round_time (t, 24 * 60 * 60) + Time(2678400); + ret = round_time (t, 24 * 60 * 60) + Time (31 * 24 * 60 * 60); } - return ret; } case WEEKLY: { - Time next = round_time (t, 24 * 60 * 60) + Time (7 * 24 * 60 * 60); - return adjust_for_time_zone (next, local_time_offset (next)); + t.localtime (&next); + // Round up to next week + next.tm_mday += (7 - next.tm_wday + 1); + next.tm_hour = 0; + next.tm_min = 0; + next.tm_sec = 0; + next.tm_isdst = -1; + + Time ret; + if (ret.setTime (&next) == -1) + { + helpers::getLogLog().error( + LOG4CPLUS_TEXT("DailyRollingFileAppender::calculateNextRolloverTime()-") + LOG4CPLUS_TEXT(" setTime() returned error")); + // Set next rollover to 7 days in future. + ret = round_time (t, 24 * 60 * 60) + Time (7 * 24 * 60 * 60); + } + return ret; } default: helpers::getLogLog ().error ( - LOG4CPLUS_TEXT ("DailyRollingFileAppender::calculateNextRolloverTime()-") - LOG4CPLUS_TEXT (" invalid schedule value")); + LOG4CPLUS_TEXT ("calculateNextRolloverTime()-") + LOG4CPLUS_TEXT (" unhandled or invalid schedule value")); // Fall through. case DAILY: { - Time next = round_time_and_add (t, Time (24 * 60 * 60)); - return adjust_for_time_zone (next, local_time_offset (next)); + t.localtime (&next); + next.tm_mday += 1; + next.tm_hour = 0; + next.tm_min = 0; + next.tm_sec = 0; + next.tm_isdst = -1; + + Time ret; + if (ret.setTime (&next) == -1) + { + helpers::getLogLog().error( + LOG4CPLUS_TEXT("DailyRollingFileAppender::calculateNextRolloverTime()-") + LOG4CPLUS_TEXT(" setTime() returned error")); + // Set next rollover to 7 days in future. + ret = round_time (t, 60 * 60) + Time (24 * 60 * 60); + } + return ret; } case TWICE_DAILY: { - Time next = round_time_and_add (t, Time (12 * 60 * 60)); - return adjust_for_time_zone (next, local_time_offset (next)); + t.localtime (&next); + if (next.tm_hour < 12) + next.tm_hour = 12; + else + next.tm_hour = 24; + next.tm_min = 0; + next.tm_sec = 0; + next.tm_isdst = -1; + + Time ret; + if (ret.setTime (&next) == -1) + { + helpers::getLogLog().error( + LOG4CPLUS_TEXT("DailyRollingFileAppender::calculateNextRolloverTime()-") + LOG4CPLUS_TEXT(" setTime() returned error")); + // Set next rollover to 7 days in future. + ret = round_time (t, 60 * 60) + Time (12 * 60 * 60); + } + return ret; } case HOURLY: - return round_time_and_add (t, Time (60 * 60)); + { + t.localtime (&next); + next.tm_hour += 1; + next.tm_min = 0; + next.tm_sec = 0; + next.tm_isdst = -1; + + Time ret; + if (ret.setTime (&next) == -1) + { + helpers::getLogLog().error( + LOG4CPLUS_TEXT("DailyRollingFileAppender::calculateNextRolloverTime()-") + LOG4CPLUS_TEXT(" setTime() returned error")); + // Set next rollover to 7 days in future. + ret = round_time (t, 60 * 60) + Time (60 * 60); + } + + return ret; + } case MINUTELY: return round_time_and_add (t, Time (60)); @@ -966,6 +994,14 @@ DailyRollingFileAppender::calculateNextRolloverTime(const Time& t) const } +Time +DailyRollingFileAppender::calculateNextRolloverTime(const Time& t) const +{ + Time ret = log4cplus::calculateNextRolloverTime (t, schedule); + ret.usec (0); + return ret; +} + tstring DailyRollingFileAppender::getFilename(const Time& t) const @@ -1400,53 +1436,9 @@ TimeBasedRollingFileAppender::getRolloverPeriodDuration() const Time TimeBasedRollingFileAppender::calculateNextRolloverTime(const Time& t) const { - Time result; - struct tm next; - - switch(schedule) - { - case MONTHLY: - t.localtime(&next); - next.tm_mon += 1; - next.tm_mday = 0; // Round up to next month start - next.tm_hour = 0; - next.tm_min = 0; - next.tm_sec = 0; - next.tm_isdst = 0; - if (result.setTime(&next) == -1) { - result = t + Time(getRolloverPeriodDuration()); - } - break; - - case WEEKLY: - t.localtime(&next); - next.tm_mday += (7 - next.tm_wday + 1); // Round up to next week - next.tm_hour = 0; // Round up to next week start - next.tm_min = 0; - next.tm_sec = 0; - next.tm_isdst = 0; - if (result.setTime(&next) == -1) { - result = t + Time(getRolloverPeriodDuration()); - } - break; - - default: - case DAILY: - case HOURLY: - case MINUTELY: - { - int periodDuration = getRolloverPeriodDuration(); - result = t + Time(periodDuration); - time_t seconds = result.sec(); - int remainder = seconds % periodDuration; - result.sec(seconds - remainder); - break; - } - }; - - result.usec(0); - - return result; + Time ret = log4cplus::calculateNextRolloverTime (t, schedule); + ret.usec (0); + return ret; } } // namespace log4cplus From 8751ec6fd6e91e4602763665c3494e09d402c4a1 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 26 Mar 2017 23:02:43 +0200 Subject: [PATCH 145/165] Prepare for log4cplus 1.2.1-RC2. --- ChangeLog | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f81be625..84cdd17da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ +log4cplus 1.2.1-RC2 +------------------- + + - Fixed SF#334. Handle signal interrupting `sem_wait()`. + + - Avoid language level thread-local variables on Cygwin to avoid + compilation issue (GCC PR64697). + + - Implement suggestion in SF#297 to allow filters in `AsyncAppender` + configuration. + + - Require CMake 2.8.12 and later due to use of `INCLUDES DESTINATION` + (Patched by Enrico Jorns.) + + - Fixed GitHub bug #136, again. Use `mktime()`'s ability to adjust for + excess values in fields of `struct tm`. + + log4cplus 1.2.1-RC1 ---------------- +------------------- - GitHub issue #205. Fixed `AsyncAppender` shutdown crash. @@ -118,34 +136,34 @@ log4cplus 1.2.0-RC2 - Documented issue and work-around for Android's emutls issue. - Do not set SOVERSION and VERSION properties for CMake based Android -builds. + builds. log4cplus 1.2.0-RC1 ------------------- - TraceLogger and associated `LOG4CPLUS_TRACE_*()` macros now record -function name in generated event. + function name in generated event. - Added Qt5 based `Qt5DebugAppender`. - Added prototype of Python bindings using Swig 2.0+. - Autotools based build system has been converted from `Makefile` per -directory to single `Makefile` for the whole project mode. + directory to single `Makefile` for the whole project mode. - Plain text documentation files have been converted to Markdown (with -Pandoc's extensions). + Pandoc's extensions). - `FileAppender` can now create missing directories in log file path, if -this is enabled by `CreateDirs` property. + this is enabled by `CreateDirs` property. - Added `MSTTSAppender` that uses Windows' text-to-speech engine. - `SysLogAppender` can now log into remote `syslog` instance using TCP in -addition to previously supported UDP. + addition to previously supported UDP. - Added Autotest based testsuite running and verifying output of existing -`tests/` directory tests. Improved tests coverage. + `tests/` directory tests. Improved tests coverage. - Many other small and bigger improvements. From 9bf357d7d830286ba3731e8d883a8dd1d1bddb7f Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Fri, 3 Mar 2017 14:02:13 +0100 Subject: [PATCH 146/165] Use 256 bytes of buffer for `gethostname()`. --- src/socket-win32.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/socket-win32.cxx b/src/socket-win32.cxx index 9b895604a..bd2c91551 100644 --- a/src/socket-win32.cxx +++ b/src/socket-win32.cxx @@ -350,7 +350,9 @@ getHostname (bool fqdn) char const * hostname = "unknown"; int ret; - std::vector hn (1024, 0); + // The initial size is based on information in the Microsoft article + // + std::vector hn (256, 0); while (true) { From 30026707f0aa94b403104cbc9028d238660ade72 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 26 Mar 2017 22:46:29 +0200 Subject: [PATCH 147/165] Tweak PDF creation. --- docs/latex-header.tex | 24 +++++++++++++++++++++++- scripts/build-pdf.pl | 2 +- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/docs/latex-header.tex b/docs/latex-header.tex index 6ecaabb2b..7557ae95b 100644 --- a/docs/latex-header.tex +++ b/docs/latex-header.tex @@ -16,7 +16,29 @@ \usepackage{textcomp} \usepackage{upquote} \usepackage{etoolbox} -\usepackage{selnolig} + +\setmainfont[Ligatures={TeX, Common}]{TeX Gyre Pagella} +\setmonofont[Scale=MatchLowercase,Ligatures={NoCommon}]{DejaVu Sans Mono} +%\setromanfont{Georgia} +%\setsansfont{DejaVu Sans} + +\newfontfamily{\cjkfont}{WenQuanYi Zen Hei}[] +\newfontfamily{\devanagarifont}{Lohit Devanagari}[] +\newfontfamily{\tamilfont}{Lohit Tamil}[] +\newfontfamily{\cyrilicfont}{CMU Serif} + +%% These unfortunately break too many things. PDF will have to be without +%% contributors' native names. +% \ifxetex +% \usepackage{xeCJK} +% \setCJKmainfont{WenQuanYi Zen Hei} +% \setCJKmonofont{WenQuanYi Zen Hei Mono} +% \else +% %% Adding senolig breaks compilation in the CJK support. +% %\usepackage{selnolig} +% \usepackage{luatexja-fontspec} +% \setmainjfont{WenQuanYi Zen Hei} +% \fi \pagestyle{fancy} \chead{\raisebox{\baselineskip}{\includegraphics[width=1.5cm,keepaspectratio]{./docs/log4cplus}}} diff --git a/scripts/build-pdf.pl b/scripts/build-pdf.pl index 8ec268958..e15a06bb4 100755 --- a/scripts/build-pdf.pl +++ b/scripts/build-pdf.pl @@ -36,7 +36,7 @@ , '--latex-engine=lualatex', , '--include-in-header=docs/latex-header.tex' , '--include-before-body=docs/latex-body.tex' - , '-V', 'lang=english', + , '-V', 'lang=en-US', , '-V', 'geometry:a4paper'); # pre-compute various source information strings From 2f2b6f35c567152267627b9096aec98443e56f85 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 8 Apr 2017 19:35:12 +0200 Subject: [PATCH 148/165] CMakeLists.txt: Print compiler and target OS information. --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f335ea19f..d4eec831f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,3 +142,9 @@ if (LOG4CPLUS_QT5) endif (LOG4CPLUS_QT5) include(Log4CPlusCPack.cmake) + +message (STATUS "Compiler: ${CMAKE_CXX_COMPILER}") +message (STATUS "${CMAKE_CXX_COMPILER_ID} version ${CMAKE_CXX_COMPILER_VERSION}") +message (STATUS "Compiler flags: ${CMAKE_CXX_FLAGS}") +message (STATUS "System name: ${CMAKE_SYSTEM_NAME}") +message (STATUS "System version: ${CMAKE_SYSTEM_VERSION}") From 78e4937a05c9009ec5f6be8a9720b7717f78140b Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 8 Apr 2017 19:44:35 +0200 Subject: [PATCH 149/165] Appveyor: Build also with Visual Studio 2015/Clang. --- appveyor.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index caec22712..8e116e947 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,15 +8,21 @@ environment: - PRJ_GEN: "Visual Studio 12 2013 Win64" BDIR: msvc2013 PRJ_CFG: Release + PARAMS: '' - PRJ_GEN: "Visual Studio 14 2015 Win64" BDIR: msvc2015 PRJ_CFG: Release + PARAMS: '' + - PRJ_GEN: "Visual Studio 14 2015 Win64" + BDIR: msvc2015clang + PRJ_CFG: Release + PARAMS: -T "v140_clang_c2" build_script: - mkdir build.%BDIR% - cd build.%BDIR% - - cmake .. -G"%PRJ_GEN%" -DCMAKE_BUILD_TYPE=%PRJ_CFG% - - cmake --build . --config %PRJ_CFG% --clean-first + - cmake .. -G "%PRJ_GEN%" "-DCMAKE_BUILD_TYPE=%PRJ_CFG%" %PARAMS% + - cmake --build . --config "%PRJ_CFG%" --clean-first test_script: - ctest -V --output-on-failure -C %PRJ_CFG% From 3113bdbffae3b24cbe341cdf94c52c7ef971c13e Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 2 Jul 2017 11:17:24 +0200 Subject: [PATCH 150/165] Small tweaks to SocketBuffer. --- src/socketbuffer.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/socketbuffer.cxx b/src/socketbuffer.cxx index eba95ad53..ff1b7de6e 100644 --- a/src/socketbuffer.cxx +++ b/src/socketbuffer.cxx @@ -122,7 +122,7 @@ SocketBuffer::readInt() std::memcpy (&ret, buffer + pos, sizeof(ret)); ret = ntohl(ret); pos += sizeof(unsigned int); - + return ret; } @@ -239,7 +239,7 @@ void SocketBuffer::appendString(const tstring& str) { std::size_t const strlen = str.length(); - static std::size_t const sizeOfChar = sizeof (tchar) == 1 ? 1 : 2; + std::size_t const sizeOfChar = sizeof (tchar) == 1 ? 1 : 2; if((pos + sizeof(unsigned int) + strlen * sizeOfChar) > maxsize) { @@ -254,7 +254,7 @@ SocketBuffer::appendString(const tstring& str) pos += strlen; size = pos; #else - for(tstring::size_type i=0; i(str[i])); } #endif From 581b77bffd67adc4cc6c3bc1a0481b2e63ac48ec Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 9 Jul 2017 09:56:53 +0200 Subject: [PATCH 151/165] Handle SocketBuffer overflow by throwing an exception. Catch this exception in SocketAppender and throw away such message. --- src/socketappender.cxx | 12 ++++++++++-- src/socketbuffer.cxx | 28 ++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/socketappender.cxx b/src/socketappender.cxx index 13c5ba6c5..d78c97f46 100644 --- a/src/socketappender.cxx +++ b/src/socketappender.cxx @@ -19,6 +19,7 @@ // limitations under the License. #include +#include #include #include #include @@ -138,9 +139,16 @@ SocketAppender::append(const spi::InternalLoggingEvent& event) #endif helpers::SocketBuffer buffer(LOG4CPLUS_MAX_MESSAGE_SIZE - sizeof(unsigned int)); - convertToBuffer (buffer, event, serverName); - helpers::SocketBuffer msgBuffer(LOG4CPLUS_MAX_MESSAGE_SIZE); + try + { + convertToBuffer (buffer, event, serverName); + } + catch (std::runtime_error const & ex) + { + return; + } + helpers::SocketBuffer msgBuffer(LOG4CPLUS_MAX_MESSAGE_SIZE); msgBuffer.appendInt(static_cast(buffer.getSize())); msgBuffer.appendBuffer(buffer); diff --git a/src/socketbuffer.cxx b/src/socketbuffer.cxx index ff1b7de6e..75653a148 100644 --- a/src/socketbuffer.cxx +++ b/src/socketbuffer.cxx @@ -192,8 +192,10 @@ void SocketBuffer::appendByte(unsigned char val) { if((pos + sizeof(unsigned char)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendByte()- Attempt to write beyond end of buffer")); - return; + getLogLog().error( + LOG4CPLUS_TEXT("SocketBuffer::appendByte()-") + LOG4CPLUS_TEXT(" Attempt to write beyond end of buffer"), + true); } buffer[pos] = static_cast(val); @@ -207,8 +209,10 @@ void SocketBuffer::appendShort(unsigned short val) { if((pos + sizeof(unsigned short)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendShort()- Attempt to write beyond end of buffer")); - return; + getLogLog().error( + LOG4CPLUS_TEXT("SocketBuffer::appendShort()-") + LOG4CPLUS_TEXT("Attempt to write beyond end of buffer"), + true); } unsigned short s = htons(val); @@ -223,7 +227,10 @@ void SocketBuffer::appendInt(unsigned int val) { if((pos + sizeof(unsigned int)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendInt()- Attempt to write beyond end of buffer")); + getLogLog().error( + LOG4CPLUS_TEXT("SocketBuffer::appendInt()-") + LOG4CPLUS_TEXT(" Attempt to write beyond end of buffer"), + true); return; } @@ -243,8 +250,10 @@ SocketBuffer::appendString(const tstring& str) if((pos + sizeof(unsigned int) + strlen * sizeOfChar) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendString()-") - LOG4CPLUS_TEXT(" Attempt to write beyond end of buffer")); + getLogLog().error( + LOG4CPLUS_TEXT("SocketBuffer::appendString()-") + LOG4CPLUS_TEXT(" Attempt to write beyond end of buffer"), + true); return; } @@ -266,7 +275,10 @@ void SocketBuffer::appendBuffer(const SocketBuffer& buf) { if((pos + buf.getSize()) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendBuffer()- Attempt to write beyond end of buffer")); + getLogLog().error( + LOG4CPLUS_TEXT("SocketBuffer::appendBuffer()-") + LOG4CPLUS_TEXT(" Attempt to write beyond end of buffer"), + true); return; } From 33497d8152364f591fc51299799cc19c38f299f3 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 9 Jul 2017 10:47:35 +0200 Subject: [PATCH 152/165] Update ChangeLog. --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 84cdd17da..c8a5b68b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ log4cplus 1.2.1-RC2 - Fixed GitHub bug #136, again. Use `mktime()`'s ability to adjust for excess values in fields of `struct tm`. + - `SocketBuffer` now throws an exception on overflow and `SocketAppender` + handles it and does not send overlong messages. log4cplus 1.2.1-RC1 ------------------- From bd27044f353f977dfc35da1a5157a2b42f94112c Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 11 Jul 2017 18:52:58 +0200 Subject: [PATCH 153/165] Avoid using `std::mutex` with Visual Studio earlier than 2015. This works around issue with `std::mutex` locking during process shutdown. See also SF#343. --- include/log4cplus/config/win32.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/log4cplus/config/win32.h b/include/log4cplus/config/win32.h index 8e5175cd8..72c2dd1b2 100644 --- a/include/log4cplus/config/win32.h +++ b/include/log4cplus/config/win32.h @@ -43,7 +43,7 @@ #define LOG4CPLUS_HAVE_TIME_H #define LOG4CPLUS_HAVE_SYS_TIMEB_H #define LOG4CPLUS_HAVE_FTIME -#if defined (_MSC_VER) || defined (__BORLANDC__) +#if defined (_MSC_VER) || defined (__BORLANDC__) #define LOG4CPLUS_HAVE_GMTIME_S #endif @@ -162,6 +162,12 @@ # endif # if _MSC_VER >= 1700 # define LOG4CPLUS_HAVE_CXX11_ATOMICS +# endif +# if _MSC_VER >= 1900 +// C++11 threading facilities and synchronization primitives are available +// already in earlier versions of Visual Studio compiler, however, there are +// issues with the way mutexes are implemented and using them during process +// shutdown. This appears to be fixed in Visual Studio 2015 and later. # define LOG4CPLUS_WITH_CXX11_THREADS # endif #endif From ed26e5eca5c0440add74ee73fd8acee894ba3cd4 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 11 Jul 2017 19:52:41 +0200 Subject: [PATCH 154/165] Update ChangeLog for 1.2.1-RC2. --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index c8a5b68b1..e34fad7f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,10 @@ log4cplus 1.2.1-RC2 - `SocketBuffer` now throws an exception on overflow and `SocketAppender` handles it and does not send overlong messages. + - Fixed SF#343. Avoid using C++11 `std::mutex` and other synchronization + primitives in Visual Studio earlier than 2015. + + log4cplus 1.2.1-RC1 ------------------- From 20ca0f94b42bf78f7f4502cb74fdda021367b981 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Tue, 11 Jul 2017 19:57:34 +0200 Subject: [PATCH 155/165] Bump SO version. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f18b8894e..76588c0ce 100755 --- a/configure +++ b/configure @@ -4470,7 +4470,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=6:5:1 +LT_VERSION=6:6:1 LT_RELEASE=1.2 diff --git a/configure.ac b/configure.ac index d68573e9c..8c4eef95a 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AM_PROG_AR # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=6:5:1 +LT_VERSION=6:6:1 LT_RELEASE=1.2 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) From 2b664e83a07c2c8e204f3aed0925a63fa1a2062a Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sun, 28 Jan 2018 17:15:32 +0100 Subject: [PATCH 156/165] Update ChangeLog for 1.2.1. --- ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index e34fad7f0..58cfc7649 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +log4cplus 1.2.1 +--------------- + +Version 1.2.1 is virtually identical to 1.2.1-RC2. This version is signed +with new key: E406292F7D08BBB00846131404B89D51DFE5A215. The previous DSA key +was only 1024 bits long. + + log4cplus 1.2.1-RC2 ------------------- From a544597873809c7a47a987905a2421ad43b4cb73 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 10 Mar 2018 20:36:31 +0100 Subject: [PATCH 157/165] Remove Doxygen customizations. We will use stock Doxygen styles. --- docs/doxygen.config | 2618 +++++++++++++++++++++-------------- docs/doxygen.css | 817 ----------- docs/webpage_doxygen.config | 1781 ------------------------ docs/webpage_footer.html | 6 - docs/webpage_header.html | 31 - 5 files changed, 1595 insertions(+), 3658 deletions(-) delete mode 100644 docs/doxygen.css delete mode 100644 docs/webpage_doxygen.config delete mode 100644 docs/webpage_footer.html delete mode 100644 docs/webpage_header.html diff --git a/docs/doxygen.config b/docs/doxygen.config index 1d4911092..f13e5cd53 100644 --- a/docs/doxygen.config +++ b/docs/doxygen.config @@ -1,104 +1,122 @@ -# Doxyfile 1.8.3.1 +# Doxyfile 1.8.13 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. # -# All text after a hash (#) is considered a comment and will be ignored. +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. # The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" "). +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- # This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or sequence of words) that should -# identify the project. Note that if you do not use Doxywizard you need -# to put quotes around the project name if it contains spaces. +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. PROJECT_NAME = log4cplus -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. PROJECT_NUMBER = 1.2.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer -# a quick idea about the purpose of the project. Keep the description short. +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = +PROJECT_BRIEF = -# With the PROJECT_LOGO tag one can specify an logo or icon that is -# included in the documentation. The maximum height of the logo should not -# exceed 55 pixels and the maximum width should not exceed 200 pixels. -# Doxygen will copy the logo to the output directory. +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. -PROJECT_LOGO = +PROJECT_LOGO = log4cplus.svg -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. OUTPUT_DIRECTORY = log4cplus-1.2.1/docs -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. CREATE_SUBDIRS = NO +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. +# The default value is: YES. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. ABBREVIATE_BRIEF = "The $name class" \ "The $name widget" \ @@ -113,8 +131,9 @@ ABBREVIATE_BRIEF = "The $name class" \ the # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# doxygen will generate a detailed section even if there is only a brief # description. +# The default value is: NO. ALWAYS_DETAILED_SEC = NO @@ -122,247 +141,285 @@ ALWAYS_DETAILED_SEC = NO # inherited members of a class in the documentation of that class as if those # members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. +# The default value is: NO. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. FULL_PATH_NAMES = NO -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. Note that you specify absolute paths here, but also -# relative paths, which will be relative from the directory where doxygen is -# started. +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. -STRIP_FROM_PATH = +STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful if your file system -# doesn't support long names like on DOS, Mac, or CD-ROM. +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. JAVADOC_AUTOBRIEF = YES -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. QT_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. MULTILINE_CPP_IS_BRIEF = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. TAB_SIZE = 4 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. -ALIASES = +ALIASES = # This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding -# "class=itcl::class" will allow you to use the command class in the -# itcl::class meaning. +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. -TCL_SUBST = +TCL_SUBST = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. OPTIMIZE_OUTPUT_JAVA = NO # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. OPTIMIZE_FOR_FORTRAN = NO # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. OPTIMIZE_OUTPUT_VHDL = NO # Doxygen selects the parser to use depending on the extension of the files it # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, -# and language is one of the parsers supported by doxygen: IDL, Java, -# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, -# C++. For instance to make doxygen treat .inc files as Fortran files (default -# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note -# that for custom extensions you also need to set FILE_PATTERNS otherwise the -# files are not read by doxygen. - -EXTENSION_MAPPING = - -# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all -# comments according to the Markdown format, which allows for more readable +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable # documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you -# can mix doxygen, HTML, and XML commands with Markdown formatting. -# Disable only in case of backward compatibilities issues. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. MARKDOWN_SUPPORT = YES -# When enabled doxygen tries to link words that correspond to documented classes, -# or namespaces to their corresponding documentation. Such a link can be -# prevented in individual cases by by putting a % sign in front of the word or +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 0. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 0 + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or # globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. AUTOLINK_SUPPORT = YES # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also makes the inheritance and collaboration +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. +# The default value is: NO. BUILTIN_STL_SUPPORT = YES # If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support. +# The default value is: NO. CPP_CLI_SUPPORT = NO -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. SIP_SUPPORT = NO # For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES (the -# default) will make doxygen replace the get and set methods by a property in -# the documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. IDL_PROPERTY_SUPPORT = YES # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first +# tag is set to YES then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. +# The default value is: NO. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. SUBGROUPING = YES -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and -# unions are shown inside the group in which they are included (e.g. using -# @ingroup) instead of on a separate page (for HTML and Man pages) or -# section (for LaTeX and RTF). +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. INLINE_GROUPED_CLASSES = NO -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and -# unions with only public data fields will be shown inline in the documentation -# of the scope in which they are defined (i.e. file, namespace, or group -# documentation), provided this scope is documented. If set to NO (the default), -# structs, classes, and unions are shown on a separate page (for HTML and Man -# pages) or section (for LaTeX and RTF). +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. INLINE_SIMPLE_STRUCTS = NO -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So # typedef struct TypeS {} TypeT, will appear in the documentation as a struct # with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound # types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. TYPEDEF_HIDES_STRUCT = NO -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penalty. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will roughly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols. - -SYMBOL_CACHE_SIZE = 0 - -# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be -# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given -# their name and scope. Since this can be an expensive process and often the -# same symbol appear multiple times in the code, doxygen keeps a cache of -# pre-resolved symbols. If the cache is too small doxygen will become slower. -# If the cache is too large, memory is wasted. The cache size is given by this -# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols. +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. LOOKUP_CACHE_SIZE = 0 @@ -370,1232 +427,1635 @@ LOOKUP_CACHE_SIZE = 0 # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. EXTRACT_ALL = YES -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. EXTRACT_PRIVATE = NO -# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal # scope will be included in the documentation. +# The default value is: NO. EXTRACT_PACKAGE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. EXTRACT_LOCAL_METHODS = NO # If this flag is set to YES, the members of anonymous namespaces will be # extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespaces are hidden. +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. EXTRACT_ANON_NSPACES = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. HIDE_UNDOC_CLASSES = YES -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO, these declarations will be +# included in the documentation. +# The default value is: NO. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES, upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. +# The default value is: system dependent. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. SHOW_INCLUDE_FILES = YES -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. FORCE_LOCAL_INCLUDES = NO -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. SORT_BRIEF_DOCS = NO -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. SORT_MEMBERS_CTORS_1ST = NO -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. SORT_GROUP_NAMES = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. SORT_BY_SCOPE_NAME = NO -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to -# do proper type resolution of all parameters of a function it will reject a -# match between the prototype and the implementation of a member function even -# if there is only one candidate or it is obvious which candidate to choose -# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen -# will still accept a match between prototype and implementation in such cases. +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. STRICT_PROTO_MATCHING = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if section-label ... \endif -# and \cond section-label ... \endcond blocks. +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or macro consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and macros in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the # list will mention the files that were used to generate the documentation. +# The default value is: YES. SHOW_USED_FILES = YES -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. SHOW_FILES = YES -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. -# This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from # the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed # by doxygen. The layout file controls the global structure of the generated # output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. -# You can optionally specify a file name after the option, if omitted -# DoxygenLayout.xml will be used as the name of the layout file. +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. -LAYOUT_FILE = +LAYOUT_FILE = -# The CITE_BIB_FILES tag can be used to specify one or more bib files -# containing the references data. This must be a list of .bib files. The -# .bib extension is automatically appended if omitted. Using this command -# requires the bibtex tool to be installed. See also -# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style -# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this -# feature you need bibtex and perl available in the search path. Do not use -# file names with spaces, bibtex cannot handle them. +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. -CITE_BIB_FILES = +CITE_BIB_FILES = #--------------------------------------------------------------------------- -# configuration options related to warning and progress messages +# Configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. QUIET = NO # The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. WARN_IF_DOC_ERROR = YES -# The WARN_NO_PARAMDOC option can be enabled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. +# The default value is: NO. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. +# The default value is: NO. + +WARN_AS_ERROR = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- -# configuration options related to the input files +# Configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING +# Note: If this tag is empty the current directory is searched. INPUT = ../include/log4cplus/ # This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh -# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py -# *.f90 *.f *.for *.vhd *.vhdl +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, +# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. FILE_PATTERNS = *.h \ *.hxx -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. RECURSIVE = YES # The EXCLUDE tag can be used to specify files and/or directories that should be # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. +# # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = +EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded # from the input. +# The default value is: NO. EXCLUDE_SYMLINKS = NO # If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). -EXAMPLE_PATH = +EXAMPLE_PATH = # If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). -IMAGE_PATH = +IMAGE_PATH = # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. -# If FILTER_PATTERNS is specified, this tag will be -# ignored. +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. -INPUT_FILTER = +INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. -# Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. -# The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty or if -# non of the patterns match the file name, INPUT_FILTER is applied. +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. -FILTER_PATTERNS = +FILTER_PATTERNS = # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. FILTER_SOURCE_FILES = NO # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) -# and it is also possible to disable source filtering for a specific pattern -# using *.ext= (so without naming a filter). This option only has effect when -# FILTER_SOURCE_FILES is enabled. +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. -FILTER_SOURCE_PATTERNS = +FILTER_SOURCE_PATTERNS = -# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page (index.html). -# This can be useful if you have a project on for instance GitHub and want reuse -# the introduction page also for the doxygen output. +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. -USE_MDFILE_AS_MAINPAGE = +USE_MDFILE_AS_MAINPAGE = #--------------------------------------------------------------------------- -# configuration options related to source browsing +# Configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. SOURCE_BROWSER = YES -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C, C++ and Fortran comments will always remain visible. +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. REFERENCES_RELATION = YES -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. -# Otherwise they will link to the documentation. +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. VERBATIM_HEADERS = YES +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse-libclang=ON option for CMake. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + #--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index +# Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. ALPHABETICAL_INDEX = YES -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. COLS_IN_ALPHA_INDEX = 1 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- -# configuration options related to the HTML output +# Configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_OUTPUT = html -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. Note that when using a custom header you are responsible -# for the proper inclusion of any scripts and style sheets that doxygen -# needs, which is dependent on the configuration options used. -# It is advised to generate a default header using "doxygen -w html -# header.html footer.html stylesheet.css YourConfigFile" and then modify -# that header. Note that the header is subject to change so you typically -# have to redo this when upgrading to a newer version of doxygen or when -# changing the value of configuration settings such as GENERATE_TREEVIEW! - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If left blank doxygen will -# generate a default style sheet. Note that it is recommended to use -# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this -# tag will in the future become obsolete. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional -# user-defined cascading style sheet that is included after the standard -# style sheets created by doxygen. Using this option one can overrule -# certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more -# robust against future updates. Doxygen will copy the style sheet file to -# the output directory. - -HTML_EXTRA_STYLESHEET = +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note # that these files will be copied to the base HTML output directory. Use the -# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that -# the files will be copied as-is; there are no commands or markers available. - -HTML_EXTRA_FILES = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. -# Doxygen will adjust the colors in the style sheet and background images -# according to this color. Hue is specified as an angle on a colorwheel, -# see http://en.wikipedia.org/wiki/Hue for more information. -# For instance the value 0 represents red, 60 is yellow, 120 is green, -# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. -# The allowed range is 0 to 359. +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_HUE = 220 -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of -# the colors in the HTML output. For a value of 0 the output will use -# grayscales only. A value of 255 will produce the most vivid colors. +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_SAT = 100 -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to -# the luminance component of the colors in the HTML output. Values below -# 100 gradually make the output lighter, whereas values above 100 make -# the output darker. The value divided by 100 is the actual gamma applied, -# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, -# and 100 does not change the gamma. +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_GAMMA = 80 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. +# page will contain the date and time when the page was generated. Setting this +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_TIMESTAMP = YES # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_DYNAMIC_SECTIONS = NO -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of -# entries shown in the various tree structured indices initially; the user -# can expand and collapse entries dynamically later on. Doxygen will expand -# the tree to such a level that at most the specified number of entries are -# visible (unless a fully collapsed tree already exceeds this amount). -# So setting the number of entries 1 will produce a full collapsed tree by -# default. 0 is a special value representing an infinite number of entries -# and will result in a full expanded tree by default. +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_INDEX_NUM_ENTRIES = 100 -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_DOCSET = NO -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_FEEDNAME = "Doxygen generated docs" -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_BUNDLE_ID = org.doxygen.Project -# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely -# identify the documentation publisher. This should be a reverse domain-name -# style string, e.g. com.mycompany.MyDocSet.documentation. +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_PUBLISHER_ID = org.doxygen.Publisher -# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_PUBLISHER_NAME = Publisher -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be # written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. -CHM_INDEX_ENCODING = +CHM_INDEX_ENCODING = -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. TOC_EXPAND = NO # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated -# that can be used as input for Qt's qhelpgenerator to generate a -# Qt Compressed Help (.qch) of the generated HTML documentation. +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_QHP = NO -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. -QCH_FILE = +QCH_FILE = -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_NAMESPACE = org.doxygen.Project -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_VIRTUAL_FOLDER = doc -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to -# add. For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. -QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_NAME = -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see -# -# Qt Help Project / Custom Filters. +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. -QHP_CUST_FILTER_ATTRS = +QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's -# filter section matches. -# -# Qt Help Project / Filter Attributes. +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. -QHP_SECT_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. -QHG_LOCATION = +QHG_LOCATION = -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_ECLIPSEHELP = NO -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. ECLIPSE_DOC_ID = org.doxygen.Project -# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) -# at top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. Since the tabs have the same information as the -# navigation tree you can set this option to NO if you already set -# GENERATE_TREEVIEW to YES. +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. DISABLE_INDEX = NO # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. -# Since the tree basically has the same information as the tab index you -# could consider to set DISABLE_INDEX to NO when enabling this option. +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_TREEVIEW = NO -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values -# (range [0,1..20]) that doxygen will group on one line in the generated HTML -# documentation. Note that a value of 0 will completely suppress the enum -# values from appearing in the overview section. +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. ENUM_VALUES_PER_LINE = 4 -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. TREEVIEW_WIDTH = 250 -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open -# links to external symbols imported via tag files in a separate window. +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. EXT_LINKS_IN_WINDOW = NO -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. FORMULA_FONTSIZE = 10 # Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are -# not supported properly for IE 6.0, but are supported on all modern browsers. -# Note that when changing this option you need to delete any form_*.png files -# in the HTML output before the changes have effect. +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. FORMULA_TRANSPARENT = YES -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax -# (see http://www.mathjax.org) which uses client side Javascript for the -# rendering instead of using prerendered bitmaps. Use this if you do not -# have LaTeX installed or if you want to formulas look prettier in the HTML -# output. When enabled you may also need to install MathJax separately and -# configure the path to it using the MATHJAX_RELPATH option. +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. USE_MATHJAX = NO # When MathJax is enabled you can set the default output format to be used for -# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and -# SVG. The default value is HTML-CSS, which is slower, but has the best -# compatibility. +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_FORMAT = HTML-CSS -# When MathJax is enabled you need to specify the location relative to the -# HTML output directory using the MATHJAX_RELPATH option. The destination -# directory should contain the MathJax.js script. For instance, if the mathjax -# directory is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to -# the MathJax Content Delivery Network so you can quickly see the result without -# installing MathJax. -# However, it is strongly recommended to install a local -# copy of MathJax from http://www.mathjax.org before deployment. +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://www.mathjax.org/mathjax -# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension -# names that should be enabled during MathJax rendering. - -MATHJAX_EXTENSIONS = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /