From 6b60aab136c19e4febfd8ebc9ecbff25c4672bb4 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Thu, 29 Sep 2022 12:42:29 -0400 Subject: [dist-ide] 优化导出RTThread Studio工程命令 - 导出rtstudio工程时，多增加一级目录，防止BSP本地Sconscript和导出的工程的Sconscript粘接 导致编译出错 - 增加命令别名 --dist-rtstudio 该命令和 --dist-ide命令执行一致，方便用户理解，--dist-ide IDE表示的内容过于宽泛 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/building.py | 7 ++++--- tools/options.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/building.py b/tools/building.py index dfcfd1b689..97f0b41450 100644 --- a/tools/building.py +++ b/tools/building.py @@ -909,13 +909,14 @@ def EndBuilding(target, program = None): project_path = GetOption('project-path') project_name = GetOption('project-name') - if not isinstance(project_path, str) or len(project_path) == 0 : - project_path = os.path.join(BSP_ROOT, 'dist_ide_project') - print("\nwarning : --project-path not specified, use default path: {0}.".format(project_path)) if not isinstance(project_name, str) or len(project_name) == 0: project_name = "dist_ide_project" print("\nwarning : --project-name not specified, use default project name: {0}.".format(project_name)) + if not isinstance(project_path, str) or len(project_path) == 0 : + project_path = os.path.join(BSP_ROOT, 'rt-studio-project', project_name) + print("\nwarning : --project-path not specified, use default path: {0}.".format(project_path)) + rtt_ide = {'project_path' : project_path, 'project_name' : project_name} MkDist(program, BSP_ROOT, Rtt_Root, Env, rtt_ide) need_exit = True diff --git a/tools/options.py b/tools/options.py index edc39d5e75..0840deed81 100644 --- a/tools/options.py +++ b/tools/options.py @@ -38,7 +38,7 @@ def AddOptions(): action = 'store_true', default = False, help = 'make distribution and strip useless files') - AddOption('--dist-ide', + AddOption('--dist-ide', '--dist-rtstudio', dest = 'make-dist-ide', action = 'store_true', default = False, -- cgit v1.3.1