From 285293236756c39a4b369f8c45838338df4e76c5 Mon Sep 17 00:00:00 2001 From: Bogdan Marinescu Date: Mon, 27 Jun 2016 18:16:46 +0300 Subject: [PATCH] Change directory generation for project files. Before this PR: ``` Successful exports: * K64F::uvision .\projectfiles\uvision\Unnamed_Project_K64F ``` After this PR: ``` Successful exports: * K64F::uvision .\projectfiles\uvision_K64F\Unnamed_Project ``` The directory name now contains _, and there's a single project per directory as a result. --- tools/project.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/project.py b/tools/project.py index e41f6c3faa..db2559decb 100644 --- a/tools/project.py +++ b/tools/project.py @@ -149,7 +149,7 @@ if __name__ == '__main__': # --source is used to generate IDE files to toolchain directly in the source tree and doesn't generate zip file project_dir = options.source_dir project_name = n if n else "Unnamed_Project" - project_temp = path.join(options.source_dir[0], 'projectfiles', ide) + project_temp = path.join(options.source_dir[0], 'projectfiles', '%s_%s' % (ide, mcu)) mkdir(project_temp) lib_symbols = [] if options.macros: @@ -213,7 +213,7 @@ if __name__ == '__main__': tmp_path, report = export(project_dir, project_name, ide, mcu, project_dir[0], project_temp, clean=clean, zip=zip, extra_symbols=lib_symbols, relative=sources_relative) if report['success']: if not zip: - zip_path = join(project_temp, "%s_%s" % (project_name, mcu)) + zip_path = join(project_temp, project_name) else: zip_path = join(EXPORT_DIR, "%s_%s_%s.zip" % (project_name, ide, mcu)) move(tmp_path, zip_path)