gui 组件脚本文件修改提交；

components/gui/SConscript

@@ -1,61 +1,16 @@
-# RT-Thread building script for component
+# RT-Thread building script for bridge
 
+import os
 from building import *
 
 cwd = GetCurrentDir()
-src = Split('''
-src/asc12font.c
-src/asc16font.c
-src/blit.c
-src/box.c
-src/color.c
-src/container.c
-src/dc.c
-src/dc_blend.c
-src/dc_buffer.c
-src/dc_client.c
-src/dc_hw.c
-src/dc_rotozoom.c
-src/dc_trans.c
-src/filerw.c
-src/font.c
-src/font_bmp.c
-src/font_fnt.c
-src/font_freetype.c
-src/font_hz_bmp.c
-src/font_hz_file.c
-src/hz12font.c
-src/hz16font.c
-src/image.c
-src/image_bmp.c
-src/image_container.c
-src/image_hdc.c
-src/image_jpg.c
-src/image_png.c
-src/image_xpm.c
-src/matrix.c
-src/mouse.c
-src/region.c
-src/rtgui_app.c
-src/rtgui_driver.c
-src/rtgui_object.c
-src/rtgui_system.c
-src/server.c
-src/title.c
-src/topwin.c
-src/widget.c
-src/window.c
-''')
-CPPPATH = [cwd + '/include']
+objs = []
+list = os.listdir(cwd)
 
-group = []
 if GetDepend('RT_USING_GUIENGINE'):
-    group = DefineGroup('GUIEngine', src, depend = ['RT_USING_GUIENGINE'], CPPPATH = CPPPATH)
+	for d in list:
+		path = os.path.join(cwd, d)
+		if os.path.isfile(os.path.join(path, 'SConscript')):
+			objs = objs + SConscript(os.path.join(d, 'SConscript'))
 
-    list = os.listdir(cwd)
-    for d in list:
-        path = os.path.join(cwd, d)
-        if os.path.isfile(os.path.join(path, 'SConscript')):
-            group = group + SConscript(os.path.join(d, 'SConscript'))
-
-Return('group')
+Return('objs')

components/gui/include/SConscript

@@ -0,0 +1,13 @@
+# RT-Thread building script for gui
+
+from building import *
+
+cwd = GetCurrentDir()
+src = Glob('*.c') + Glob('*.cpp')
+CPPPATH = [ cwd,
+			cwd + '/rtgui',
+			cwd + '/rtgui/widgets']
+
+group = DefineGroup('GuiEngine', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')

components/gui/libraries/SConscript

@@ -1,4 +1,5 @@
-# for module compiling
+# RT-Thread building script for bridge
+
 import os
 from building import *
 

components/gui/libraries/freetype-2.6.2/SConscript

@@ -1,15 +1,16 @@
-# RT-Thread building script for bridge
+# RT-Thread building script for FreeType
 
 import os
 from building import *
 
 cwd = GetCurrentDir()
-src = Split('''
-''')
 list = os.listdir(cwd)
 GroupPath = cwd
 CPPDEFINES = ['FT2_BUILD_LIBRARY']
 
+src = []
+group = []
+
 group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPDEFINES=CPPDEFINES, GroupPath = GroupPath)
 
 if GetDepend('RTGUI_USING_TTF'):

components/gui/libraries/freetype-2.6.2/builds/rt-thread/SConscript

@@ -1,4 +1,4 @@
-# RT-Thread building script for component
+# RT-Thread building script for FreeType
 
 from building import *
 
@@ -9,6 +9,6 @@ gb2312tounicode.c
 ''')
 CPPPATH = [cwd]
 
-group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH)
+group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/freetype-2.6.2/include/SConscript

@@ -1,16 +1,15 @@
-# RT-Thread building script for component
+# RT-Thread building script for FreeType
 
 from building import *
 
 cwd = GetCurrentDir()
-src = Split('''
-''')
+src = []
 CPPPATH = [ cwd,
-			cwd + '/freetype',
-			cwd + '/freetype/config',
-			cwd + '/freetype/internal',
-			cwd + '/freetype/internal/services']
+            cwd + '/freetype',
+            cwd + '/freetype/config',
+            cwd + '/freetype/internal',
+            cwd + '/freetype/internal/services']
 
-group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH)
+group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/freetype-2.6.2/src/autofit/SConscript

@@ -1,4 +1,4 @@
-# RT-Thread building script for component
+# RT-Thread building script for FreeType
 
 from building import *
 
@@ -8,6 +8,6 @@ autofit.c
 ''')
 CPPPATH = [cwd]
 
-group = DefineGroup('freetype', src, depend = ['RT_USING_GUIENGINE'], CPPPATH = CPPPATH)
+group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/freetype-2.6.2/src/base/SConscript

@@ -1,4 +1,4 @@
-# RT-Thread building script for component
+# RT-Thread building script for FreeType
 
 from building import *
 
@@ -17,6 +17,6 @@ ftpatent.c
 ''')
 CPPPATH = [cwd]
 
-group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH)
+group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/freetype-2.6.2/src/cache/SConscript

@@ -1,4 +1,4 @@
-# RT-Thread building script for component
+# RT-Thread building script for FreeType
 
 from building import *
 
@@ -15,6 +15,6 @@ ftcsbits.c
 ''')
 CPPPATH = [cwd]
 
-group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH)
+group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/freetype-2.6.2/src/psnames/SConscript

@@ -1,4 +1,4 @@
-# RT-Thread building script for component
+# RT-Thread building script for FreeType
 
 from building import *
 
@@ -8,6 +8,6 @@ psnames.c
 ''')
 CPPPATH = [cwd]
 
-group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH)
+group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/freetype-2.6.2/src/sfnt/SConscript

@@ -1,4 +1,4 @@
-# RT-Thread building script for component
+# RT-Thread building script for FreeType
 
 from building import *
 
@@ -8,6 +8,6 @@ sfnt.c
 ''')
 CPPPATH = [cwd]
 
-group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH)
+group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/freetype-2.6.2/src/smooth/SConscript

@@ -1,4 +1,4 @@
-# RT-Thread building script for component
+# RT-Thread building script for FreeType
 
 from building import *
 
@@ -8,6 +8,6 @@ smooth.c
 ''')
 CPPPATH = [cwd]
 
-group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH)
+group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/freetype-2.6.2/src/truetype/SConscript

@@ -1,4 +1,4 @@
-# RT-Thread building script for component
+# RT-Thread building script for FreeType
 
 from building import *
 
@@ -8,6 +8,6 @@ truetype.c
 ''')
 CPPPATH = [cwd]
 
-group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH)
+group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/lodepng/SConscript

@@ -1,16 +1,15 @@
+# RT-Thread building script for gui
+
 from building import *
 import rtconfig
 
 cwd = GetCurrentDir()
-src = Split('''
-lodepng.c
-''')
-
+src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
 if rtconfig.ARCH == 'sim':
-	group = DefineGroup('RTGUI', src, depend = ['RT_USING_GUIENGINE', 'RTGUI_IMAGE_LODEPNG'], CPPPATH = CPPPATH)
+    group = DefineGroup('GuiEngine', src, depend = ['RTGUI_IMAGE_LODEPNG'], CPPPATH = CPPPATH)
 else:
-	group = DefineGroup('RTGUI', src, depend = ['RT_USING_GUIENGINE', 'RTGUI_IMAGE_LODEPNG', 'RT_USING_LIBC'], CPPPATH = CPPPATH)
+    group = DefineGroup('GuiEngine', src, depend = ['RTGUI_IMAGE_LODEPNG', 'RT_USING_LIBC'], CPPPATH = CPPPATH)
 
 Return('group')

components/gui/libraries/tjpgd1a/SConscript

@@ -1,13 +1,11 @@
+# RT-Thread building script for gui
+
 from building import *
-import rtconfig
 
 cwd = GetCurrentDir()
-src	= Split('''
-tjpgd.c
-''')
-
+src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('RTGUI', src, depend = ['RT_USING_GUIENGINE', 'RTGUI_IMAGE_TJPGD'], CPPPATH = CPPPATH)
+group = DefineGroup('GuiEngine', src, depend = ['RTGUI_IMAGE_TJPGD'], CPPPATH = CPPPATH)
 
-Return('group')
+Return('group')

components/gui/src/SConscript

@@ -0,0 +1,11 @@
+# RT-Thread building script for gui
+
+from building import *
+
+cwd = GetCurrentDir()
+src = Glob('*.c') + Glob('*.cpp')
+CPPPATH = [cwd]
+
+group = DefineGroup('GuiEngine', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')