From 56ae6a517321f4e3a6053677aeb7d9f22d9cf743 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 21 Dec 2019 18:33:00 +0100 Subject: [PATCH 1/3] Update ChangeLog for 2.0.5. --- ChangeLog | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5077b18e4..702d21bfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,22 @@ # log4cplus 2.0.5 + - Modernized CMake build. + - Update iOS support to build for current hardware architectures. (Patch by - owlcoding) + Pawel Maczewski) + + - Fix issue with `std::va_list` value reuse. + + - Fix parsing of `include` in configuration when included file path contains + `=`. (Patch by Peter Pei) + + - Fix build issue #455. Source file `callbackappender.cxx` is missing from + Visual Studio project for static library. + + - Fix issue #415. Wrong base source file name is provided if path on Windows + contains `/`. + + - Change of default behaviour: Instantiate thread pool with only 4 threads. # log4cplus 2.0.4 From baa8c853235a1b3a7e78a63f2e481b93f52db21f Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 21 Dec 2019 18:36:55 +0100 Subject: [PATCH 2/3] Regenerate `configure` script for 2.0.5. --- configure | 22 +++++++++++----------- configure.ac | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 28d99299a..6f2d3ee94 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 2.0.4. +# Generated by GNU Autoconf 2.69 for log4cplus 2.0.5. # # # 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='2.0.4' -PACKAGE_STRING='log4cplus 2.0.4' +PACKAGE_VERSION='2.0.5' +PACKAGE_STRING='log4cplus 2.0.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1414,7 +1414,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 2.0.4 to adapt to many kinds of systems. +\`configure' configures log4cplus 2.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1485,7 +1485,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of log4cplus 2.0.4:";; + short | recursive ) echo "Configuration of log4cplus 2.0.5:";; esac cat <<\_ACEOF @@ -1643,7 +1643,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -log4cplus configure 2.0.4 +log4cplus configure 2.0.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2190,7 +2190,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 2.0.4, which was +It was created by log4cplus $as_me 2.0.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3165,7 +3165,7 @@ fi # Define the identity of the package. PACKAGE='log4cplus' - VERSION='2.0.4' + VERSION='2.0.5' # Some tools Automake needs. @@ -4493,7 +4493,7 @@ esac # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=7:4:4 +LT_VERSION=7:5:4 LT_RELEASE=2.0 @@ -24139,7 +24139,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 2.0.4, which was +This file was extended by log4cplus $as_me 2.0.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24205,7 +24205,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 2.0.4 +log4cplus config.status 2.0.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ea630b0c4..99173a1fa 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl autoconf-2.69 dnl automake-1.16.1 dnl libtool-2.4.6 -AC_INIT([log4cplus],[2.0.4]) +AC_INIT([log4cplus],[2.0.5]) 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=7:4:4 +LT_VERSION=7:5:4 LT_RELEASE=2.0 AC_SUBST([LT_VERSION]) AC_SUBST([LT_RELEASE]) From a10307d6ea23db0184169dc2c9ed24a0a385d105 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 21 Dec 2019 18:38:48 +0100 Subject: [PATCH 3/3] Propagate version 2.0.5 to other source files. --- cygport/log4cplus.cygport | 2 +- docs/doxygen.config | 4 ++-- docs/webpage_doxygen.config | 4 ++-- include/log4cplus/version.h | 4 ++-- log4cplus.spec | 2 +- mingw-log4cplus.spec | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cygport/log4cplus.cygport b/cygport/log4cplus.cygport index ce946614a..a7e57a414 100644 --- a/cygport/log4cplus.cygport +++ b/cygport/log4cplus.cygport @@ -1,5 +1,5 @@ NAME=log4cplus -VERSION=2.0.4-rc1 +VERSION=2.0.5-rc1 RELEASE=1 CATEGORY="Libs" SUMMARY="C++ logging library" diff --git a/docs/doxygen.config b/docs/doxygen.config index e513e780d..6886776e2 100644 --- a/docs/doxygen.config +++ b/docs/doxygen.config @@ -38,7 +38,7 @@ PROJECT_NAME = log4cplus # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.0.4 +PROJECT_NUMBER = 2.0.5 # 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 @@ -58,7 +58,7 @@ PROJECT_LOGO = log4cplus.svg # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = log4cplus-2.0.4/docs +OUTPUT_DIRECTORY = log4cplus-2.0.5/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 diff --git a/docs/webpage_doxygen.config b/docs/webpage_doxygen.config index 4e0527a9d..090c2c5e7 100644 --- a/docs/webpage_doxygen.config +++ b/docs/webpage_doxygen.config @@ -38,7 +38,7 @@ PROJECT_NAME = log4cplus # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.0.4 +PROJECT_NUMBER = 2.0.5 # 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 @@ -58,7 +58,7 @@ PROJECT_LOGO = # 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-2.0.4 +OUTPUT_DIRECTORY = webpage_docs-2.0.5 # 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 diff --git a/include/log4cplus/version.h b/include/log4cplus/version.h index a961248e9..35800f096 100644 --- a/include/log4cplus/version.h +++ b/include/log4cplus/version.h @@ -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(2, 0, 4) +#define LOG4CPLUS_VERSION LOG4CPLUS_MAKE_VERSION(2, 0, 5) //! This is log4cplus version number as a string. -#define LOG4CPLUS_VERSION_STR LOG4CPLUS_MAKE_VERSION_STR(2, 0, 4) +#define LOG4CPLUS_VERSION_STR LOG4CPLUS_MAKE_VERSION_STR(2, 0, 5) namespace log4cplus diff --git a/log4cplus.spec b/log4cplus.spec index 68ed805a0..ad4523038 100644 --- a/log4cplus.spec +++ b/log4cplus.spec @@ -1,5 +1,5 @@ Name: log4cplus -Version: 2.0.4 +Version: 2.0.5 Release: 1 Summary: log4cplus, C++ logging library diff --git a/mingw-log4cplus.spec b/mingw-log4cplus.spec index 12703b676..18abe7456 100755 --- a/mingw-log4cplus.spec +++ b/mingw-log4cplus.spec @@ -1,12 +1,12 @@ Name: log4cplus -Version: 2.0.4 +Version: 2.0.5 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/2.0.4/log4cplus-2.0.4.tar.gz +Source0: http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/2.0.5/log4cplus-2.0.5.tar.gz BuildArch: noarch