Skip to content

Commit 5f18943

Browse files
committed
Revert parsing of mutiple ides on command line
1 parent 9040d27 commit 5f18943

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

tools/project.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
dest="ide",
4141
default='uvision',
4242
required=True,
43-
type=argparse_many(argparse_force_lowercase_type(toolchainlist, "toolchain")),
43+
type=argparse_force_lowercase_type(toolchainlist, "toolchain"),
4444
help="The target IDE: %s"% str(toolchainlist))
4545

4646
parser.add_argument("-c", "--clean",
@@ -139,7 +139,7 @@
139139

140140
for mcu in options.mcu:
141141
# 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
143143

144144
if src:
145145
# --source is used to generate IDE files to toolchain directly in the source tree and doesn't generate zip file
@@ -181,17 +181,16 @@
181181
setup_user_prj(project_dir[0], test.source_dir, test.dependencies)
182182

183183
# 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)
193188
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']))
195194

196195
# Prints export results
197196
print

0 commit comments

Comments
 (0)