Browse Source

Update SConscript file.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2260 bbd45198-f89e-11dd-88c7-29a3b14d5316
bernard.xiong@gmail.com 12 years ago
parent
commit
e6f634955d
3 changed files with 13 additions and 14 deletions
  1. 8 7
      components/SConscript
  2. 3 5
      components/external/tjpgd1a/SConscript
  3. 2 2
      components/finsh/SConscript

+ 8 - 7
components/SConscript

@@ -1,16 +1,17 @@
 # for module compiling
 import os
-Import('RTT_ROOT')
 Import('remove_components')
+from building import *
 
 objs = []
-list = os.listdir(os.path.join(RTT_ROOT, 'components'))
+cwd  = GetCurrentDir()
+list = os.listdir(cwd)
 
-for d in list:
-    if d in remove_components:
+for item in list:
+    if item in remove_components:
         continue
-    path = os.path.join(RTT_ROOT, 'components', d)
-    if os.path.isfile(os.path.join(path, 'SConscript')):
-        objs = objs + SConscript(os.path.join(d, 'SConscript'))
+
+    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
+        objs = objs + SConscript(os.path.join(item, 'SConscript'))
 
 Return('objs')

+ 3 - 5
components/external/tjpgd1a/SConscript

@@ -1,13 +1,11 @@
-Import('RTT_ROOT')
-Import('rtconfig')
 from building import *
 
-src	= Split('''
+cwd = GetCurrentDir()
+CPPPATH = [cwd]
+src = Split('''
 tjpgd.c
 ''')
 
-CPPPATH = [RTT_ROOT + '/components/external/tjpgd1a']
-
 group = DefineGroup('tjpgd', src, depend = ['RTGUI_IMAGE_TJPGD'], CPPPATH = CPPPATH)
 
 Return('group')

+ 2 - 2
components/finsh/SConscript

@@ -1,8 +1,8 @@
 Import('rtconfig')
 from building import *
 
-cwd = GetCurrentDir()
-src	= Glob('*.c')
+cwd     = GetCurrentDir()
+src     = Glob('*.c')
 CPPPATH = [cwd]
 if rtconfig.CROSS_TOOL == 'keil':
     LINKFLAGS = ' --keep __fsym_* --keep __vsym_* '