From cd2caa2be2707de901a25ea82a91c7e0995fdeb1 Mon Sep 17 00:00:00 2001
From: bernard <bernard.xiong@rt-thread.com>
Date: Thu, 26 Jun 2025 00:05:00 +0800
Subject: [PATCH 1/2] [smart] rename the Group name to 'lwProcess' and optimize
 the error handling for vDSO building.

---
 components/lwp/SConscript                  |  2 +-
 components/lwp/arch/risc-v/rv64/SConscript | 11 -----------
 components/lwp/arch/x86/i386/SConscript    | 11 -----------
 components/lwp/vdso/SConscript             | 13 ++++++++-----
 4 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 components/lwp/arch/risc-v/rv64/SConscript
 delete mode 100644 components/lwp/arch/x86/i386/SConscript

diff --git a/components/lwp/SConscript b/components/lwp/SConscript
index 6eb8763fde5..c53b3f483c7 100644
--- a/components/lwp/SConscript
+++ b/components/lwp/SConscript
@@ -52,7 +52,7 @@ CPPPATH += ['./terminal/']
 if not GetDepend(['LWP_USING_RUNTIME']):
     SrcRemove(src, 'lwp_runtime.c')
 
-group = DefineGroup('lwP', src, depend = ['RT_USING_SMART'], CPPPATH = CPPPATH)
+group = DefineGroup('lwProcess', src, depend = ['RT_USING_SMART'], CPPPATH = CPPPATH)
 
 group = group + SConscript(os.path.join('vdso', 'SConscript'))
 Return('group')
diff --git a/components/lwp/arch/risc-v/rv64/SConscript b/components/lwp/arch/risc-v/rv64/SConscript
deleted file mode 100644
index c815b3db5dc..00000000000
--- a/components/lwp/arch/risc-v/rv64/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-# RT-Thread building script for component
-
-from building import *
-
-cwd     = GetCurrentDir()
-src     = Glob('*.c') + Glob('*.S')
-CPPPATH = [cwd]
-
-group = DefineGroup('lwp-riscv', src, depend = ['RT_USING_SMART'], CPPPATH = CPPPATH)
-
-Return('group')
diff --git a/components/lwp/arch/x86/i386/SConscript b/components/lwp/arch/x86/i386/SConscript
deleted file mode 100644
index 4088ce09f3f..00000000000
--- a/components/lwp/arch/x86/i386/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-# RT-Thread building script for component
-
-from building import *
-
-cwd     = GetCurrentDir()
-src     = Glob('*.c') + Glob('*.S')
-CPPPATH = [cwd]
-
-group = DefineGroup('lwp-x86-i386', src, depend = ['RT_USING_SMART'], CPPPATH = CPPPATH)
-
-Return('group')
diff --git a/components/lwp/vdso/SConscript b/components/lwp/vdso/SConscript
index 4360e8bf238..5f3f853d715 100644
--- a/components/lwp/vdso/SConscript
+++ b/components/lwp/vdso/SConscript
@@ -35,12 +35,15 @@ else:
         process_env['RTT_DEVICE'] = rtconfig.DEVICE
 
     command = ["scons", "-C", vdso_arch]
-    clean_command = ["scons", "-C", vdso_arch, "--clean"] 
+    if GetOption('clean'):
+        command = ["scons", "-C", vdso_arch, "--clean"] 
 
-    if not GetOption('clean'):    
+    try:
         result = subprocess.run(command, env=process_env, check=True)
-    else:
-        result = subprocess.run(clean_command, env=process_env, check=True)
+    # generic error handle
+    except :
+        print('exec command: "%s" failed.' % ' '.join(command))
+        exit(1)
 
     if result.returncode == 0:
         print("Command executed successfully")
@@ -48,5 +51,5 @@ else:
         print("Command failed with exit code:", result.returncode)
         exit(1)
 
-group = DefineGroup('vDSO', src, depend = ['RT_USING_SMART','RT_USING_VDSO'], CPPPATH = CPPPATH)
+group = DefineGroup('lwProcess', src, depend = ['RT_USING_SMART','RT_USING_VDSO'], CPPPATH = CPPPATH)
 Return('group')

From 527431df7d6909e162ae013b969e2bdc3ca57037 Mon Sep 17 00:00:00 2001
From: bernard <bernard.xiong@rt-thread.com>
Date: Thu, 26 Jun 2025 00:19:29 +0800
Subject: [PATCH 2/2] [smart] Optimize error handling after command execution

---
 components/lwp/vdso/SConscript | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/lwp/vdso/SConscript b/components/lwp/vdso/SConscript
index 5f3f853d715..07889d73a9d 100644
--- a/components/lwp/vdso/SConscript
+++ b/components/lwp/vdso/SConscript
@@ -45,11 +45,7 @@ else:
         print('exec command: "%s" failed.' % ' '.join(command))
         exit(1)
 
-    if result.returncode == 0:
-        print("Command executed successfully")
-    else:
-        print("Command failed with exit code:", result.returncode)
-        exit(1)
+    print("Command executed successfully")
 
 group = DefineGroup('lwProcess', src, depend = ['RT_USING_SMART','RT_USING_VDSO'], CPPPATH = CPPPATH)
 Return('group')