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

Merge pull request #4013 from theotherjimmy/fix-subtract-basepath 

Fix a small bug in subtract_basepath
pull/4148/head
Sam Grove 2017-04-10 10:22:57 -05:00 committed by GitHub
parent 1b4a3c3204 20edbe3525
commit 09de12161a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/export/__init__.py
View File

@ -138,7 +138,7 @@ def rewrite_basepath(file_name, resources, export_path, loc):
export_path - the final destination of the file after export export_path - the final destination of the file after export
""" """
new_f = join(loc, relpath(file_name, resources.file_basepath[file_name])) new_f = join(loc, relpath(file_name, resources.file_basepath[file_name]))
resources.file_basepath[join(export_path, new_f)] = export_path resources.file_basepath[new_f] = export_path
return new_f return new_f
@ -309,10 +309,10 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None,
resources.file_basepath[config_header] = dirname(config_header) resources.file_basepath[config_header] = dirname(config_header)
if zip_proj: if zip_proj:
subtract_basepath(resources, export_path) subtract_basepath(resources, ".")
for loc, res in resource_dict.iteritems(): for loc, res in resource_dict.iteritems():
temp = copy.deepcopy(res) temp = copy.deepcopy(res)
subtract_basepath(temp, export_path, loc) subtract_basepath(temp, ".", loc)
resources.add(temp) resources.add(temp)
else: else:
for _, res in resource_dict.iteritems(): for _, res in resource_dict.iteritems():