widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/scan-build-cmake into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/scan-build-cmake/+merge/175269

Yesterday I learnt that it is sufficient to run `scan-build cmake` to have it replace the compiler in the necessary places. Thus there is no need to find and add the script manually. This should also expand cross-platform support quite a bit.

PS.
SirVer: I think this might work on OS X too now, if you want to test it. :)
-- 
https://code.launchpad.net/~hjd/widelands/scan-build-cmake/+merge/175269
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/scan-build-cmake into lp:widelands.

=== modified file 'utils/scan-build.sh'
--- utils/scan-build.sh	2013-07-14 10:34:35 +0000
+++ utils/scan-build.sh	2013-07-17 12:38:26 +0000
@@ -14,27 +14,13 @@
   exit 1
 fi
 
-if [ -e /usr/share/clang/scan-build/c++-analyzer ]; then
-  #Debian-based
-  ANALYZER=/usr/share/clang/scan-build/c++-analyzer
-elif [ -e /usr/lib/clang-analyzer/scan-build/c++-analyzer ]; then
-  #Arch
-  ANALYZER=/usr/lib/clang-analyzer/scan-build/c++-analyzer
-else 
-  echo "Could not find c++-analyzer on your platform."
-  echo "We are currenly only able to locate it on Arch and Debian-based platforms."
-  echo "If you know where we could find it, please let us know."
-  exit 1
-fi
-
 SOURCE_DIR=`pwd`
 BUILD_DIR=$SOURCE_DIR/build/scan-build
 
 mkdir -p $BUILD_DIR
 cd $BUILD_DIR
 
-cmake $SOURCE_DIR -DCMAKE_CXX_COMPILER=$ANALYZER \
- -DCMAKE_BUILD_TYPE=Debug \
+scan-build cmake $SOURCE_DIR -DCMAKE_BUILD_TYPE=Debug \
  -DWL_PORTABLE=true 
 
 scan-build make