Merge with upstream version 2017-07-13 08:48 #12

meyerj · 2017-10-26T23:11:30Z

Changelog since the last merge (#3):

2017-07-13 08:48  sanchouss_
      * bug 146; 
      * bug 147 - Being prepared for Removing Deprecated Exception Specifications from C++17

2016-11-11 18:48  sanchouss_
      * Numerous fixes;
      * Added .target property for the ConsoleAppender to allow printing to STDERR 
      * Added method Category::shutdownForced(). It releases more memory than shutdown() by deleting all appenders. 
      Category::shutdownForced() may be invoked several times, not only at the end of program.

See full Changelog.

…t version to 2.9.0 This patch allows to install the patched version of log4cpp alongside the original log4cpp package without potential conflicts and without the need to increase the version number to 6.0.0 as a criteria to detect the patched log4cpp library in ocl. rtt and ocl needs a minimal patch to change the library name and to remove the version 6.0.0 check. Signed-off-by: Johannes Meyer <johannes@intermodalics.eu>

… toolchain-2.9

…toolchain-2.9

…o toolchain-2.9

… issues OS X 10.11 with System Integrity Protection (SIP) [1] turned on (which is the default), purges all DYLD_xxx env. var's before executing a program. This means that dynamic libraries can not be found via DYLD_xxx paths, and so all dynamic library dependencies must have a full path specified. Without this property set, dependent libraries/executables that dynamically link with log4cpp end up without the path information, and thus fail to load in 10.11 w/ SIP enabled. Even if CMake provides a full path to the log4cpp library, the output dependent dynamic library has a log4cpp entry like liblog4cpp.6.0.dylib (compatibility version 6.0.0, current version 6.0.0) but with this property set in log4cpp (and no changes in the dependent package), then the resulting log4cpp entry in the dependent library is /opt/orocos/lib/liblog4cpp.6.0.dylib (compatibility version 6.0.0, current version 6.0.0) Not entirely sure why this entry fixes the problem, but it does. [1] https://support.apple.com/en-us/HT204899

…DERR

Support OS X 10.11 with system integrity protection enabled

mem leak: code cleanup Memory leak checks: added separate project Runnable for facilitating memleak checking log4cppRunnable.vcxproj itself

…/p/log4cpp/codegit

Conflicts: package.xml

Avoids the following error (OS X 10.11, SIP enabled, CMake 3.6) -- Configuring done CMake Warning (dev): Policy CMP0042 is not set: MACOSX_RPATH is enabled by default. Run "cmake --help-policy CMP0042" for policy details. Use the cmake_policy command to set the policy and suppress this warning. MACOSX_RPATH is not specified for the following targets: log4cpp This warning is for project developers. Use -Wno-dev to suppress it. -- Generating done

cmake: Correctly set RPATH accounting for OS X and CMake versions

…ecifications from C++17

…h-upstream

…pick Merge with upstream version 2017-07-13 08:48

meyerj · 2017-10-31T12:20:59Z

We have to review the changes in the Appender class and eventually revert it.

francisco-miguel-almeida · 2019-04-16T09:31:48Z

We have to review the changes in the Appender class and eventually revert it.

Could this be related to #13?

meyerj · 2019-04-16T12:05:58Z

Could this be related to #13?

No. This low priority patch is not merged into toolchain-2.9 or master yet.

medenes · 2020-03-06T06:55:19Z

Hi. Is here any blocking issue that not allow to merge this PR into master? bug 147 is the most wanted for me.

snrkiwi · 2020-03-07T00:31:44Z

WFM. We should try to keep up ... probably need to do another sync at some point soon also ...

meyerj · 2020-03-07T02:09:38Z

We have to review the changes in the Appender class and eventually revert it.

I personally did not run any tests so far to check whether the update breaks real-time logging in OCL Logging. From looking at the diff I do not see a problem, but also did not go over all patches in detail.

If someone could confirm that the patch does not break OCL, we can merge and consider it for a toolchain-2.10 release.

WFM. We should try to keep up ... probably need to do another sync at some point soon also ...

The branch merged here is still the latest from the upstream repo at https://sourceforge.net/p/log4cpp/codegit/ci/master/tree/.

snrkiwi · 2020-03-07T12:49:48Z

I think that the Appender related changes are ok, though why they needed the complexity related to the Appenders Map is not evident. Shrug ... I don't see any changes that might effect real-time

meyerj · 2020-03-07T20:30:43Z

Also merged into toolchain-2.10 in 4c6df4a.

meyerj and others added 30 commits December 17, 2015 20:32

Bumped version to 2.9.0

d2afa2e

Merge remote-tracking branch 'meyerj/fix/remote-syslog-appender' into…

f35232d

… toolchain-2.9

Merge remote-tracking branch 'meyerj/renamed-to-orocos-log4cpp' into …

08f308a

…toolchain-2.9

Merge remote-tracking branch 'meyerj/master-merged-with-upstream' int…

41314bd

…o toolchain-2.9

PropertyConfiguratorImpl: add target property to allow printing to ST…

f416754

…DERR

Merge pull request orocos-toolchain#5 from snrkiwi/rdt-support-osx1011

f6d57db

Support OS X 10.11 with system integrity protection enabled

Merge remote-tracking branch 'origin/master' into toolchain-2.9

25cdf18

Add configuration targets into tests for ConsoleAppender

e036c02

mem leak solution for all appenders

1871fa7

mem leak: code cleanup Memory leak checks: added separate project Runnable for facilitating memleak checking log4cppRunnable.vcxproj itself

config fixes; rem commented line

4aaf870

Merge branch 'bug-139-mem-leaks-alltogether' of ssh://git.code.sf.net…

1538197

…/p/log4cpp/codegit

bug-140: removed std::cout when file rollover

d5b7452

bug-142: conservative fix

1302186

bug-141: conservative fix

c209a97

Merge branch 'master' into toolchain-2.9

18b189e

Conflicts: package.xml

Fix for reported patch-45, plus tests and minors

544f6a2

src/PThreads.cpp

79c3124

small rename

81786dd

LOG4CPP_EXPORT

c7d21d8

fix for bugs-143

14babda

Add missing config.h/Portability.hh include

fe4ed07

bug-145: fix daily rolling; add manual test to see rolling

626e36a

ChangeLog

e245faf

daily test support for windows

2053240

test daily rolling: disable test which changes dates

d239bf9

doc update

cad9150

Merge pull request orocos-toolchain#7 from snrkiwi/fix-rpath

e41198f

cmake: Correctly set RPATH accounting for OS X and CMake versions

Alexander Perepelkin and others added 5 commits June 3, 2017 15:51

fix for bug 146 by Ryan Schmidt

4b6dd21

fix for bug 147 - Being prepared for Removing Deprecated Exception Sp…

1b9f8f7

…ecifications from C++17

ChangeLog

2e117d8

Merge remote-tracking branch 'origin/master' into toolchain-2.9

1f6915e

Merge remote-tracking branch 'upstream/master' into master-merged-wit…

4bff3f8

…h-upstream

meyerj added this to the 2.9 milestone Oct 26, 2017

meyerj added a commit to meyerj/log4cpp that referenced this pull request Oct 26, 2017

Merge pull request orocos-toolchain#12 into rdt-toolchain-2.9-cherry-…

30a577a

…pick Merge with upstream version 2017-07-13 08:48

meyerj modified the milestones: 2.9, 2.10 Apr 16, 2019

meyerj changed the base branch from toolchain-2.9 to toolchain-2.10 June 21, 2019 11:08

meyerj changed the base branch from toolchain-2.10 to master March 7, 2020 20:28

meyerj merged commit a920aca into orocos-toolchain:master Mar 7, 2020

meyerj deleted the master-merged-with-upstream branch March 7, 2020 20:28

meyerj mentioned this pull request Jan 30, 2025

Build on raspberry pi fails #23

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge with upstream version 2017-07-13 08:48 #12

Merge with upstream version 2017-07-13 08:48 #12

meyerj commented Oct 26, 2017

meyerj commented Oct 31, 2017

francisco-miguel-almeida commented Apr 16, 2019

meyerj commented Apr 16, 2019

medenes commented Mar 6, 2020

snrkiwi commented Mar 7, 2020

meyerj commented Mar 7, 2020

snrkiwi commented Mar 7, 2020

meyerj commented Mar 7, 2020

Merge with upstream version 2017-07-13 08:48 #12

Merge with upstream version 2017-07-13 08:48 #12

Conversation

meyerj commented Oct 26, 2017

meyerj commented Oct 31, 2017

francisco-miguel-almeida commented Apr 16, 2019

meyerj commented Apr 16, 2019

medenes commented Mar 6, 2020

snrkiwi commented Mar 7, 2020

meyerj commented Mar 7, 2020

snrkiwi commented Mar 7, 2020

meyerj commented Mar 7, 2020