10000 Merge pull request #535 from wilx/2.0.x · log4cplus/log4cplus@6650345 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6650345

Browse files
wilxwilx
authored
Merge pull request #535 from wilx/2.0.x
Merge.
2 parents ac98480 + f28c6ea commit 6650345

File tree

14 files changed

+196
-48
lines changed

14 files changed

+196
-48
lines changed

‎Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,13 @@ include %D%/src/Makefile.am
4343

4444
include %D%/simpleserver/Makefile.am
4545

46+
if QT
4647
include %D%/qt4debugappender/Makefile.am
48+
endif
4749

50+
if QT5
4851
include %D%/qt5debugappender/Makefile.am
52+
endif
4953

5054
include %D%/swig/Makefile.common.am
5155
include %D%/swig/python/Makefile.am

‎Makefile.am.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AutoGen definitions Makefile.am.tpl;
22

33
src-dirs = { name = src; };
44
src-dirs = { name = simpleserver; };
5-
src-dirs = { name = qt4debugappender; };
6-
src-dirs = { name = qt5debugappender; };
5+
src-dirs = { name = qt4debugappender; conditional = QT; };
6+
src-dirs = { name = qt5debugappender; conditional = QT5; };
77
src-dirs = { name = swig; };
88
src-dirs = { name = tests; conditional = ENABLE_TESTS; };

‎configure

Lines changed: 143 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.71 for log4cplus 2.0.7.
3+
# Generated by GNU Autoconf 2.71 for log4cplus 2.0.8.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -618,8 +618,8 @@ MAKEFLAGS=
618618
# Identity of this package.
619619
PACKAGE_NAME='log4cplus'
620620
PACKAGE_TARNAME='log4cplus'
621-
PACKAGE_VERSION='2.0.7'
622-
PACKAGE_STRING='log4cplus 2.0.7'
621+
PACKAGE_VERSION='2.0.8'
622+
PACKAGE_STRING='log4cplus 2.0.8'
623623
PACKAGE_BUGREPORT=''
624624
PACKAGE_URL=''
625625

@@ -1454,7 +1454,7 @@ if test "$ac_init_help" = "long"; then
14541454
# Omit some internal or obsolete options to make the list less imposing.
14551455
# This message is too long to be a string in the A/UX 3.1 sh.
14561456
cat <<_ACEOF
1457-
\`configure' configures log4cplus 2.0.7 to adapt to many kinds of systems.
1457+
\`configure' configures log4cplus 2.0.8 to adapt to many kinds of systems.
14581458

14591459
Usage: $0 [OPTION]... [VAR=VALUE]...
14601460

@@ -1526,7 +1526,7 @@ fi
15261526

15271527
if test -n "$ac_init_help"; then
15281528
case $ac_init_help in
1529-
short | recursive ) echo "Configuration of log4cplus 2.0.7:";;
1529+
short | recursive ) echo "Configuration of log4cplus 2.0.8:";;
15301530
esac
15311531
cat <<\_ACEOF
15321532

@@ -1688,7 +1688,7 @@ fi
16881688
test -n "$ac_init_help" && exit $ac_status
16891689
if $ac_init_version; then
16901690
cat <<\_ACEOF
1691-
log4cplus configure 2.0.7
1691+
log4cplus configure 2.0.8
16921692
generated by GNU Autoconf 2.71
16931693

16941694
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2125,7 +2125,7 @@ cat >config.log <<_ACEOF
21252125
This file contains any messages produced by compilers while
21262126
running configure, to aid debugging if configure makes a mistake.
21272127

2128-
It was created by log4cplus $as_me 2.0.7, which was
2128+
It was created by log4cplus $as_me 2.0.8, which was
21292129
generated by GNU Autoconf 2.71. Invocation command line was
21302130

21312131
$ $0$ac_configure_args_raw
@@ -3727,7 +3727,7 @@ fi
37273727

37283728
# Define the identity of the package.
37293729
PACKAGE='log4cplus'
3730-
VERSION='2.0.7'
3730+
VERSION='2.0.8'
37313731

37323732

37333733
# Some tools Automake needs.
@@ -5279,7 +5279,7 @@ esac
52795279
# ? :+1 : ? == just some internal changes, nothing breaks but might work
52805280
# better
52815281
# CURRENT : REVISION : AGE
5282-
LT_VERSION=7:6:4
5282+
LT_VERSION=7:7:4
52835283
LT_RELEASE=2.0
52845284

52855285

@@ -7394,6 +7394,138 @@ fi
73947394
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__Wcpp14_compat" >&5
73957395
printf "%s\n" "$ax_cv_cxxflags_gcc_option__Wcpp14_compat" >&6; }
73967396
var=$ax_cv_cxxflags_gcc_option__Wcpp14_compat
7397+
case ".$var" in
7398+
.ok|.ok,*) ;;
7399+
.|.no|.no,*) ;;
7400+
*)
7401+
if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null
7402+
then { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5
7403+
(: CXXFLAGS does contain $var) 2>&5
7404+
ac_status=$?
7405+
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7406+
test $ac_status = 0; }
7407+
else { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5
7408+
(: CXXFLAGS="$CXXFLAGS $var") 2>&5
7409+
ac_status=$?
7410+
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7411+
test $ac_status = 0; }
7412+
CXXFLAGS="$CXXFLAGS $var"
7413+
fi
7414+
;;
7415+
esac
7416+
7417+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -Wc++17-compat" >&5
7418+
printf %s "checking CXXFLAGS for gcc -Wc++17-compat... " >&6; }
7419+
if test ${ax_cv_cxxflags_gcc_option__Wcpp17_compat+y}
7420+
then :
7421+
printf %s "(cached) " >&6
7422+
else $as_nop
7423+
ax_cv_cxxflags_gcc_option__Wcpp17_compat="no, unknown"
7424+
ac_ext=cpp
7425+
ac_cpp='$CXXCPP $CPPFLAGS'
7426+
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7427+
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7428+
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7429+
7430+
ac_save_CXXFLAGS="$CXXFLAGS"
7431+
for ac_arg in "-pedantic -Werror % -Wc++17-compat" "-pedantic % -Wc++17-compat %% no, obsolete" #
7432+
do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
7433+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7434+
/* end confdefs.h. */
7435+
int zero;
7436+
int
7437+
main (void)
7438+
{
7439+
zero = 0; return zero;
7440+
;
7441+
return 0;
7442+
}
7443+
_ACEOF
7444+
if ac_fn_cxx_try_link "$LINENO"
7445+
then :
7446+
ax_cv_cxxflags_gcc_option__Wcpp17_compat=`echo $ac_arg | sed -e 's,.*% *,,'`; break
7447+
fi
7448+
rm -f core conftest.err conftest.$ac_objext conftest.beam \
7449+
conftest$ac_exeext conftest.$ac_ext
7450+
done
7451+
CXXFLAGS="$ac_save_CXXFLAGS"
7452+
ac_ext=cpp
7453+
ac_cpp='$CXXCPP $CPPFLAGS'
7454+
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7455+
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7456+
ac_compiler_ E377 gnu=$ac_cv_cxx_compiler_gnu
7457+
7458+
7459+
fi
7460+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__Wcpp17_compat" >&5
7461+
printf "%s\n" "$ax_cv_cxxflags_gcc_option__Wcpp17_compat" >&6; }
7462+
var=$ax_cv_cxxflags_gcc_option__Wcpp17_compat
7463+
case ".$var" in
7464+
.ok|.ok,*) ;;
7465+
.|.no|.no,*) ;;
7466+
*)
7467+
if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null
7468+
then { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5
7469+
(: CXXFLAGS does contain $var) 2>&5
7470+
ac_status=$?
7471+
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7472+
test $ac_status = 0; }
7473+
else { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5
7474+
(: CXXFLAGS="$CXXFLAGS $var") 2>&5
7475+
ac_status=$?
7476+
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7477+
test $ac_status = 0; }
7478+
CXXFLAGS="$CXXFLAGS $var"
7479+
fi
7480+
;;
7481+
esac
7482+
7483+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -Wc++20-compat" >&5
7484+
printf %s "checking CXXFLAGS for gcc -Wc++20-compat... " >&6; }
7485+
if test ${ax_cv_cxxflags_gcc_option__Wcpp20_compat+y}
7486+
then :
7487+
printf %s "(cached) " >&6
7488+
else $as_nop
7489+
ax_cv_cxxflags_gcc_option__Wcpp20_compat="no, unknown"
7490+
ac_ext=cpp
7491+
ac_cpp='$CXXCPP $CPPFLAGS'
7492+
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7493+
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7494+
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7495+
7496+
ac_save_CXXFLAGS="$CXXFLAGS"
7497+
for ac_arg in "-pedantic -Werror % -Wc++20-compat" "-pedantic % -Wc++20-compat %% no, obsolete" #
7498+
do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
7499+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7500+
/* end confdefs.h. */
7501+
int zero;
7502+
int
7503+
main (void)
7504+
{
7505+
zero = 0; return zero;
7506+
;
7507+
return 0;
7508+
}
7509+
_ACEOF
7510+
if ac_fn_cxx_try_link "$LINENO"
7511+
then :
7512+
ax_cv_cxxflags_gcc_option__Wcpp20_compat=`echo $ac_arg | sed -e 's,.*% *,,'`; break
7513+
fi
7514+
rm -f core conftest.err conftest.$ac_objext conftest.beam \
7515+
conftest$ac_exeext conftest.$ac_ext
7516+
done
7517+
CXXFLAGS="$ac_save_CXXFLAGS"
7518+
ac_ext=cpp
7519+
ac_cpp='$CXXCPP $CPPFLAGS'
7520+
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7521+
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7522+
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7523+
7524+
7525+
fi
7526+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__Wcpp20_compat" >&5
7527+
printf "%s\n" "$ax_cv_cxxflags_gcc_option__Wcpp20_compat" >&6; }
7528+
var=$ax_cv_cxxflags_gcc_option__Wcpp20_compat
73977529
case ".$var" in
73987530
.ok|.ok,*) ;;
73997531
.|.no|.no,*) ;;
@@ -25515,7 +25647,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2551525647
# report actual input values of CONFIG_FILES etc. instead of their
2551625648
# values after options handling.
2551725649
ac_log="
25518-
This file was extended by log4cplus $as_me 2.0.7, which was
25650+
This file was extended by log4cplus $as_me 2.0.8, which was
2551925651
generated by GNU Autoconf 2.71. Invocation command line was
2552025652

2552125653
CONFIG_FILES = $CONFIG_FILES
@@ -25583,7 +25715,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
2558325715
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2558425716
ac_cs_config='$ac_cs_config_escaped'
2558525717
ac_cs_version="\\
25586-
log4cplus config.status 2.0.7
25718+
log4cplus config.status 2.0.8
2558725719
configured by $0, generated by GNU Autoconf 2.71,
2558825720
with options \\"\$ac_cs_config\\"
2558925721

‎configure.ac

Lines changed: 4 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.7])
7+
AC_INIT([log4cplus],[2.0.8])
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:6:4
23+
LT_VERSION=7:7:4
2424
LT_RELEASE=2.0
2525
AC_SUBST([LT_VERSION])
2626
AC_SUBST([LT_RELEASE])
@@ -265,6 +265,8 @@ AS_CASE([$ax_cv_cxx_compiler_vendor],
265265
[AX_CXXFLAGS_GCC_OPTION([-Wold-style-cast])])
266266
dnl AX_CXXFLAGS_GCC_OPTION([-Wabi])
267267
AX_CXXFLAGS_GCC_OPTION([-Wc++14-compat])
268+
AX_CXXFLAGS_GCC_OPTION([-Wc++17-compat])
269+
AX_CXXFLAGS_GCC_OPTION([-Wc++20-compat])
268270
dnl AX_CXXFLAGS_GCC_OPTION([-Wconversion])
269271
AX_CXXFLAGS_GCC_OPTION([-Wundef])
270272
AX_CXXFLAGS_GCC_OPTION([-Wshadow])

‎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.7-rc1
2+
VERSION=2.0.8-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.7
41+
PROJECT_NUMBER = 2.0.8
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.7/docs
61+
OUTPUT_DIRECTORY = log4cplus-2.0.8/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.7
41+
PROJECT_NUMBER = 2.0.8
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.7
61+
OUTPUT_DIRECTORY = webpage_docs-2.0.8
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, 7)
44+
#define LOG4CPLUS_VERSION LOG4CPLUS_MAKE_VERSION(2, 0, 8)
4545

4646
//! This is log4cplus version number as a string.
47-
#define LOG4CPLUS_VERSION_STR LOG4CPLUS_MAKE_VERSION_STR(2, 0, 7)
47+
#define LOG4CPLUS_VERSION_STR LOG4CPLUS_MAKE_VERSION_STR(2, 0, 8)
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.7
2+
Version: 2.0.8
33
Release: 1
44

55
Summary: log4cplus, C++ logging library

‎mingw-log4cplus.spec

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

66
License: Apache
77
Group: Development/Libraries
8-
URL: http://log4cplus.sourceforge.net/
9-
Source0: http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/2.0.7/log4cplus-2.0.7.tar.gz
8+
URL: https://log4cplus.sourceforge.io/
9+
Source0: https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/2.0.7/log4cplus-2.0.7.tar.gz
1010

1111
BuildArch: noarch
1212

@@ -25,8 +25,8 @@ BuildRequires: mingw64-win-iconv
2525
BuildRequires: mingw64-zlib
2626

2727
%description
28-
log4cplus is a simple to use C++ logging API providing thread-safe,
29-
flexible, and arbitrarily granular control over log management and
28+
log4cplus is a simple to use C++ logging API providing thread-safe,
29+
flexible, and arbitrarily granular control over log management and
3030
configuration. It is modeled after the Java log4j API.
3131

3232
# Strip removes essential information from the .dll.a file, so disable it
@@ -94,7 +94,7 @@ find $RPM_BUILD_ROOT -name .svn -type d -exec find '{}' -delete \;
9494
%{mingw32_includedir}/log4cplus/internal/*.h
9595
%{mingw32_includedir}/log4cplus/thread/impl/*.h
9696
%{mingw32_includedir}/log4cplus/thread/*.h
97-
%attr(644,root,root)
97+
%attr(644,root,root)
9898
%{mingw32_libdir}/*.dll.a
9999
%{mingw32_libdir}/liblog4cplus.a
100100
%{mingw32_libdir}/pkgconfig/log4cplus.pc
@@ -115,7 +115,7 @@ find $RPM_BUILD_ROOT -name .svn -type d -exec find '{}' -delete \;
115115
%{mingw64_includedir}/log4cplus/internal/*.h
116116
%{mingw64_includedir}/log4cplus/thread/impl/*.h
117117
%{mingw64_includedir}/log4cplus/thread/*.h
118-
%attr(644,root,root)
118+
%attr(644,root,root)
119119
%{mingw64_libdir}/*.dll.a
120120
%{mingw64_libdir}/liblog4cplus.a
121121
%{mingw64_libdir}/pkgconfig/log4cplus.pc

‎qt4debugappender/Makefile.am

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
if QT
21
lib_LTLIBRARIES += liblog4cplusqt4debugappender.la
32

43
liblog4cplusqt4debugappender_la_cppflags = \
@@ -31,5 +30,3 @@ liblog4cplusqt4debugappenderU_la_LIBADD = $(liblog4cplusU_la_file)
3130
liblog4cplusqt4debugappenderU_la_LDFLAGS = \
3231
$(liblog4cplusqt4debugappender_la_ldflags)
3332
endif
34-
35-
endif

0 commit comments

Comments
 (0)
0