From a1415895225526e9640ed341c891dc5e4744543e Mon Sep 17 00:00:00 2001
From: "bernard.xiong" <bernard.xiong@gmail.com>
Date: Mon, 19 Apr 2010 04:43:15 +0000
Subject: [PATCH] add group setting on freemodbus, rtgui; fix finsh shell cmd
 data conversion issue.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@645 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 components/SConscript                |  3 +++
 components/finsh/cmd.c               |  2 +-
 components/net/freemodbus/SConscript | 27 +++++++++++++++++++++----
 components/rtgui/SConscript          | 30 ++++++++++++++++++++++------
 4 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/components/SConscript b/components/SConscript
index 4357552017..33010655d9 100644
--- a/components/SConscript
+++ b/components/SConscript
@@ -17,6 +17,9 @@ if rtconfig.RT_USING_DFS:
 if rtconfig.RT_USING_LWIP:
 	objs = objs + SConscript('net/lwip/SConscript')
 
+if rtconfig.RT_USING_MODBUS:
+	objs = objs + SConscript('net//freemodbus/SConscript')
+
 if rtconfig.RT_USING_RTGUI:
 	objs = objs + SConscript('rtgui/SConscript')
 
diff --git a/components/finsh/cmd.c b/components/finsh/cmd.c
index 7585851992..3de9fdc742 100644
--- a/components/finsh/cmd.c
+++ b/components/finsh/cmd.c
@@ -352,7 +352,7 @@ int list_module(void)
 		struct rt_list_node *tlist, *tnode;
 		rt_uint8_t* ptr;
 		
-		module = (struct rt_device*)(rt_list_entry(node, struct rt_object, list));
+		module = (struct rt_module*)(rt_list_entry(node, struct rt_object, list));
 		rt_kprintf("%-8s 0x%08x 0x%08x \n", module->parent.name, (rt_uint32_t)module->module_entry,
 			module->stack_size);
 
diff --git a/components/net/freemodbus/SConscript b/components/net/freemodbus/SConscript
index d0caef66a9..61e254bb2b 100644
--- a/components/net/freemodbus/SConscript
+++ b/components/net/freemodbus/SConscript
@@ -1,6 +1,7 @@
 Import('env')
 Import('rtconfig')
 Import('RTT_ROOT')
+Import('projects')
 
 src_local = Split("""
 modbus/mb.c
@@ -24,10 +25,28 @@ modbus/tcp/mbtcp.c
 """)
 
 # The set of source files associated with this SConscript file.
-path = [RTT_ROOT + '/net/freemodbus/modbus/include', RTT_ROOT + '/net/freemodbus/modbus/port', RTT_ROOT + '/net/freemodbus/modbus/rtu', RTT_ROOT + '/net/freemodbus/modbus/ascii']
+path = [RTT_ROOT + '/components/net/freemodbus/modbus/include', 
+	RTT_ROOT + '/components/net/freemodbus/modbus/port', 
+	RTT_ROOT + '/components/net/freemodbus/modbus/rtu', 
+	RTT_ROOT + '/components/net/freemodbus/modbus/ascii']
 
-env.Append(CPPPATH = path)
+# group definitions
+group = {}
+group['name'] = 'FreeModBus'
+group['src'] = File(src_local)
+group['CCFLAGS'] = ''
+group['CPPPATH'] = path
+group['CPPDEFINES'] = ''
+group['LINKFLAGS'] = ''
 
-obj = env.Object(src_local)
+# add group to project list
+projects.append(group)
 
-Return('obj')
+env.Append(CCFLAGS = group['CCFLAGS'])
+env.Append(CPPPATH = group['CPPPATH'])
+env.Append(CPPDEFINES = group['CPPDEFINES'])
+env.Append(LINKFLAGS = group['LINKFLAGS'])
+
+objs = env.Object(group['src'])
+
+Return('objs')
diff --git a/components/rtgui/SConscript b/components/rtgui/SConscript
index fb7cf73fbf..7ff9dd3137 100644
--- a/components/rtgui/SConscript
+++ b/components/rtgui/SConscript
@@ -1,6 +1,7 @@
 Import('env')
 Import('rtconfig')
 Import('RTT_ROOT')
+Import('projects')
 
 common_src = Split("""
 common/rtgui_object.c
@@ -58,11 +59,28 @@ widgets/workbench.c
 # The set of source files associated with this SConscript file.
 src_local = common_src + server_src + widgets_src
 
-path = [RTT_ROOT + '/rtgui/include']
-path = path + [RTT_ROOT + '/rgtui/common', RTT_ROOT + '/rtgui/server', RTT_ROOT + '/rtgui/widgets']
-path = path + [RTT_ROOT + '/filesystem/dfs', RTT_ROOT + '/filesystem/dfs/include']
-env.Append(CPPPATH = path)
+path = [RTT_ROOT + '/components/rtgui/include',
+	RTT_ROOT + '/components/rgtui/common', 
+	RTT_ROOT + '/components/rtgui/server', 
+	RTT_ROOT + '/components/rtgui/widgets']
 
-obj = env.Object(src_local)
+# group definitions
+group = {}
+group['name'] = 'GUI'
+group['src'] = File(src_local)
+group['CCFLAGS'] = ''
+group['CPPPATH'] = path
+group['CPPDEFINES'] = ''
+group['LINKFLAGS'] = ''
 
-Return('obj')
+# add group to project list
+projects.append(group)
+
+env.Append(CCFLAGS = group['CCFLAGS'])
+env.Append(CPPPATH = group['CPPPATH'])
+env.Append(CPPDEFINES = group['CPPDEFINES'])
+env.Append(LINKFLAGS = group['LINKFLAGS'])
+
+objs = env.Object(group['src'])
+
+Return('objs')
-- 
GitLab