Skip to content

Commit 9d00f7d

Browse files
wilxwilx
authored
Merge pull request #460 from wilx/2.0.x
Merge.
2 parents c47aea7 + a10307d commit 9d00f7d

File tree

9 files changed

+39
-24
lines changed

9 files changed

+39
-24
lines changed

‎ChangeLog

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
# log4cplus 2.0.5
22

3+
- Modernized CMake build.
4+
35
- Update iOS support to build for current hardware architectures. (Patch by
4-
owlcoding)
6+
Pawel Maczewski)
7+
8+
- Fix issue with `std::va_list` value reuse.
9+
10+
- Fix parsing of `include` in configuration when included file path contains
11+
`=`. (Patch by Peter Pei)
12+
13+
- Fix build issue #455. Source file `callbackappender.cxx` is missing from
14+
Visual Studio project for static library.
15+
16+
- Fix issue #415. Wrong base source file name is provided if path on Windows
17+
contains `/`.
18+
19+
- Change of default behaviour: Instantiate thread pool with only 4 threads.
520

621

722
# log4cplus 2.0.4

‎configure

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for log4cplus 2.0.4.
3+
# Generated by GNU Autoconf 2.69 for log4cplus 2.0.5.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
587587
# Identity of this package.
588588
PACKAGE_NAME='log4cplus'
589589
PACKAGE_TARNAME='log4cplus'
590-
PACKAGE_VERSION='2.0.4'
591-
PACKAGE_STRING='log4cplus 2.0.4'
590+
PACKAGE_VERSION='2.0.5'
591+
PACKAGE_STRING='log4cplus 2.0.5'
592592
PACKAGE_BUGREPORT=''
593593
PACKAGE_URL=''
594594

@@ -1414,7 +1414,7 @@ if test "$ac_init_help" = "long"; then
14141414
# Omit some internal or obsolete options to make the list less imposing.
14151415
# This message is too long to be a string in the A/UX 3.1 sh.
14161416
cat <<_ACEOF
1417-
\`configure' configures log4cplus 2.0.4 to adapt to many kinds of systems.
1417+
\`configure' configures log4cplus 2.0.5 to adapt to many kinds of systems.
14181418

14191419
Usage: $0 [OPTION]... [VAR=VALUE]...
14201420

@@ -1485,7 +1485,7 @@ fi
14851485

14861486
if test -n "$ac_init_help"; then
14871487
case $ac_init_help in
1488-
short | recursive ) echo "Configuration of log4cplus 2.0.4:";;
1488+
short | recursive ) echo "Configuration of log4cplus 2.0.5:";;
14891489
esac
14901490
cat <<\_ACEOF
14911491

@@ -1643,7 +1643,7 @@ fi
16431643
test -n "$ac_init_help" && exit $ac_status
16441644
if $ac_init_version; then
16451645
cat <<\_ACEOF
1646-
log4cplus configure 2.0.4
1646+
log4cplus configure 2.0.5
16471647
generated by GNU Autoconf 2.69
16481648

16491649
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2190,7 +2190,7 @@ cat >config.log <<_ACEOF
21902190
This file contains any messages produced by compilers while
21912191
running configure, to aid debugging if configure makes a mistake.
21922192

2193-
It was created by log4cplus $as_me 2.0.4, which was
2193+
It was created by log4cplus $as_me 2.0.5, which was
21942194
generated by GNU Autoconf 2.69. Invocation command line was
21952195

21962196
$ $0 $@
@@ -3165,7 +3165,7 @@ fi
31653165

31663166
# Define the identity of the package.
31673167
PACKAGE='log4cplus'
3168-
VERSION='2.0.4'
3168+
VERSION='2.0.5'
31693169

31703170

31713171
# Some tools Automake needs.
@@ -4493,7 +4493,7 @@ esac
44934493
# ? :+1 : ? == just some internal changes, nothing breaks but might work
44944494
# better
44954495
# CURRENT : REVISION : AGE
4496-
LT_VERSION=7:4:4
4496+
LT_VERSION=7:5:4
44974497
LT_RELEASE=2.0
44984498

44994499

@@ -24139,7 +24139,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2413924139
# report actual input values of CONFIG_FILES etc. instead of their
2414024140
# values after options handling.
2414124141
ac_log="
24142-
This file was extended by log4cplus $as_me 2.0.4, which was
24142+
This file was extended by log4cplus $as_me 2.0.5, which was
2414324143
generated by GNU Autoconf 2.69. Invocation command line was
2414424144

2414524145
CONFIG_FILES = $CONFIG_FILES
@@ -24205,7 +24205,7 @@ _ACEOF
2420524205
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2420624206
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2420724207
ac_cs_version="\\
24208-
log4cplus config.status 2.0.4
24208+
log4cplus config.status 2.0.5
2420924209
configured by $0, generated by GNU Autoconf 2.69,
2421024210
with options \\"\$ac_cs_config\\"
2421124211

‎configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dnl autoconf-2.69
44
dnl automake-1.16.1
55
dnl libtool-2.4.6
66

7-
AC_INIT([log4cplus],[2.0.4])
7+
AC_INIT([log4cplus],[2.0.5])
88
AC_CANONICAL_TARGET
99
AC_CONFIG_SRCDIR([src/logger.cxx])
1010
AC_CONFIG_MACRO_DIR([m4])
@@ -20,7 +20,7 @@ AM_PROG_AR
2020
# ? :+1 : ? == just some internal changes, nothing breaks but might work
2121
# better
2222
# CURRENT : REVISION : AGE
23-
LT_VERSION=7:4:4
23+
LT_VERSION=7:5:4
2424
LT_RELEASE=2.0
2525
AC_SUBST([LT_VERSION])
2626
AC_SUBST([LT_RELEASE])

‎cygport/log4cplus.cygport

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME=log4cplus
2-
VERSION=2.0.4-rc1
2+
VERSION=2.0.5-rc1
33
RELEASE=1
44
CATEGORY="Libs"
55
SUMMARY="C++ logging library"

‎docs/doxygen.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = log4cplus
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.0.4
41+
PROJECT_NUMBER = 2.0.5
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO = log4cplus.svg
5858
# entered, it will be relative to the location where doxygen was started. If
5959
# left blank the current directory will be used.
6060

61-
OUTPUT_DIRECTORY = log4cplus-2.0.4/docs
61+
OUTPUT_DIRECTORY = log4cplus-2.0.5/docs
6262

6363
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
6464
# directories (in 2 levels) under the output directory of each output format and

‎docs/webpage_doxygen.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = log4cplus
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.0.4
41+
PROJECT_NUMBER = 2.0.5
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO =
5858
# entered, it will be relative to the location where doxygen was started. If
5959
# left blank the current directory will be used.
6060

61-
OUTPUT_DIRECTORY = webpage_docs-2.0.4
61+
OUTPUT_DIRECTORY = webpage_docs-2.0.5
6262

6363
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
6464
# directories (in 2 levels) under the output directory of each output format and

‎include/log4cplus/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
//! This is log4cplus version number as unsigned integer. This must
4242
//! be kept on a single line. It is used by Autotool and CMake build
4343
//! systems to parse version number.
44-
#define LOG4CPLUS_VERSION LOG4CPLUS_MAKE_VERSION(2, 0, 4)
44+
#define LOG4CPLUS_VERSION LOG4CPLUS_MAKE_VERSION(2, 0, 5)
4545

4646
//! This is log4cplus version number as a string.
47-
#define LOG4CPLUS_VERSION_STR LOG4CPLUS_MAKE_VERSION_STR(2, 0, 4)
47+
#define LOG4CPLUS_VERSION_STR LOG4CPLUS_MAKE_VERSION_STR(2, 0, 5)
4848

4949

5050
namespace log4cplus

‎log4cplus.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: log4cplus
2-
Version: 2.0.4
2+
Version: 2.0.5
33
Release: 1
44

55
Summary: log4cplus, C++ logging library

‎mingw-log4cplus.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Name: log4cplus
2-
Version: 2.0.4
2+
Version: 2.0.5
33
Release: 1%{?dist}
44
Summary: log4cplus, C++ logging library
55

66
License: Apache
77
Group: Development/Libraries
88
URL: http://log4cplus.sourceforge.net/
9-
Source0: http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/2.0.4/log4cplus-2.0.4.tar.gz
9+
Source0: http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/2.0.5/log4cplus-2.0.5.tar.gz
1010

1111
BuildArch: noarch
1212

0 commit comments

Comments
 (0)