ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Made exporting safer 

it will no longer barf when:
 - a linker scirpt is None
 - an attribute that is a set
it will also export the correct library include paths
pull/2245/head
Jimmy Brisson 2016-07-28 19:05:40 -05:00
parent 67fae3a705
commit 3e2526a424
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/project_api.py
View File

@ -45,15 +45,18 @@ def subtract_basepath(resources, export_path):
generated project files generated project files
""" """
keys = ['s_sources', 'c_sources', 'cpp_sources', 'hex_files', keys = ['s_sources', 'c_sources', 'cpp_sources', 'hex_files',
'objects', 'libraries', 'inc_dirs', 'headers', 'linker_script'] 'objects', 'libraries', 'inc_dirs', 'headers', 'linker_script',
'lib_dirs']
for key in keys: for key in keys:
vals = getattr(resources, key) vals = getattr(resources, key)
if type(vals) is set:
vals = list(vals)
if type(vals) is list: if type(vals) is list:
new_vals = [] new_vals = []
for val in vals: for val in vals:
new_vals.append(rewrite_basepath(val, resources, export_path)) new_vals.append(rewrite_basepath(val, resources, export_path))
setattr(resources, key, new_vals) setattr(resources, key, new_vals)
else: elif vals:
setattr(resources, key, rewrite_basepath(vals, resources, setattr(resources, key, rewrite_basepath(vals, resources,
export_path)) export_path))
@ -150,9 +153,11 @@ def zip_export(file_name, prefix, resources, project_files):
resources.libraries + resources.hex_files + \ resources.libraries + resources.hex_files + \
[resources.linker_script] + resources.bin_files \ [resources.linker_script] + resources.bin_files \
+ resources.objects + resources.json_files: + resources.objects + resources.json_files:
zip_file.write(source, if source:
join(prefix, relpath(source, zip_file.write(source,
resources.file_basepath[source]))) join(prefix,
relpath(source,
resources.file_basepath[source])))
def export_project(src_paths, export_path, target, ide, def export_project(src_paths, export_path, target, ide,