SConstruct: improved lcov cleaning

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1415 270642c3-0616-0410-b53a-bc976706d245

diff --git a/SConstruct b/SConstruct
index c0fe565..c64ab9a 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -184,16 +184,20 @@ for test in env.FindAllBoostUnitTests():
 ### lcov
 env.PhonyTarget('lcov', [], [
         '$SCONS debug=1 CCFLAGS+="-fprofile-arcs -ftest-coverage" LIBS+="gcov" all_tests',
-        '$LCOV --directory $TOPDIR/senf --capture --output-file /tmp/senf_lcov.info --base-directory $TOPDIR',
+        '$LCOV --follow --directory $TOPDIR/senf --capture --output-file /tmp/senf_lcov.info --base-directory $TOPDIR',
         '$LCOV --output-file lcov.info --remove /tmp/senf_lcov.info "*/include/*" "*/boost/*" "*.test.*" ',
         '$GENHTML --output-directory doc/lcov --title all_tests lcov.info',
         'rm /tmp/senf_lcov.info' ])
-
+if env.GetOption('clean'): 
+    env.Depends('lcov', 'all_tests')
+env.Clean('lcov', [ os.path.join(path,f)
+                    for path, subdirs, files in os.walk('.')
+                    for pattern in ['*.gcno', '*.gcda', '*.gcov']
+                    for f in fnmatch.filter(files,pattern) ] + 
+                  [ 'lcov.info', env.Dir('doc/lcov') ])
+    
 #### clean
-env.Clean('all', '.prepare-stamp')
-env.Clean('all', libsenf)
-env.Clean('all', env.Dir('dist'))
-env.Clean('all', 'lcov.info')
+env.Clean('all', ('.prepare-stamp', libsenf, env.Dir('dist'), 'lcov.info', env.Dir('doc/lcov') ))
 
 if env.GetOption('clean'):
     env.Clean('all', [ os.path.join(path,f)

diff --git a/senf/config.hh b/senf/config.hh
index bf13b1e..e31bc20 100644 (file)
--- a/senf/config.hh
+++ b/senf/config.hh
@@ -1,36 +1,36 @@
-# // $Id$
-# //
-# // Copyright (C) 2007
-# // Fraunhofer Institute for Open Communication Systems (FOKUS)
-# // Competence Center NETwork research (NET), St. Augustin, GERMANY
-# //     Stefan Bund <g0dil@berlios.de>
-# //
-# // This program is free software; you can redistribute it and/or modify
-# // it under the terms of the GNU General Public License as published by
-# // the Free Software Foundation; either version 2 of the License, or
-# // (at your option) any later version.
-# //
-# // This program is distributed in the hope that it will be useful,
-# // but WITHOUT ANY WARRANTY; without even the implied warranty of
-# // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# // GNU General Public License for more details.
-# //
-# // You should have received a copy of the GNU General Public License
-# // along with this program; if not, write to the
-# // Free Software Foundation, Inc.,
-# // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-# 
-# /** \file
-#     \brief config public header */
-# 
-# ifndef HH_config_
-# define HH_config_ 1
-# 
-# // Custom includes
-# include <boost/cstdint.hpp>
-# include <limits.h>
-# 
-# ///////////////////////////////hh.p////////////////////////////////////////
+// $Id$
+//
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+/** \file
+    \brief config public header */
+ 
+#ifndef HH_config_
+#define HH_config_ 1
+ 
+// Custom includes
+#include <boost/cstdint.hpp>
+#include <limits.h>
+ 
+///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
 namespace config {
@@ -101,9 +101,9 @@ namespace config {
 # if __GLIBC__>=2 && __GLIBC_MINOR__>=8
 #     define HAVE_TIMERFD 1
 # endif
-# 
-# ///////////////////////////////hh.e////////////////////////////////////////
-# endif
+ 
+///////////////////////////////hh.e////////////////////////////////////////
+#endif
  
 \f
 // Local Variables: