From 59e34ccd1ca5cacf090bac893a6a1773d2249c94 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Thu, 13 Sep 2012 20:29:39 +0000 Subject: [PATCH] check target call cppcheck if it is installed --- Makefile.in | 1 + configure | 53 +++++++++++++++++++++++++++ configure.ac | 3 ++ icons/hicolor/14x14/Makefile.in | 1 + icons/hicolor/16x16/Makefile.in | 1 + icons/hicolor/22x22/Makefile.in | 1 + icons/hicolor/24x24/Makefile.in | 1 + icons/hicolor/32x32/Makefile.in | 1 + icons/hicolor/48x48/Makefile.in | 1 + icons/hicolor/64x64/Makefile.in | 1 + icons/hicolor/scalable/Makefile.in | 1 + icons/ubuntu-mono-dark/apps/22/Makefile.in | 1 + icons/ubuntu-mono-dark/status/22/Makefile.in | 1 + icons/ubuntu-mono-light/status/22/Makefile.in | 1 + scripts/cppcheck.sh | 5 --- src/Makefile.in | 1 + src/glade/Makefile.in | 1 + src/lib/Makefile.in | 1 + src/lib/psensor.h | 16 ++++---- src/server/Makefile.in | 1 + tests/Makefile.am | 4 ++ tests/Makefile.in | 4 +- tests/test-cppcheck.sh | 5 +++ www/Makefile.in | 1 + 24 files changed, 93 insertions(+), 14 deletions(-) delete mode 100755 scripts/cppcheck.sh create mode 100644 tests/test-cppcheck.sh diff --git a/Makefile.in b/Makefile.in index 510c947..59ccd18 100644 --- a/Makefile.in +++ b/Makefile.in @@ -175,6 +175,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/configure b/configure index 98ecf0b..852f2b9 100755 --- a/configure +++ b/configure @@ -606,6 +606,9 @@ gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +CPPCHECK_FALSE +CPPCHECK_TRUE +HAVE_CPPCHECK HELP2MAN GTOP_FALSE GTOP_TRUE @@ -8768,6 +8771,52 @@ fi done +# Extract the first word of "cppcheck", so it can be a program name with args. +set dummy cppcheck; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_HAVE_CPPCHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$HAVE_CPPCHECK"; then + ac_cv_prog_HAVE_CPPCHECK="$HAVE_CPPCHECK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_HAVE_CPPCHECK="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +HAVE_CPPCHECK=$ac_cv_prog_HAVE_CPPCHECK +if test -n "$HAVE_CPPCHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_CPPCHECK" >&5 +$as_echo "$HAVE_CPPCHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test -n "$HAVE_CPPCHECK"; then + CPPCHECK_TRUE= + CPPCHECK_FALSE='#' +else + CPPCHECK_TRUE='#' + CPPCHECK_FALSE= +fi + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -8937,6 +8986,10 @@ if test -z "${GTOP_TRUE}" && test -z "${GTOP_FALSE}"; then as_fn_error $? "conditional \"GTOP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CPPCHECK_TRUE}" && test -z "${CPPCHECK_FALSE}"; then + as_fn_error $? "conditional \"CPPCHECK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/configure.ac b/configure.ac index e8dc011..8d1dba2 100644 --- a/configure.ac +++ b/configure.ac @@ -264,4 +264,7 @@ AC_CONFIG_FILES([ AC_CHECK_PROGS([HELP2MAN], [help2man]) +AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes) +AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK") + AC_OUTPUT diff --git a/icons/hicolor/14x14/Makefile.in b/icons/hicolor/14x14/Makefile.in index 8992f8a..bb53d7b 100644 --- a/icons/hicolor/14x14/Makefile.in +++ b/icons/hicolor/14x14/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/hicolor/16x16/Makefile.in b/icons/hicolor/16x16/Makefile.in index d2a539f..0d69e59 100644 --- a/icons/hicolor/16x16/Makefile.in +++ b/icons/hicolor/16x16/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/hicolor/22x22/Makefile.in b/icons/hicolor/22x22/Makefile.in index f09157e..25206bc 100644 --- a/icons/hicolor/22x22/Makefile.in +++ b/icons/hicolor/22x22/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/hicolor/24x24/Makefile.in b/icons/hicolor/24x24/Makefile.in index 4a4ecdd..af4699e 100644 --- a/icons/hicolor/24x24/Makefile.in +++ b/icons/hicolor/24x24/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/hicolor/32x32/Makefile.in b/icons/hicolor/32x32/Makefile.in index 48b4679..e6eb330 100644 --- a/icons/hicolor/32x32/Makefile.in +++ b/icons/hicolor/32x32/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/hicolor/48x48/Makefile.in b/icons/hicolor/48x48/Makefile.in index 6e4bf5a..c3a86cb 100644 --- a/icons/hicolor/48x48/Makefile.in +++ b/icons/hicolor/48x48/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/hicolor/64x64/Makefile.in b/icons/hicolor/64x64/Makefile.in index 4751bd7..1353e66 100644 --- a/icons/hicolor/64x64/Makefile.in +++ b/icons/hicolor/64x64/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/hicolor/scalable/Makefile.in b/icons/hicolor/scalable/Makefile.in index 9e131f7..6cbf146 100644 --- a/icons/hicolor/scalable/Makefile.in +++ b/icons/hicolor/scalable/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/ubuntu-mono-dark/apps/22/Makefile.in b/icons/ubuntu-mono-dark/apps/22/Makefile.in index 9c623bc..654b200 100644 --- a/icons/ubuntu-mono-dark/apps/22/Makefile.in +++ b/icons/ubuntu-mono-dark/apps/22/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/ubuntu-mono-dark/status/22/Makefile.in b/icons/ubuntu-mono-dark/status/22/Makefile.in index 9e0a6df..28e53ca 100644 --- a/icons/ubuntu-mono-dark/status/22/Makefile.in +++ b/icons/ubuntu-mono-dark/status/22/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/icons/ubuntu-mono-light/status/22/Makefile.in b/icons/ubuntu-mono-light/status/22/Makefile.in index 64a40e4..15941da 100644 --- a/icons/ubuntu-mono-light/status/22/Makefile.in +++ b/icons/ubuntu-mono-light/status/22/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh deleted file mode 100755 index 3d9e14e..0000000 --- a/scripts/cppcheck.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -SDIR=`dirname $0`/.. - -cppcheck $SDIR/src -I $SDIR/src -I $SDIR/src/lib --enable=all --quiet \ No newline at end of file diff --git a/src/Makefile.in b/src/Makefile.in index d323542..a0cab7b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -208,6 +208,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in index 0027543..fc3f64d 100644 --- a/src/glade/Makefile.in +++ b/src/glade/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index d62b9e3..6d9248d 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -129,6 +129,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/src/lib/psensor.h b/src/lib/psensor.h index dfc7629..d0185a6 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -37,19 +37,19 @@ enum psensor_type { SENSOR_TYPE_REMOTE = 0x0004, SENSOR_TYPE_LMSENSOR = 0x0100, - SENSOR_TYPE_NVIDIA_TEMP = 0x0200 | SENSOR_TYPE_TEMP, - SENSOR_TYPE_HDD_TEMP = 0x0400 | SENSOR_TYPE_TEMP, + SENSOR_TYPE_NVIDIA_TEMP = (0x0200 | SENSOR_TYPE_TEMP), + SENSOR_TYPE_HDD_TEMP = (0x0400 | SENSOR_TYPE_TEMP), SENSOR_TYPE_CPU_USAGE = 0x0800, SENSOR_TYPE_AMD = 0x1000, - SENSOR_TYPE_HDD_TEMP_ATASMART = 0x2000 | SENSOR_TYPE_HDD_TEMP, - SENSOR_TYPE_HDD_TEMP_HDDTEMP = 0x4000 | SENSOR_TYPE_HDD_TEMP, + SENSOR_TYPE_HDD_TEMP_ATASMART = (0x2000 | SENSOR_TYPE_HDD_TEMP), + SENSOR_TYPE_HDD_TEMP_HDDTEMP = (0x4000 | SENSOR_TYPE_HDD_TEMP), - SENSOR_TYPE_AMD_TEMP = SENSOR_TYPE_AMD | SENSOR_TYPE_TEMP, - SENSOR_TYPE_AMD_FAN = SENSOR_TYPE_AMD | SENSOR_TYPE_FAN, + SENSOR_TYPE_AMD_TEMP = (SENSOR_TYPE_AMD | SENSOR_TYPE_TEMP), + SENSOR_TYPE_AMD_FAN = (SENSOR_TYPE_AMD | SENSOR_TYPE_FAN), - SENSOR_TYPE_LMSENSOR_TEMP = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_TEMP, - SENSOR_TYPE_LMSENSOR_FAN = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_FAN + SENSOR_TYPE_LMSENSOR_TEMP = (SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_TEMP), + SENSOR_TYPE_LMSENSOR_FAN = (SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_FAN) }; struct psensor { diff --git a/src/server/Makefile.in b/src/server/Makefile.in index 19911f3..198fb0c 100644 --- a/src/server/Makefile.in +++ b/src/server/Makefile.in @@ -140,6 +140,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/tests/Makefile.am b/tests/Makefile.am index aefec3f..eaee750 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,3 +36,7 @@ TESTS = test-io-dir-list.sh \ test-psensor-value-to-str \ test-url-encode \ test-url-normalize + +if CPPCHECK +TESTS += test-cppcheck.sh +endif \ No newline at end of file diff --git a/tests/Makefile.in b/tests/Makefile.in index 90789c6..d909d93 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -41,7 +41,8 @@ check_PROGRAMS = test-io-dir-list$(EXEEXT) \ @GTOP_TRUE@am__append_2 = $(GTOP_LIBS) TESTS = test-io-dir-list.sh test-psensor-type-to-unit-str$(EXEEXT) \ test-psensor-value-to-str$(EXEEXT) test-url-encode$(EXEEXT) \ - test-url-normalize$(EXEEXT) + test-url-normalize$(EXEEXT) $(am__append_3) +@CPPCHECK_TRUE@am__append_3 = test-cppcheck.sh subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -130,6 +131,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/tests/test-cppcheck.sh b/tests/test-cppcheck.sh new file mode 100644 index 0000000..0ecbe43 --- /dev/null +++ b/tests/test-cppcheck.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +EIDS=performance,portability,information,unusedFunction,missingInclude + +cppcheck ../src -I../src/lib -I../src -I.. --enable=$EIDS --quiet --error-exitcode=1 || exit 1 \ No newline at end of file diff --git a/www/Makefile.in b/www/Makefile.in index 7a60a1b..d1b43b4 100644 --- a/www/Makefile.in +++ b/www/Makefile.in @@ -114,6 +114,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ GTOP_LIBS = @GTOP_LIBS@ +HAVE_CPPCHECK = @HAVE_CPPCHECK@ HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -- 2.7.4