diff options
| author | Bernard Xiong <[email protected]> | 2021-01-25 16:22:19 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-25 16:22:19 +0800 |
| commit | 02a2670f98fc71becf0661c2607ed3bbf6d8c9c2 (patch) | |
| tree | 947191628366d57ddc42e8a191b13570e0f820f6 /tools | |
| parent | 46a2e685a2bd8a1986fdb83a19771f890035a524 (diff) | |
| parent | c38e2bc6ec85310ec4ba63c0d637f9ada474824c (diff) | |
Merge pull request #4264 from margguo/fixbug/keep_makefile_targets
fixbug:keep makefile.targets while it has existed
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/eclipse.py | 18 | ||||
| -rw-r--r-- | tools/rt_studio.py | 4 |
2 files changed, 14 insertions, 8 deletions
diff --git a/tools/eclipse.py b/tools/eclipse.py index b9d34782a1..c1cd3c6623 100644 --- a/tools/eclipse.py +++ b/tools/eclipse.py @@ -523,10 +523,15 @@ def TargetEclipse(env, reset=False, prj_name=None): # generate projcfg.ini file if not os.path.exists('.settings/projcfg.ini'): - if os.path.exists("template.uvprojx"): - file = os.path.abspath("template.uvprojx") + # if search files with uvprojx or uvproj suffix + items = os.listdir(".") + if len(items) > 0: + for item in items: + if item.endswith(".uvprojx") or item.endswith(".uvproj"): + file = os.path.abspath(item) + break else: - file = os.path.abspath("template.uvproj") + file = "" chip_name = rt_studio.get_mcu_info(file) if rt_studio.gen_projcfg_ini_file(chip_name, prj_name, os.path.abspath(".settings/projcfg.ini")) is False: print('Fail!') @@ -540,9 +545,10 @@ def TargetEclipse(env, reset=False, prj_name=None): return # add clean2 target to fix issues when files too many - if rt_studio.gen_makefile_targets(os.path.abspath("makefile.targets")) is False: - print('Fail!') - return + if not os.path.exists('makefile.targets'): + if rt_studio.gen_makefile_targets(os.path.abspath("makefile.targets")) is False: + print('Fail!') + return project = ProjectInfo(env) diff --git a/tools/rt_studio.py b/tools/rt_studio.py index 0a23d6488b..8b34479509 100644 --- a/tools/rt_studio.py +++ b/tools/rt_studio.py @@ -238,9 +238,9 @@ def get_mcu_info(uvproj_file_path): if result: return result.group(1) else: - return "" + return "unknown" else: - return "" + return "unknown" def gen_makefile_targets(output_file_path): |