@@ -45,15 +45,18 @@ def subtract_basepath(resources, export_path):
45
45
generated project files
46
46
"""
47
47
keys = ['s_sources' , 'c_sources' , 'cpp_sources' , 'hex_files' ,
48
- 'objects' , 'libraries' , 'inc_dirs' , 'headers' , 'linker_script' ]
48
+ 'objects' , 'libraries' , 'inc_dirs' , 'headers' , 'linker_script' ,
49
+ 'lib_dirs' ]
49
50
for key in keys :
50
51
vals = getattr (resources , key )
52
+ if type (vals ) is set :
53
+ vals = list (vals )
51
54
if type (vals ) is list :
52
55
new_vals = []
53
56
for val in vals :
54
57
new_vals .append (rewrite_basepath (val , resources , export_path ))
55
58
setattr (resources , key , new_vals )
56
- else :
59
+ elif vals :
57
60
setattr (resources , key , rewrite_basepath (vals , resources ,
58
61
export_path ))
59
62
@@ -150,9 +153,11 @@ def zip_export(file_name, prefix, resources, project_files):
150
153
resources .libraries + resources .hex_files + \
151
154
[resources .linker_script ] + resources .bin_files \
152
155
+ resources .objects + resources .json_files :
153
- zip_file .write (source ,
154
- join (prefix , relpath (source ,
155
- resources .file_basepath [source ])))
156
+ if source :
157
+ zip_file .write (source ,
158
+ join (prefix ,
159
+ relpath (source ,
160
+ resources .file_basepath [source ])))
156
161
157
162
158
163
def export_project (src_paths , export_path , target , ide ,
0 commit comments