From 360ba33e4cf33d276d7b5256cb47e2024ce063c9 Mon Sep 17 00:00:00 2001
From: Sebastian <versat@users.noreply.github.com>
Date: Mon, 4 Feb 2019 11:05:14 +0100
Subject: [PATCH] donate-cpu.py: Use Boost library configuration if appropriate
 (#1587)

Add check to only use boost library if boost.cfg exists since it is very new.
If the boost.cfg does not exist Cppcheck would exit with an error and we
would not get the desired results.
For now the boost library configuration detection is commented out. It
should be enabled after the release of Cppcheck 1.87.
Tested locally.
---
 tools/donate-cpu.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/donate-cpu.py b/tools/donate-cpu.py
index 1c0046fed..93d163186 100644
--- a/tools/donate-cpu.py
+++ b/tools/donate-cpu.py
@@ -218,7 +218,7 @@ def hasInclude(path, includes):
     return False
 
 
-def scanPackage(workPath, cppcheck, jobs):
+def scanPackage(workPath, cppcheckPath, jobs):
     print('Analyze..')
     os.chdir(workPath)
     libraries = ' --library=posix'
@@ -234,12 +234,13 @@ def scanPackage(workPath, cppcheck, jobs):
         libraries += ' --library=wxwidgets'
     if hasInclude('temp', ['<zlib.h>']):
         libraries += ' --library=zlib'
-#    if hasInclude('temp', ['<boost/']):
+# TODO: enable boost library configuration detection after release of Cppcheck 1.87
+#    if os.path.exists(cppcheckPath + '/cfg/boost.cfg') and hasInclude('temp', ['<boost/']):
 #        libraries += ' --library=boost'
 
 # Reference for GNU C: https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
     options = jobs + libraries + ' --library=gnu -D__GNUC__ --check-library --inconclusive --enable=style,information --platform=unix64 --template=daca2 -rp=temp temp'
-    cmd = 'nice ' + cppcheck + ' ' + options
+    cmd = 'nice ' + cppcheckPath + '/cppcheck' + ' ' + options
     print(cmd)
     startTime = time.time()
     p = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -454,10 +455,10 @@ while True:
     head_info_msg = ''
     for ver in cppcheckVersions:
         if ver == 'head':
-            cppcheck = 'cppcheck/cppcheck'
+            current_cppcheck_dir = 'cppcheck'
         else:
-            cppcheck = ver + '/cppcheck'
-        c, errout, info, t, cppcheck_options = scanPackage(workpath, cppcheck, jobs)
+            current_cppcheck_dir = ver
+        c, errout, info, t, cppcheck_options = scanPackage(workpath, current_cppcheck_dir, jobs)
         if c < 0:
             crash = True
             count += ' Crash!'