Skip to content

Commit ea5d72b

Browse files
authored
Merge pull request #2 from SummerGGift/optimize
【同步】:新修改的测试版本代码
2 parents bc6a604 + 854545d commit ea5d72b

File tree

3 files changed

+202
-198
lines changed

3 files changed

+202
-198
lines changed

cmds/cmd_menuconfig.py

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
#
2121
# Change Logs:
2222
# Date Author Notes
23-
# 2018-5-28 SummerGift Add copyright information
23+
# 2018-05-28 SummerGift Add copyright information
24+
# 2019-01-07 SummerGift The prompt supports utf-8 encoding
2425
#
2526

2627
import os
@@ -156,25 +157,26 @@ def cmd(args):
156157
dirname = os.path.split(os.path.split(currentdir)[0])[0]
157158
get_rtt_name = os.path.basename(dirname)
158159
os_version = platform.platform(True)[10:13]
159-
# print os.path.split(currentdir)[1]
160160
kconfig_win7_path = os.path.join(
161161
env_root, 'tools', 'bin', 'kconfig-mconf_win7.exe')
162162

163163
if not os.getenv("RTT_ROOT"):
164164
if get_rtt_name != 'rt-thread':
165-
print ("menuconfig command should be used in a bsp root path with a Kconfig file, you should check if there is a Kconfig file in your bsp root first.")
166-
print (
167-
'And then you can check Kconfig file and modify the default option below to your rtthread root path.\n')
165+
print("\n<menuconfig> 命令应当在某一特定 BSP 目录下执行,例如:\"rt-thread/bsp/stm32/stm32f091-st-nucleo\"")
166+
print("请确保当前目录为 BSP 根目录,并且该目录中有 Kconfig 文件。\n")
168167

169-
print ('config $RTT_DIR')
168+
print ("<menuconfig> command should be used in a bsp root path with a Kconfig file.")
169+
print ("Example: \"rt-thread/bsp/stm32/stm32f091-st-nucleo\"")
170+
print ("You should check if there is a Kconfig file in your bsp root first.")
171+
172+
print ('\nconfig $RTT_DIR')
170173
print ('string')
171174
print ('option env="RTT_ROOT"')
172175
print ('default "../.."\n')
173-
print ('example: default "F:/git_repositories/rt-thread" \n')
176+
print ('例如修改 default 这一项为 rt-thread 所在路径: default "F:/git_repositories/rt-thread"')
177+
178+
print ('\n下面的警告信息提示与找不到正确的 Kconfig 文件有关:')
174179

175-
print (
176-
"using command 'set RTT_ROOT=your_rtthread_root_path' to set RTT_ROOT is ok too.\n")
177-
print ("you can ignore debug messages below.")
178180
# if not args.menuconfig_easy:
179181
# return
180182

@@ -185,7 +187,8 @@ def cmd(args):
185187
else:
186188
mtime = -1
187189

188-
os.system('chcp 437 > nul')
190+
if platform.system() == "Windows":
191+
os.system('chcp 437 > nul')
189192

190193
if args.menuconfig_fn:
191194
print 'use', args.menuconfig_fn
@@ -217,6 +220,10 @@ def cmd(args):
217220
os.system('kconfig-mconf Kconfig')
218221

219222
os.chdir(beforepath)
223+
224+
if platform.system() == "Windows":
225+
os.system('chcp 65001 > nul')
226+
220227
return
221228
else:
222229
if float(os_version) >= 6.2:
@@ -235,7 +242,8 @@ def cmd(args):
235242
if mtime != mtime2:
236243
mk_rtconfig(fn)
237244

238-
os.system('chcp 65001 > nul')
245+
if platform.system() == "Windows":
246+
os.system('chcp 65001 > nul')
239247

240248
if platform.system() == "Windows":
241249
env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds')
@@ -244,7 +252,6 @@ def cmd(args):
244252
if not os.path.isfile(fn):
245253
return
246254

247-
248255
if find_macro_in_config(fn, 'SYS_AUTO_UPDATE_PKGS'):
249256
os.system('pkgs --update')
250257
print "==============================>The packages have been updated completely."

0 commit comments

Comments
 (0)