Skip to content

Fix build info collector crash #52

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

Open
doug-a-brunner wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix build info collector crash #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
296409d
Fix crash with Python 3
Oct 2, 2018
90887e0
Fixed regression of BuildInfoCollector with python2
Dec 4, 2018
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
4 changes: 2 additions & 2 deletions ...sr.ifs.sconsolidator.core.tests/scons_files/test_projects/gartenbau/BuildInfoCollector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def invoke_compiler(lang, environ):
[get_compiler(environ), '-v', get_gcc_lang_param(lang)] + get_compiler_flags(lang, environ) + [in_path, '-o', out_path],
stdin='devnull', stderr=subprocess.PIPE, stdout=subprocess.PIPE)
(_, perr) = process.communicate()
return perr
return perr.decode()

def parse_includes(cc_output):
cc_output = cc_output.replace('\r', '')
Expand Down Expand Up @@ -160,7 +160,7 @@ def collect_sys_macros(lang, environ):
(pout, _) = process.communicate()
sysmacros = set()

for it in re.finditer('^#define (.*) (.*)$', pout, re.M):
for it in re.finditer('^#define (.*) (.*)$', pout.decode(), re.M):
sysmacros.add('%s=%s' % (it.groups()[0], it.groups()[1].strip()))
return sysmacros

Expand Down
16 changes: 13 additions & 3 deletions ch.hsr.ifs.sconsolidator.core/scons_files/BuildInfoCollector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ def invoke_compiler(lang, environ):
[get_compiler(environ), '-v', get_gcc_lang_param(lang)] + get_compiler_flags(lang, environ) + [in_path, '-o', out_path],
stdin='devnull', stderr=subprocess.PIPE, stdout=subprocess.PIPE)
(_, perr) = process.communicate()
return perr
try:
return perr.decode()
except AttributeError:
return perr

def parse_includes(cc_output):
cc_output = cc_output.replace('\r', '')
Expand Down Expand Up @@ -127,8 +130,11 @@ def macro_binding(macro, value):
return '{macro}={value}'.format(**locals())

def handle_dict(d):
return set(macro_binding(k, v) for (k, v) in d.iteritems())

try:
return set(macro_binding(k, v) for (k, v) in d.iteritems())
except AttributeError:
return set(macro_binding(k, v) for (k, v) in d.items())

cpp_defines = environ['CPPDEFINES']

if isinstance(cpp_defines, (list, tuple)):
Expand Down Expand Up @@ -160,6 +166,10 @@ def collect_sys_macros(lang, environ):
(pout, _) = process.communicate()
sysmacros = set()

try:
pout = pout.decode()
except AttributeError:
pass
for it in re.finditer('^#define (.*) (.*)$', pout, re.M):
sysmacros.add('%s=%s' % (it.groups()[0], it.groups()[1].strip()))
return sysmacros
Expand Down