Merge pull request #77 from SummerGGift/master

【完善】：新旧版本兼容问题

Author: armink

cmds/cmd_menuconfig.py

@@ -152,6 +152,8 @@ 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]
@@ -162,8 +164,9 @@ def cmd(args):
 
     if not os.getenv("RTT_ROOT"):
         if get_rtt_name != 'rt-thread':
-            print("\n<menuconfig> 命令应当在某一特定 BSP 目录下执行，例如：\"rt-thread/bsp/stm32/stm32f091-st-nucleo\"")
-            print("请确保当前目录为 BSP 根目录，并且该目录中有 Kconfig 文件。\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\"")
@@ -173,9 +176,10 @@ def cmd(args):
             print ('string')
             print ('option env="RTT_ROOT"')
             print ('default "../.."\n')
-            print ('例如修改 default 这一项为 rt-thread 所在路径:  default "F:/git_repositories/rt-thread"')
 
-            print ('\n下面的警告信息提示与找不到正确的 Kconfig 文件有关：')
+            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
@@ -221,8 +225,9 @@ def cmd(args):
 
         os.chdir(beforepath)
 
-        from cmd_package import determine_support_chinese
-        determine_support_chinese(env_root)
+        if determine_support_chinese(env_root):
+            if platform.system() == "Windows":
+                os.system('chcp 65001 > nul') 
         return
 
     else:
@@ -242,8 +247,9 @@ def cmd(args):
     if mtime != mtime2:
         mk_rtconfig(fn)
 
-    from cmd_package import determine_support_chinese
-    determine_support_chinese(env_root)
+    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')

cmds/cmd_package.py

@@ -72,6 +72,12 @@ def execute_command(cmdstring, cwd=None, shell=True):
 
     return stdout_str
 
+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):
+        return True
+    else:
+        return False
 
 def user_input(msg, default_value):
     """Gets the user's keyboard input."""
@@ -350,8 +356,11 @@ def package_list():
     env_root = Import('env_root')
 
     if not os.path.isfile(fn):
-        print ("\n当前路径下没有发现 .config 文件，请确保当前目录为 BSP 根目录。")
-        print ("如果确定当前目录为 BSP 根目录，请先使用 <menuconfig> 命令来生成 .config 文件。\n")
+
+        if determine_support_chinese(env_root):
+            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.')
         return
@@ -500,10 +509,14 @@ def pre_package_update():
     """ Make preparations before updating the software package. """
 
     bsp_root = Import('bsp_root')
+    env_root = Import('env_root')
+    from cmd_package import determine_support_chinese
 
     if not os.path.exists('.config'):
-        print ("\n当前路径下没有发现 .config 文件，请确保当前目录为 BSP 根目录。")
-        print ("如果确定当前目录为 BSP 根目录，请先使用 <menuconfig> 命令来生成 .config 文件。\n")
+        if determine_support_chinese(env_root):
+            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.')
         return False
@@ -533,7 +546,6 @@ def pre_package_update():
         sql = '''CREATE TABLE packagefile
                     (pathname   TEXT  ,package  TEXT  ,md5  TEXT );'''
         pkgsdb.create_table(conn, sql)
-        # print("Create dbsqlite done")
 
     fn = '.config'
     pkgs = kconfig.parse(fn)
@@ -696,33 +708,28 @@ 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.
 
     Compare the old and new software package list and update the package.
-    Remove unwanted packages and download the newly selected package.
+    Remove unwanted packages and download the newly selected package.-
     Check if the files in the deleted packages have been changed, and if so, 
     remind the user saved the modified file.
     """
 
+    sys_value = pre_package_update()
+
+    if not sys_value:
+        return
+
     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:
-        return
+    if determine_support_chinese(env_root):
+        if platform.system() == "Windows":
+            os.system('chcp 65001 > nul') 
 
     oldpkgs = sys_value[0]
     newpkgs = sys_value[1]