first print stdout, then stderr; fixes #174
This commit is contained in:
parent
7c5f82bc8a
commit
dfd6e41946
@ -93,16 +93,21 @@ def run_cmake(command, build_path, default_build_path):
|
|||||||
stdout_coded, stderr_coded = p.communicate()
|
stdout_coded, stderr_coded = p.communicate()
|
||||||
stdout = stdout_coded.decode('UTF-8')
|
stdout = stdout_coded.decode('UTF-8')
|
||||||
stderr = stderr_coded.decode('UTF-8')
|
stderr = stderr_coded.decode('UTF-8')
|
||||||
|
|
||||||
|
# print cmake output to screen
|
||||||
|
print(stdout)
|
||||||
|
|
||||||
if stderr:
|
if stderr:
|
||||||
sys.stderr.write(stderr)
|
sys.stderr.write(stderr)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
# print cmake output to screen
|
|
||||||
print(stdout)
|
|
||||||
# write cmake output to file
|
# write cmake output to file
|
||||||
with open('cmake_output', 'w') as f:
|
with open('cmake_output', 'w') as f:
|
||||||
f.write(stdout)
|
f.write(stdout)
|
||||||
|
|
||||||
# change directory and return
|
# change directory and return
|
||||||
os.chdir(topdir)
|
os.chdir(topdir)
|
||||||
|
|
||||||
if 'Configuring incomplete' in stdout:
|
if 'Configuring incomplete' in stdout:
|
||||||
# configuration was not successful
|
# configuration was not successful
|
||||||
if (build_path == default_build_path):
|
if (build_path == default_build_path):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user