Merge branch 'optimize_env' into master115

# Conflicts:
#	cmds/cmd_menuconfig.py

Author: SummerGift

cmds/cmd_menuconfig.py

@@ -153,31 +153,26 @@ 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]
     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':
-            if determine_support_chinese(env_root):
-                print("\n<menuconfig> 命令应当在某一特定 BSP 目录下执行，例如：\"rt-thread/bsp/stm32/stm32f091-st-nucleo\"")
-                print("请确保当前目录为 BSP 根目录，并且该目录中有 Kconfig 文件。\n")
+    if not os.path.exists('Kconfig'):
+        if platform.system() == "Windows":
+            os.system('chcp 65001  > nul')
+
+        print("\n<menuconfig> 命令应当在某一特定 BSP 目录下执行，例如：\"rt-thread/bsp/stm32/stm32f091-st-nucleo\"")
+        print("请确保当前目录为 BSP 根目录，并且该目录中有 Kconfig 文件。\n")
 
-            print ("\n<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 ("<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.")
 
-            if determine_support_chinese(env_root):
-                print ('例如修改 default 这一项为 rt-thread 所在路径:  default "F:/git_repositories/rt-thread"')
-                print ('\n下面的警告信息提示与找不到正确的 Kconfig 文件有关：')
+        if platform.system() == "Windows":
+            os.system('chcp 437  > nul')
 
-            # if not args.menuconfig_easy:
-            #    return
+        return False
 
     fn = '.config'
 
@@ -219,10 +214,7 @@ 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:
@@ -242,10 +234,6 @@ 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')

cmds/cmd_package.py

@@ -510,15 +510,20 @@ def pre_package_update():
 
     bsp_root = Import('bsp_root')
     env_root = Import('env_root')
-    from cmd_package import determine_support_chinese
 
     if not os.path.exists('.config'):
-        if determine_support_chinese(env_root):
-            print ("\n当前路径下没有发现 .config 文件，请确保当前目录为 BSP 根目录。")
-            print ("如果确定当前目录为 BSP 根目录，请先使用 <menuconfig> 命令来生成 .config 文件。\n")
+        if platform.system() == "Windows":
+            os.system('chcp 65001  > nul')
+
+        print ("\n当前路径下没有发现 .config 文件，请确保当前目录为 BSP 根目录。")
+        print ("如果确定当前目录为 BSP 根目录，请先使用 <menuconfig> 命令来生成 .config 文件。\n")
 
         print ('No system configuration file : .config.')
         print ('You should use < menuconfig > command to config bsp first.')
+
+        if platform.system() == "Windows":
+            os.system('chcp 437  > nul')
+
         return False
 
     bsp_packages_path = os.path.join(bsp_root, 'packages')