Skip to content

donate-cpu.py: Use Boost library configuration if appropriate #1587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
versat merged 2 commits into from
Feb 4, 2019
Merged

donate-cpu.py: Use Boost library configuration if appropriate #1587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d84c441
donate-cpu.py: Use Boost library configuration if appropriate
versat Feb 4, 2019
50d4be9
For now the boost library configuration detection is commented out. It
versat Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions tools/donate-cpu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)
Expand Down Expand Up @@ -454,10 +455,10 @@ def uploadInfo(package, info_output, server_address):
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!'
Expand Down