Add buildlib option; Add wizard script.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2316 bbd45198-f89e-11dd-88c7-29a3b14d5316

2 files changed, 97 insertions, 0 deletions

diff --git a/tools/building.py b/tools/building.py
index 247cf0c9ff..1e14ea87c0 100644
--- a/tools/building.py
+++ b/tools/building.py
@@ -77,6 +77,12 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
                       default=False,
                       help='copy header of rt-thread directory to local.')
 
+    # add build library option
+    AddOption('--buildlib', 
+                      dest='buildlib', 
+                      type='string',
+                      help='building library of a component')
+
     # add target option
     AddOption('--target',
                       dest='target',
@@ -212,6 +218,10 @@ def DefineGroup(name, src, depend, **parameters):
         Env.Append(CPPDEFINES = group['CPPDEFINES'])
     if group.has_key('LINKFLAGS'):
         Env.Append(LINKFLAGS = group['LINKFLAGS'])
+    if group.has_key('LIBS'):
+        Env.Append(LIBS = group['LIBS'])
+    if group.has_key('LIBPATH'):
+        Env.Append(LIBPATH = group['LIBPATH'])
 
     objs = Env.Object(group['src'])
 
@@ -237,6 +247,23 @@ def GetCurrentDir():
     path = os.path.dirname(fn.abspath)
     return path
 
+def DoBuilding(target, objects):
+    program = None
+    # check whether special buildlib option
+    lib_name = GetOption('buildlib')
+    if lib_name:
+        print lib_name
+        # build library with special component
+        for Group in Projects:
+            if Group['name'] == lib_name:
+                objects = Env.Object(Group['src'])
+                program = Env.Library(lib_name, objects)
+                break
+    else:
+        program = Env.Program(target, objects)
+
+    EndBuilding(target, program)
+
 def EndBuilding(target, program = None):
     import rtconfig
     from keil import MDKProject
diff --git a/tools/wizard.py b/tools/wizard.py
new file mode 100644
index 0000000000..2d0ed9efe8
--- /dev/null
+++ b/tools/wizard.py
@@ -0,0 +1,70 @@
+#! /usr/bin/env python

+#coding=utf-8

+

+"""

+wizard.py - a script to generate SConscript in RT-Thread RTOS. 

+

+`wizard --component name' to generate SConscript for name component.

+`wizard --bridge' to generate SConscript as a bridge to connect each 

+SConscript script file of sub-directory. 

+"""

+

+import sys

+

+SConscript_com = '''# RT-Thread building script for component

+

+from building import *

+

+cwd = GetCurrentDir()

+src = Glob('*.c')

+CPPPATH = [cwd]

+

+group = DefineGroup('COMPONENT_NAME', src, depend = [''], CPPPATH = CPPPATH)

+

+Return('group')

+'''

+

+SConscript_bridge = '''# RT-Thread building script for bridge

+

+import os

+

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

+'''

+

+def usage():

+    print 'wizard --component name'

+    print 'wizard --bridge'

+

+def gen_component(name):

+    print 'generate SConscript for ' + name

+    text = SConscript_com.replace('COMPONENT_NAME', name)

+    f = file('SConscript', 'w')

+    f.write(text)

+    f.close()

+

+def gen_bridge():

+    print 'generate SConscript for bridge'

+    f = file('SConscript', 'w')

+    f.write(SConscript_bridge)

+    f.close()

+

+if __name__ == '__main__':

+    if len(sys.argv) == 1:

+        usage()

+        sys.exit(2)

+    

+    if sys.argv[1] == '--component':

+        gen_component(sys.argv[2])

+    elif sys.argv[1] == '--bridge':

+        gen_bridge()

+    else:

+        usage()