|
40 | 40 | dest="ide",
|
41 | 41 | default='uvision',
|
42 | 42 | required=True,
|
43 |
| - type=argparse_many(argparse_force_lowercase_type(toolchainlist, "toolchain")), |
| 43 | + type=argparse_force_lowercase_type(toolchainlist, "toolchain"), |
44 | 44 | help="The target IDE: %s"% str(toolchainlist))
|
45 | 45 |
|
46 | 46 | parser.add_argument("-c", "--clean",
|
|
139 | 139 |
|
140 | 140 | for mcu in options.mcu:
|
141 | 141 | # Program Number or name
|
142 |
| - p, src, ides = options.program, options.source_dir, options.ide |
| 142 | + p, src, ide = options.program, options.source_dir, options.ide |
143 | 143 |
|
144 | 144 | if src:
|
145 | 145 | # --source is used to generate IDE files to toolchain directly in the source tree and doesn't generate zip file
|
|
181 | 181 | setup_user_prj(project_dir[0], test.source_dir, test.dependencies)
|
182 | 182 |
|
183 | 183 | # Export to selected toolchain
|
184 |
| - for ide in ides: |
185 |
| - tmp_path, report = export(project_dir, project_name, ide, mcu, project_dir[0], project_temp, clean=clean, make_zip=zip, extra_symbols=lib_symbols, sources_relative=sources_relative) |
186 |
| - if report['success']: |
187 |
| - if not zip: |
188 |
| - zip_path = join(project_temp, project_name) |
189 |
| - else: |
190 |
| - zip_path = join(EXPORT_DIR, "%s_%s_%s.zip" % (project_name, ide, mcu)) |
191 |
| - move(tmp_path, zip_path) |
192 |
| - successes.append("%s::%s\t%s"% (mcu, ide, zip_path)) |
| 184 | + tmp_path, report = export(project_dir, project_name, ide, mcu, project_dir[0], project_temp, clean=clean, make_zip=zip, extra_symbols=lib_symbols, sources_relative=sources_relative) |
| 185 | + if report['success']: |
| 186 | + if not zip: |
| 187 | + zip_path = join(project_temp, project_name) |
193 | 188 | else:
|
194 |
| - failures.append("%s::%s\t%s"% (mcu, ide, report['errormsg'])) |
| 189 | + zip_path = join(EXPORT_DIR, "%s_%s_%s.zip" % (project_name, ide, mcu)) |
| 190 | + move(tmp_path, zip_path) |
| 191 | + successes.append("%s::%s\t%s"% (mcu, ide, zip_path)) |
| 192 | + else: |
| 193 | + failures.append("%s::%s\t%s"% (mcu, ide, report['errormsg'])) |
195 | 194 |
|
196 | 195 | # Prints export results
|
197 | 196 | print
|
|
0 commit comments