调整 script 脚本，以及部分代码目录结构；

Signed-off-by: yangfasheng <yangfasheng@rt-thread.com>

SConscript

@@ -1,19 +1,33 @@
-# RT-Thread building script for bridge
+# RT-Thread building script for GuiEngine
 
 import os
+import rtconfig
 from building import *
 
 cwd = GetCurrentDir()
-src = []
-CPPPATH = [ cwd + '/include']
 
-objs = DefineGroup('GuiEngine', src, depend = ['PKG_USING_GUIENGINE'], CPPPATH = CPPPATH)
-list = os.listdir(cwd)
+src = Glob('src/*.c')
+CPPPATH = [cwd + '/include']
 
-if GetDepend('PKG_USING_GUIENGINE'):
-    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'))
+if GetDepend('GUIENGINE_IMAGE_TJPGD'):
+    src += Glob('libraries/tjpgd1a/*.c')
+    CPPPATH += [cwd + '/libraries/tjpgd1a']
 
-Return('objs')
+if GetDepend('GUIENGINE_IMAGE_LODEPNG'):
+    if rtconfig.ARCH == 'sim':
+            src += Glob('libraries/lodepng/*.c')
+            CPPPATH += [cwd + '/libraries/lodepng']
+    else:
+        if GetDepend('RT_USING_LIBC'):
+            src += Glob('libraries/lodepng/*.c')
+            CPPPATH += [cwd + '/libraries/lodepng']
+
+group = DefineGroup('GuiEngine', src, depend = ['PKG_USING_GUIENGINE'], CPPPATH = CPPPATH)
+
+if GetDepend('GUIENGINE_USING_DEMO'):
+    group = group + SConscript(os.path.join('example', 'SConscript'))
+
+if GetDepend('GUIENGINE_USING_TTF'):
+    group = group + SConscript(os.path.join('libraries/freetype-2.6.2', 'SConscript'))
+
+Return('group')

example/SConscript

@@ -1,8 +1,9 @@
+# RT-Thread building script for GuiEngine demo
+
 from building import *
 
 cwd = GetCurrentDir()
 src = Glob('*.c')
-
 CPPPATH = [cwd]
 
 group = DefineGroup('gui_demo', src, depend = ['GUIENGINE_USING_DEMO'], CPPPATH = CPPPATH)

libraries/SConscript

@@ -1,15 +0,0 @@
-# RT-Thread building script for bridge
-
-import os
-from building import *
-
-cwd  = GetCurrentDir()
-objs = []
-list = os.listdir(cwd)
-
-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'))
-
-Return('objs')

libraries/freetype-2.6.2/SConscript

@@ -5,18 +5,50 @@ from building import *
 
 cwd = GetCurrentDir()
 list = os.listdir(cwd)
-GroupPath = cwd
 CPPDEFINES = ['FT2_BUILD_LIBRARY']
 
-src = []
-group = []
+src = Split('''
+src/autofit/autofit.c
+src/base/fttype1.c
+src/base/ftbitmap.c
+src/base/ftbase.c
+src/base/ftbbox.c
+src/base/ftfstype.c
+src/base/ftglyph.c
+src/base/ftinit.c
+src/base/ftlcdfil.c
+src/base/ftmm.c
+src/base/ftpatent.c
+src/cache/ftcbasic.c
+src/cache/ftccache.c
+src/cache/ftccmap.c
+src/cache/ftcglyph.c
+src/cache/ftcimage.c
+src/cache/ftcmanag.c
+src/cache/ftcmru.c
+src/cache/ftcsbits.c
+src/psnames/psnames.c
+src/sfnt/sfnt.c
+src/smooth/smooth.c
+src/truetype/truetype.c
+builds/rt-thread/ftsystem.c
+builds/rt-thread/gb2312tounicode.c
+''')
 
-group = DefineGroup('freetype', src, depend = ['GUIENGINE_USING_TTF'], CPPDEFINES=CPPDEFINES, GroupPath = GroupPath)
+CPPPATH = [cwd]
+CPPPATH += ['/src/autofit']
+CPPPATH += [cwd + '/src/base']
+CPPPATH += [cwd + '/src/cache']
+CPPPATH += [cwd + '/src/psnames']
+CPPPATH += [cwd + '/src/sfnt']
+CPPPATH += [cwd + '/src/smooth']
+CPPPATH += [cwd + '/src/truetype']
+CPPPATH += [cwd + '/include']
+CPPPATH += [cwd + '/include/freetype']
+CPPPATH += [cwd + '/include/freetype/config']
+CPPPATH += [cwd + '/include/freetype/internal']
+CPPPATH += [cwd + '/include/freetype/internal/services']
 
-if GetDepend('GUIENGINE_USING_TTF'):
-    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'))
+group = DefineGroup('FreeType', src, depend = ['GUIENGINE_USING_TTF'], CPPDEFINES = CPPDEFINES, CPPPATH = CPPPATH)
 
 Return('group')

libraries/freetype-2.6.2/builds/SConscript

@@ -1,15 +0,0 @@
-# RT-Thread building script for bridge
-
-import os
-from building import *
-
-cwd = GetCurrentDir()
-objs = []
-list = os.listdir(cwd)
-
-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'))
-
-Return('objs')

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

@@ -1,14 +0,0 @@
-# RT-Thread building script for FreeType
-
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-ftsystem.c
-gb2312tounicode.c
-''')
-CPPPATH = [cwd]
-
-group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

libraries/freetype-2.6.2/include/SConscript

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

libraries/freetype-2.6.2/src/SConscript

@@ -1,15 +0,0 @@
-# RT-Thread building script for bridge
-
-import os
-from building import *
-
-cwd = GetCurrentDir()
-objs = []
-list = os.listdir(cwd)
-
-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'))
-
-Return('objs')

libraries/freetype-2.6.2/src/autofit/SConscript

@@ -1,13 +0,0 @@
-# RT-Thread building script for FreeType
-
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-autofit.c
-''')
-CPPPATH = [cwd]
-
-group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

libraries/freetype-2.6.2/src/base/SConscript

@@ -1,22 +0,0 @@
-# RT-Thread building script for FreeType
-
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-fttype1.c
-ftbitmap.c
-ftbase.c
-ftbbox.c
-ftfstype.c
-ftglyph.c
-ftinit.c
-ftlcdfil.c
-ftmm.c
-ftpatent.c
-''')
-CPPPATH = [cwd]
-
-group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

libraries/freetype-2.6.2/src/cache/SConscript

@@ -1,20 +0,0 @@
-# RT-Thread building script for FreeType
-
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-ftcbasic.c
-ftccache.c
-ftccmap.c
-ftcglyph.c
-ftcimage.c
-ftcmanag.c
-ftcmru.c
-ftcsbits.c
-''')
-CPPPATH = [cwd]
-
-group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

libraries/freetype-2.6.2/src/psnames/SConscript

@@ -1,13 +0,0 @@
-# RT-Thread building script for FreeType
-
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-psnames.c
-''')
-CPPPATH = [cwd]
-
-group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

libraries/freetype-2.6.2/src/sfnt/SConscript

@@ -1,13 +0,0 @@
-# RT-Thread building script for FreeType
-
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-sfnt.c
-''')
-CPPPATH = [cwd]
-
-group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

libraries/freetype-2.6.2/src/smooth/SConscript

@@ -1,13 +0,0 @@
-# RT-Thread building script for FreeType
-
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-smooth.c
-''')
-CPPPATH = [cwd]
-
-group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

libraries/freetype-2.6.2/src/truetype/SConscript

@@ -1,13 +0,0 @@
-# RT-Thread building script for FreeType
-
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-truetype.c
-''')
-CPPPATH = [cwd]
-
-group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

libraries/lodepng/SConscript

@@ -1,15 +0,0 @@
-# RT-Thread building script for Gui Engine
-
-from building import *
-import rtconfig
-
-cwd = GetCurrentDir()
-src = Glob('*.c') + Glob('*.cpp')
-CPPPATH = [cwd]
-
-if rtconfig.ARCH == 'sim':
-    group = DefineGroup('GuiEngine', src, depend = ['GUIENGINE_IMAGE_LODEPNG'], CPPPATH = CPPPATH)
-else:
-    group = DefineGroup('GuiEngine', src, depend = ['GUIENGINE_IMAGE_LODEPNG', 'RT_USING_LIBC'], CPPPATH = CPPPATH)
-
-Return('group')

libraries/tjpgd1a/SConscript

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

src/SConscript

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

src/mouse.c

@@ -22,7 +22,7 @@
  * 2009-10-16     Bernard      first version
  */
 
-#include "mouse.h"
+#include <rtgui/widgets/mouse.h>
 #include <rtgui/region.h>
 #include <rtgui/driver.h>
 #include <rtgui/rtgui_system.h>

src/rtgui_app.c

@@ -29,7 +29,7 @@
 #include <rtgui/rtgui_system.h>
 #include <rtgui/rtgui_app.h>
 #include <rtgui/widgets/window.h>
-#include <topwin.h>
+#include <rtgui/widgets/topwin.h>
 
 static void _rtgui_app_constructor(struct rtgui_app *app)
 {

src/server.c

@@ -32,8 +32,8 @@
 
 #include <rtgui/widgets/window.h>
 
-#include "mouse.h"
-#include "topwin.h"
+#include <rtgui/widgets/mouse.h>
+#include <rtgui/widgets/topwin.h>
 
 static struct rtgui_app *rtgui_server_app = RT_NULL;
 static struct rtgui_app *rtgui_wm_application = RT_NULL;

src/topwin.c

@@ -22,8 +22,8 @@
  * 2009-10-16     Bernard      first version
  * 2012-02-25     Grissiom     rewrite topwin implementation
  */
-#include "topwin.h"
-#include "mouse.h"
+#include <rtgui/widgets/topwin.h>
+#include <rtgui/widgets/mouse.h>
 
 #include <rtservice.h>
 #include <rtgui/event.h>