Skip to content

Merge. #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 11 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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=''

Expand Down Expand Up @@ -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]...

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 $@
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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


Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"

Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion cygport/log4cplus.cygport
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME=log4cplus
VERSION=2.0.4-rc1
VERSION=2.0.5-rc1
RELEASE=1
CATEGORY="Libs"
SUMMARY="C++ logging library"
Expand Down
4 changes: 2 additions & 2 deletions docs/doxygen.config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/webpage_doxygen.config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/log4cplus/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion log4cplus.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: log4cplus
Version: 2.0.4
Version: 2.0.5
Release: 1

Summary: log4cplus, C++ logging library
Expand Down
4 changes: 2 additions & 2 deletions mingw-log4cplus.spec
Original file line number Diff line number Diff line change
@@ -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

Expand Down