Merge pull request #78 from RT-Thread/develop

【更新】：升级到 1.1 版本 env 功能代码，优化错误处理逻辑

Author: armink

archive.py

@@ -30,9 +30,9 @@
 
 
 def unpack(archive_fn, path, pkg, pkgs_name_in_json):
-
+    pkg_ver = pkg['ver']
     flag = True
-    
+
     if ".tar.bz2" in archive_fn:
         arch = tarfile.open(archive_fn, "r:bz2")
         for tarinfo in arch:
@@ -64,7 +64,7 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
                 # Gets the folder name and change_dirname only once
                 if flag:
                     dir_name = os.path.split(right_path)[0]
-                    change_dirname = pkgs_name_in_json + '-' + pkg['ver']
+                    change_dirname = pkgs_name_in_json + '-' + pkg_ver
                     flag = False
 
                 right_name_to_db = right_path.replace(dir_name, change_dirname, 1)
@@ -73,7 +73,7 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
 
     # Change the folder name
 
-    change_dirname = pkgs_name_in_json + '-' + pkg['ver']
+    change_dirname = pkgs_name_in_json + '-' + pkg_ver
 
     if os.path.isdir(os.path.join(path, change_dirname)):
         cmd = 'rd /s /q ' + os.path.join(path, change_dirname)

cmds/cmd_menuconfig.py

@@ -20,7 +20,8 @@
 #
 # Change Logs:
 # Date           Author          Notes
-# 2018-5-28      SummerGift      Add copyright information
+# 2018-05-28     SummerGift      Add copyright information
+# 2019-01-07     SummerGift      The prompt supports utf-8 encoding
 #
 
 import os
@@ -151,30 +152,35 @@ def find_macro_in_config(filename, macro_name):
 
 
 def cmd(args):
+
+    from cmd_package import determine_support_chinese
     env_root = Import('env_root')
     currentdir = os.getcwd()
     dirname = os.path.split(os.path.split(currentdir)[0])[0]
     get_rtt_name = os.path.basename(dirname)
     os_version = platform.platform(True)[10:13]
-    # print os.path.split(currentdir)[1]
     kconfig_win7_path = os.path.join(
         env_root, 'tools', 'bin', 'kconfig-mconf_win7.exe')
 
     if not os.getenv("RTT_ROOT"):
         if get_rtt_name != 'rt-thread':
-            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.")
-            print (
-                'And then you can check Kconfig file and modify the default option below to your rtthread root path.\n')
+            if determine_support_chinese(env_root):
+                print("\n<menuconfig> 命令应当在某一特定 BSP 目录下执行，例如：\"rt-thread/bsp/stm32/stm32f091-st-nucleo\"")
+                print("请确保当前目录为 BSP 根目录，并且该目录中有 Kconfig 文件。\n")
+
+            print ("<menuconfig> command should be used in a bsp root path with a Kconfig file.")
+            print ("Example: \"rt-thread/bsp/stm32/stm32f091-st-nucleo\"")
+            print ("You should check if there is a Kconfig file in your bsp root first.")
 
-            print ('config $RTT_DIR')
+            print ('\nconfig $RTT_DIR')
             print ('string')
             print ('option env="RTT_ROOT"')
             print ('default "../.."\n')
-            print ('example:  default "F:/git_repositories/rt-thread"  \n')
 
-            print (
-                "using command 'set RTT_ROOT=your_rtthread_root_path' to set RTT_ROOT is ok too.\n")
-            print ("you can ignore debug messages below.")
+            if determine_support_chinese(env_root):
+                print ('例如修改 default 这一项为 rt-thread 所在路径:  default "F:/git_repositories/rt-thread"')
+                print ('\n下面的警告信息提示与找不到正确的 Kconfig 文件有关：')
+
             # if not args.menuconfig_easy:
             #    return
 
@@ -185,6 +191,9 @@ def cmd(args):
     else:
         mtime = -1
 
+    if platform.system() == "Windows":
+        os.system('chcp 437  > nul')
+
     if args.menuconfig_fn:
         print 'use', args.menuconfig_fn
         import shutil
@@ -215,7 +224,12 @@ def cmd(args):
                 os.system('kconfig-mconf Kconfig')
 
         os.chdir(beforepath)
+        
+        if determine_support_chinese(env_root):
+            if platform.system() == "Windows":
+                os.system('chcp 65001 > nul') 
         return
+
     else:
         if float(os_version) >= 6.2:
             os.system('kconfig-mconf Kconfig')
@@ -233,14 +247,17 @@ def cmd(args):
     if mtime != mtime2:
         mk_rtconfig(fn)
 
+    if determine_support_chinese(env_root):
+        if platform.system() == "Windows":
+            os.system('chcp 65001 > nul') 
+    
     if platform.system() == "Windows":
         env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds')
         fn = os.path.join(env_kconfig_path, '.config')
 
         if not os.path.isfile(fn):
             return
 
-
         if find_macro_in_config(fn, 'SYS_AUTO_UPDATE_PKGS'):
             os.system('pkgs --update')
             print "==============================>The packages have been updated completely."