I'd say, you have been mindful to post the issue on the mailinglist, so
I recommend your patch.
My arm is almost restored, so now it's your turn to get well soon
yourself. ;)
-- Claus
On 07/27/2016 11:29 PM, Benjamin Hiefner wrote:
Sorry for the late reply, but I've been busy writing my thesis, moving
and/or being sick with a cold.
I'd say we use your patch, since you'll be with codeface longer.
Get well soon.
Best,
Ben
________________________________________
Von: codeface-bounce@xxxxxxxxxxxxx <codeface-bounce@xxxxxxxxxxxxx> im Auftrag
von Claus Hunsen <hunsen@xxxxxxxxxxxxxxxxx>
Gesendet: Freitag, 22. Juli 2016 17:53
An: codeface@xxxxxxxxxxxxx
Betreff: [codeface] Re: Patch for cppstats v0.9.2
Hi,
I have some other open fixes and patches on my branch, including my own
cppstats patch (basically with the same changes as yours), but I have
not been able yet to post this or open a pull request, as I had an
injured arm the last days.
The pull request is now open here:
https://github.com/siemens/codeface/pull/51
-- Claus
Am 22.07.2016 um 17:25 schrieb Benjamin Hiefner:
Dear all,
before/during/after todays team meeting I have created a patch for the
transition to cppstats v0.9.2.
I would request this to be pulled into the master branch.
Best,
Benjamin
From 8f05554b019834807428c07616b1a88ff69c2e4e Mon Sep 17 00:00:00 2001
From: Benjamin Hiefner <benjamin.hiefner@xxxxxxxxxxxxxxxxxxxx>
Date: Fri, 22 Jul 2016 16:25:39 +0200
Subject: [PATCH] Adjusted util.py, install_cppstats.sh for v0.9.2
Removed enum hack no longer required in install_cppstats.sh
---
codeface/util.py | 2 +-
integration-scripts/install_cppstats.sh | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/codeface/util.py b/codeface/util.py
index 80aee7b..1acb009 100644
--- a/codeface/util.py
+++ b/codeface/util.py
@@ -395,7 +395,7 @@ def check4cppstats():
"""
# We can not check the version directly as there is no version switch
# on cppstats We just check if the first line is OK.
- line = "cppstats v0.9.0"
+ line = "cppstats v0.9.2"
cmd = "/usr/bin/env cppstats --version".split()
res = execute_command(cmd)
if not (res.startswith(line)):
diff --git a/integration-scripts/install_cppstats.sh
b/integration-scripts/install_cppstats.sh
index e3abea2..b56085c 100755
--- a/integration-scripts/install_cppstats.sh
+++ b/integration-scripts/install_cppstats.sh
@@ -5,7 +5,7 @@
# Copyright Wolfgang Mauerer <wolfgang.mauerer@xxxxxxxxxxxxxxxxx>
# SPDX-License-Identifier: Apache-2.0 BSD-2-Clause GPL-2.0+ MIT WTFPL
-export CPPSTATS_VERSION=0.9.0
+export CPPSTATS_VERSION=0.9.2
echo "Providing cppstats $CPPSTATS_VERSION"
@@ -21,8 +21,7 @@ then
exit 1
fi
(cd ${TMPDIR} && tar -xvf ${TMPDIR}/cppstats.tar.gz &&
- cd cppstats-${CPPSTATS_VERSION} && sed -i s/enum==0.4.4/enum/ setup.py
&&
- sed -i s/cppstats.version\(\)/\"0.9.0\"/ setup.py &&
+ cd cppstats-${CPPSTATS_VERSION} &&
sed -i s/"import cppstats"// setup.py &&
sudo python setup.py install)
Attachment:
signature.asc
Description: OpenPGP digital signature
