libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
bernard.xiong 2010-04-19 04:43:15 +00:00
parent 0c567e922f
commit a141589522
4 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/SConscript
View File

@ -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')

2
components/finsh/cmd.c
View File

@ -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);

27
components/net/freemodbus/SConscript
View File

@ -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')

30
components/rtgui/SConscript
View File

@ -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')