Fixing build step

* Cleaning up makefile
pull/3561/head
Brian Daniels 2017-02-06 20:55:51 -06:00 committed by Liviu Ionescu
parent 7e7b25265c
commit 57e93a5bab
1 changed files with 7 additions and 7 deletions

View File

@ -320,18 +320,16 @@ class GNUARMEclipse(Exporter):
cmd = [ cmd = [
'eclipse', 'eclipse',
'--launcher.suppressErrors',
'-nosplash', '-nosplash',
'-application org.eclipse.cdt.managedbuilder.core.headlessbuild', '-application org.eclipse.cdt.managedbuilder.core.headlessbuild',
'-data', relpath(tmp_folder, os.getcwd()), '-data', tmp_folder,
'-import', '.', '-import', os.getcwd(),
'-cleanBuild', 'all' '-cleanBuild', project_name
] ]
p = Popen(' '.join(cmd), stdout=PIPE, stderr=PIPE) p = Popen(' '.join(cmd), shell=True, stdout=PIPE, stderr=PIPE)
out, err = p.communicate() out, err = p.communicate()
ret_code = p.returncode ret_code = p.returncode
stdout_string = "=" * 10 + "STDOUT" + "=" * 10 + "\n" stdout_string = "=" * 10 + "STDOUT" + "=" * 10 + "\n"
err_string = "=" * 10 + "STDERR" + "=" * 10 + "\n" err_string = "=" * 10 + "STDERR" + "=" * 10 + "\n"
err_string += err err_string += err
@ -340,7 +338,7 @@ class GNUARMEclipse(Exporter):
if ret_code != 0: if ret_code != 0:
ret_string += "FAILURE\n" ret_string += "FAILURE\n"
print "%s\nSee %s for STDOUT\n%s\n%s" % (stdout_string, log_name, err_string, ret_string) print "%s\n%s\n%s\n%s" % (stdout_string, out, err_string, ret_string)
if log_name: if log_name:
# Write the output to the log file # Write the output to the log file
@ -360,6 +358,8 @@ class GNUARMEclipse(Exporter):
shutil.rmtree('Debug') shutil.rmtree('Debug')
if exists('Release'): if exists('Release'):
shutil.rmtree('Release') shutil.rmtree('Release')
if exists('makefile.targets'):
os.remove('makefile.targets')
# Always remove the temporary folder. # Always remove the temporary folder.
if exists(tmp_folder): if exists(tmp_folder):