Merge pull request #53 from RT-Thread/develop

【添加】：通过镜像更新 Env 功能脚本和软件包列表功能

Author: armink

cmds/cmd_package.py

@@ -939,20 +939,44 @@ def package_wizard():
 
 def upgrade_packages_index():
     """Update the package repository index."""
+    
+    env_root = Import('env_root')
+    env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds')
+    env_config_file = os.path.join(env_kconfig_path, '.config')
+    if os.path.isfile(env_config_file) and find_macro_in_config(env_config_file, 'SYS_PKGS_DOWNLOAD_ACCELERATE'):
+        get_package_url, get_ver_sha = get_url_from_mirror_server('packages', 'latest')
+        if get_package_url != None:
+            git_repo = get_package_url
+        else:
+            print("Failed to get url from mirror server. Using default url.")
+            git_repo = 'https://gitee.com/RT-Thread-Mirror/packages.git'
+    else:
+        git_repo = 'https://github.com/RT-Thread/packages.git'
+        
+#     print(get_package_url,get_ver_sha)
 
-    packages_root = os.path.join(Import('env_root'), 'packages')
-    git_repo = 'https://github.com/RT-Thread/packages.git'
+    packages_root = os.path.join(env_root, 'packages')
     pkgs_path = os.path.join(packages_root, 'packages')
 
     if not os.path.isdir(pkgs_path):
         cmd = 'git clone ' + git_repo + ' ' + pkgs_path
         os.system(cmd)
         print ("upgrade from :%s" % (git_repo))
+    else:
+        print("Begin to upgrade env packages.")
+        cmd = r'git pull ' + git_repo
+        execute_command(cmd, cwd=pkgs_path)
+        print("==============================>  Env packages upgrade done \n")
 
     for filename in os.listdir(packages_root):
         package_path = os.path.join(packages_root, filename)
         if os.path.isdir(package_path):
+
+            if package_path == pkgs_path:
+                continue
+
             if os.path.isdir(os.path.join(package_path, '.git')):
+                print("Begin to upgrade %s." % filename)
                 cmd = r'git pull'
                 execute_command(cmd, cwd=package_path)
                 print("==============================>  Env %s update done \n" % filename)
@@ -961,18 +985,31 @@ def upgrade_packages_index():
 def upgrade_env_script():
     """Update env function scripts."""
 
-    env_scripts_root = os.path.join(Import('env_root'), 'tools', 'scripts')
-    env_scripts_repo = 'https://github.com/RT-Thread/env.git'
+    print("Begin to upgrade env scripts.")
+    env_root = Import('env_root')
+    env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds')
+    env_config_file = os.path.join(env_kconfig_path, '.config')
+    if os.path.isfile(env_config_file) and find_macro_in_config(env_config_file, 'SYS_PKGS_DOWNLOAD_ACCELERATE'):
+        get_package_url, get_ver_sha = get_url_from_mirror_server('env', 'latest')
+        if get_package_url != None:
+            env_scripts_repo = get_package_url
+        else:
+            print("Failed to get url from mirror server. Using default url.")
+            env_scripts_repo = 'https://gitee.com/RT-Thread-Mirror/env.git'
+    else:
+        env_scripts_repo = 'https://github.com/RT-Thread/env.git'
 
+#     print(get_package_url,get_ver_sha)
+    
+    env_scripts_root = os.path.join(env_root, 'tools', 'scripts')
     cmd = r'git pull ' + env_scripts_repo
     execute_command(cmd, cwd=env_scripts_root)
-
-    print("==============================>  Env scripts update done \n")
+    print("==============================>  Env scripts upgrade done \n")
 
 
 def package_upgrade():
     """Update the package repository directory and env function scripts."""
-
+    
     upgrade_packages_index()
     upgrade_env_script()