From cb1ea7bd463c15fc6294d4403aa46051331c66be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Sun, 5 Aug 2007 08:40:41 +0000
Subject: [PATCH] Release 3-2-2 with tag: REL_mrw-c++-3-2-2

---
 ChangeLog             |  3 +++
 configure.in          |  2 +-
 makefile.am           |  2 +-
 suppressions.valgrind | 63 +++++++++++++++++++++++++++++++++++++++++++
 valcheck.sh           | 49 +++++++++++++++++++++++++++++++++
 5 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 suppressions.valgrind
 create mode 100755 valcheck.sh

diff --git a/ChangeLog b/ChangeLog
index c1c3638..387f7d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* Sun Aug 5 2007 Marc Waeckerlin - mrw-c++-3.2.2 (mrw)
+	- Added Valgrind files
+	- No redundant checking in makefile for "make release"
 * Sun Aug 5 2007 Marc Waeckerlin - mrw-c++-3.2.1 (mrw)
 	- Compatibility to UNICODE log4cxx 0.9.7
 * Fri Jul 7 2007 Marc Waeckerlin - mrw-c++-3.2.0 (mrw)
diff --git a/configure.in b/configure.in
index 580c9ae..2121f63 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ AC_CANONICAL_SYSTEM
 PACKAGENAME=mrw-c++
 m4_define(x_major, 3)
 m4_define(x_minor, 2)
-m4_define(x_least, 1)
+m4_define(x_least, 2)
 
 # copy M4 to shell
 MAJOR=x_major
diff --git a/makefile.am b/makefile.am
index cda41b4..daf1a2b 100644
--- a/makefile.am
+++ b/makefile.am
@@ -54,7 +54,7 @@ rpm: dist
 	rpmbuild -ba --clean @PACKAGENAME@.spec
 	rpmbuild -bb --clean @PACKAGENAME@-minimal.spec
 
-webserver: check distcheck rpm webserver.en webserver.de webserver.zh
+webserver: rpm webserver.en webserver.de webserver.zh
 	- rm -rf ~/www/marc/data/doxygen/mrw-cpp
 	mkdir -p  ~/www/marc/data/doxygen/mrw-cpp
 	cp doc/html/*.html ~/www/marc/data/doxygen/mrw-cpp/
diff --git a/suppressions.valgrind b/suppressions.valgrind
new file mode 100644
index 0000000..6477d74
--- /dev/null
+++ b/suppressions.valgrind
@@ -0,0 +1,63 @@
+# log4cxx #######################################################################
+{
+   log4cxx-Addr1-TimeZone
+   Memcheck:Addr1
+   fun:*
+   fun:*
+   fun:*log4cxx*
+}
+{
+   log4cxx-Addr2-getProperty
+   Memcheck:Addr2
+   fun:*
+   fun:*log4cxx*
+}
+{
+   log4cxx-Free-StringTokenizer
+   Memcheck:Free
+   fun:*
+   fun:*log4cxx*
+}
+{
+   log4cxx-Addr1-TimeZone2
+   Memcheck:Addr1
+   fun:*
+   fun:*
+   fun:*
+   fun:*log4cxx*
+}
+{
+   log4cxx-Addr2-DateFormat::format1
+   Memcheck:Addr2
+   fun:*
+   fun:*
+   fun:*
+   fun:*
+   fun:*log4cxx*
+}
+{
+   log4cxx-Addr2-DateFormat::format2
+   Memcheck:Addr2
+   fun:*
+   fun:*
+   fun:*
+   fun:*
+   fun:*
+   fun:*log4cxx*
+}
+{
+   log4cxx-Cond-DateFormat::format
+   Memcheck:Cond
+   fun:*
+   fun:*
+   fun:*
+   fun:*
+   fun:*
+   fun:*log4cxx*
+}
+# system ########################################################################
+{
+   system-Addr2-getenv
+   Memcheck:Addr2
+   fun:getenv
+}
diff --git a/valcheck.sh b/valcheck.sh
new file mode 100755
index 0000000..af0b3c8
--- /dev/null
+++ b/valcheck.sh
@@ -0,0 +1,49 @@
+#! /bin/bash
+
+# (c) Siemens Schweiz AG, vertraulich
+# $Id: checklatest.sh 323 2007-02-23 15:32:45Z chawama0 $
+#
+#        1          2         3         4         5         6         7         8
+# 3456789012345676890123456789012345678901234567890123456789012345678901234567890
+
+printUsage() {
+    echo "Usage: $0 <program-to-check>"
+    echo ""
+    echo "This script checks a program using valgrind."
+    return 0
+}
+
+if [ $# -ne 1 -o "$1" = "-h" -o "$1" = "--help" ] ; then
+    printUsage
+    exit 1
+fi
+
+if ! valgrind \
+  --show-reachable=yes \
+  --leak-check=full \
+  --gen-suppressions=all \
+  --log-file-exactly=valgrind.log \
+  --suppressions=$(dirname $0)/suppressions.valgrind \
+  $1; then
+  echo "******** Valcheck: Testfall fehlgeschlagen! (normaler Fehler)"
+  exit 1
+fi
+
+if ! ( ( grep 'ERROR SUMMARY: 0 errors from 0 contexts' valgrind.log \
+         && \
+         ( grep 'definitely lost: 0 bytes in 0 blocks' valgrind.log \
+           && \
+           grep 'possibly lost: 0 bytes in 0 blocks' valgrind.log \
+           && \
+           grep 'still reachable: 0 bytes in 0 blocks' valgrind.log \
+           ||
+           grep 'All heap blocks were freed -- no leaks are possible' \
+                valgrind.log
+         )
+     ) 2>&1 > /dev/null ); then
+  mv valgrind.log valgrind-$(basename $1).error
+  echo "******** Valcheck: Speicherfehler! Siehe valgrind-$(basename $1).error"
+  exit 1
+fi
+
+rm valgrind.log