Merge pull request #76 from SummerGGift/master

【完善】：解决新旧版本 env 升级兼容问题

Author: armink

cmds/cmd_menuconfig.py

@@ -220,11 +220,11 @@ def cmd(args):
                 os.system('kconfig-mconf Kconfig')
 
         os.chdir(beforepath)
-
-        if platform.system() == "Windows":
-            os.system('chcp 65001 > nul')
-
+        
+        from cmd_package import determine_support_chinese
+        determine_support_chinese(env_root)
         return
+
     else:
         if float(os_version) >= 6.2:
             os.system('kconfig-mconf Kconfig')
@@ -242,8 +242,8 @@ def cmd(args):
     if mtime != mtime2:
         mk_rtconfig(fn)
 
-    if platform.system() == "Windows":
-        os.system('chcp 65001 > nul')
+    from cmd_package import determine_support_chinese
+    determine_support_chinese(env_root)
 
     if platform.system() == "Windows":
         env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds')

cmds/cmd_package.py

@@ -696,6 +696,13 @@ def write_storage_file(pkgs_fn, newpkgs):
     pkgs_file.close()
 
 
+def determine_support_chinese(env_root):
+    get_flag_file_path = os.path.join(env_root, 'tools', 'bin', 'env_above_ver_1_1')
+    if os.path.isfile(get_flag_file_path):
+        # change code page to 65001
+        if platform.system() == "Windows":
+            os.system('chcp 65001 > nul')
+
 def package_update(isDeleteOld=False):
     """Update env's packages.
 
@@ -705,14 +712,13 @@ def package_update(isDeleteOld=False):
     remind the user saved the modified file.
     """
 
-    # change code page to 65001
-    if platform.system() == "Windows":
-        os.system('chcp 65001 > nul')
-
     bsp_root = Import('bsp_root')
     env_root = Import('env_root')
     flag = True
 
+    # According to the env version, whether Chinese output is supported or not
+    determine_support_chinese(env_root)
+
     sys_value = pre_package_update()
 
     if not sys_value: