Fix non-mm32 BSP dist CI paths

Author: CYFS3

bsp/allwinner/tools/sdk_dist.py

@@ -6,6 +6,27 @@
 sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
 
 
+def update_kconfig_library_path(dist_dir):
+    library_dir = os.path.join(dist_dir, 'libraries')
+    if not os.path.isdir(library_dir):
+        return
+
+    for root, dirs, files in os.walk(library_dir):
+        if 'Kconfig' not in files:
+            continue
+
+        kconfig_path = os.path.join(root, 'Kconfig')
+        with open(kconfig_path, 'r') as f:
+            data = f.read()
+
+        data = data.replace('$(BSP_DIR)/../libraries', 'libraries')
+        data = data.replace('$BSP_DIR/../libraries', 'libraries')
+        data = data.replace('../libraries', 'libraries')
+
+        with open(kconfig_path, 'w') as f:
+            f.write(data)
+
+
 # BSP dist function
 def dist_do_building(BSP_ROOT, dist_dir):
     from mkdist import bsp_copy_files
@@ -24,3 +45,4 @@ def dist_do_building(BSP_ROOT, dist_dir):
     bsp_copy_files(os.path.join(library_path, 'libos'), os.path.join(library_dir, 'libos'))
 
     shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
+    update_kconfig_library_path(dist_dir)

bsp/ft32/tools/sdk_dist.py

@@ -6,6 +6,25 @@
 sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
 
 
+def update_dist_project_paths(dist_dir):
+    sconstruct_path = os.path.join(dist_dir, 'SConstruct')
+    if not os.path.isfile(sconstruct_path):
+        return
+
+    with open(sconstruct_path, 'r') as f:
+        data = f.read()
+
+    data = data.replace("os.path.join(libraries_path_prefix, 'STD_Drivers', 'SConscript')",
+                        "os.path.join(libraries_path_prefix, 'Drivers', 'SConscript')")
+    data = data.replace("variant_dir='../libraries/Drivers'",
+                        "variant_dir='build/libraries/Drivers'")
+    data = data.replace('variant_dir="../libraries/Drivers"',
+                        'variant_dir="build/libraries/Drivers"')
+
+    with open(sconstruct_path, 'w') as f:
+        f.write(data)
+
+
 # BSP dist function
 def dist_do_building(BSP_ROOT, dist_dir):
     from mkdist import bsp_copy_files
@@ -21,3 +40,4 @@ def dist_do_building(BSP_ROOT, dist_dir):
     print("=> copy bsp drivers")
     bsp_copy_files(os.path.join(library_path, 'Drivers'), os.path.join(library_dir, 'Drivers'))
     shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
+    update_dist_project_paths(dist_dir)

bsp/hc32/tools/sdk_dist.py

@@ -4,7 +4,20 @@
 
 cwd_path = os.getcwd()
 sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
-           
+
+
+def update_dist_project_paths(dist_dir):
+    tests_sconscript = os.path.join(os.path.dirname(dist_dir), 'tests', 'SConscript')
+    if os.path.isfile(tests_sconscript):
+        with open(tests_sconscript, 'r') as f:
+            data = f.read()
+
+        data = data.replace('../../../components', '../project/rt-thread/components')
+
+        with open(tests_sconscript, 'w') as f:
+            f.write(data)
+
+
 # BSP dist function
 def dist_do_building(BSP_ROOT, dist_dir):
     from mkdist import bsp_copy_files
@@ -26,3 +39,4 @@ def dist_do_building(BSP_ROOT, dist_dir):
 
     print("=> copy hc32 tests")
     bsp_copy_files(os.path.join(os.path.dirname(BSP_ROOT), 'tests'), os.path.join(os.path.dirname(dist_dir), 'tests'))
+    update_dist_project_paths(dist_dir)

bsp/hpmicro/tools/sdk_dist.py

@@ -4,17 +4,25 @@
 cwd_path = os.getcwd()
 sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
 
-def update_dist_project_paths(dist_dir):
-    sconstruct_path = os.path.join(dist_dir, 'SConstruct')
-    if os.path.isfile(sconstruct_path):
-        with open(sconstruct_path, 'r') as f:
-            data = f.read()
+def update_rtt_root_path(path):
+    if not os.path.isfile(path):
+        return
 
-        data = data.replace("RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..')",
-                            "RTT_ROOT = os.path.join(os.getcwd(), 'rt-thread')")
+    with open(path, 'r') as f:
+        data = f.read()
 
-        with open(sconstruct_path, 'w') as f:
-            f.write(data)
+    data = data.replace("RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..')",
+                        "RTT_ROOT = os.path.join(os.getcwd(), 'rt-thread')")
+    data = data.replace('RTT_ROOT = os.path.normpath(os.getcwd() + "/../../..")',
+                        "RTT_ROOT = os.path.join(os.getcwd(), 'rt-thread')")
+
+    with open(path, 'w') as f:
+        f.write(data)
+
+
+def update_dist_project_paths(dist_dir):
+    update_rtt_root_path(os.path.join(dist_dir, 'SConstruct'))
+    update_rtt_root_path(os.path.join(dist_dir, 'rtconfig.py'))
 
     kconfig_path = os.path.join(dist_dir, 'Kconfig')
     if os.path.isfile(kconfig_path):

bsp/nxp/imx/imxrt/tools/sdk_dist.py

@@ -18,6 +18,22 @@ def update_kconfig_library_path(dist_dir):
     with open(kconfig_path, 'w') as f:
         f.write(data)
 
+
+def update_sconstruct_library_path(dist_dir):
+    sconstruct_path = os.path.join(dist_dir, 'SConstruct')
+    if not os.path.isfile(sconstruct_path):
+        return
+
+    with open(sconstruct_path, 'r') as f:
+        data = f.read()
+
+    data = data.replace("SDK_ROOT = os.path.abspath('./..')",
+                        "SDK_ROOT = os.path.abspath('./')")
+
+    with open(sconstruct_path, 'w') as f:
+        f.write(data)
+
+
 # BSP dist function
 def dist_do_building(BSP_ROOT, dist_dir=None):
     from mkdist import bsp_copy_files
@@ -39,3 +55,4 @@ def dist_do_building(BSP_ROOT, dist_dir=None):
     print("=> copy bsp peripherals")
     bsp_copy_files(os.path.join(library_path, 'peripherals'), os.path.join(library_dir, 'peripherals'))
     update_kconfig_library_path(dist_dir)
+    update_sconstruct_library_path(dist_dir)

bsp/wch/arm/ch32f103c8-core/Kconfig

@@ -8,5 +8,5 @@ PKGS_DIR := packages
 
 source "$(RTT_DIR)/Kconfig"
 osource "$PKGS_DIR/Kconfig"
-rsource "../libraries/Kconfig"
+rsource "../Libraries/Kconfig"
 rsource "board/Kconfig"

bsp/wch/arm/ch32f203r-evt/Kconfig

@@ -8,5 +8,5 @@ PKGS_DIR := packages
 
 source "$(RTT_DIR)/Kconfig"
 osource "$PKGS_DIR/Kconfig"
-rsource "../libraries/Kconfig"
+rsource "../Libraries/Kconfig"
 rsource "board/Kconfig"

bsp/wch/risc-v/tools/sdk_dist.py

@@ -14,9 +14,10 @@ def dist_do_building(BSP_ROOT, dist_dir):
     print("=> copy ch32 bsp library")
     library_dir = os.path.join(dist_dir, 'Libraries')
     library_path = os.path.join(os.path.dirname(BSP_ROOT), 'Libraries')
-    if rtconfig.BSP_LIBRARY_TYPE is not None:
-        bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE),
-                    os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE))
+    library_type = getattr(rtconfig, 'BSP_LIBRARY_TYPE', None)
+    if library_type is not None:
+        bsp_copy_files(os.path.join(library_path, library_type),
+                    os.path.join(library_dir, library_type))
     print("=> copy bsp drivers")
     bsp_copy_files(os.path.join(library_path, 'ch32_drivers'), os.path.join(library_dir, 'ch32_drivers'))
     shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))