Sunxin 7 лет назад
Родитель
Сommit
cfbe663d2b
4 измененных файлов с 18 добавлено и 12 удалено
  1. 4 10
      SConscript
  2. 1 1
      examples/ImportCplusplus/SConscript
  3. 1 1
      examples/ImportModule/SConscript
  4. 12 0
      examples/SConscript

+ 4 - 10
SConscript

@@ -81,16 +81,10 @@ LOCAL_CPPDEFINES = ['JERRY_JS_PARSER', 'JERRY_ENABLE_ERROR_MESSAGES']
 group = DefineGroup('JerryScript', src, depend = ['PKG_USING_JERRYSCRIPT'], CPPPATH = path, 
     LOCAL_CPPDEFINES = LOCAL_CPPDEFINES, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
 
-list = os.listdir(cwd + '/examples')
+list = os.listdir(cwd)
 
-if GetDepend('PKG_USING_JERRYSCRIPT'):
-
-    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'))
+for item in list:
+	if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
+		group = group + SConscript(os.path.join(item, 'SConscript'))
 
 Return('group')

+ 1 - 1
examples/ImportCplusplus/SConscript

@@ -6,6 +6,6 @@ src = Glob('*.cpp')
 
 CPPPATH = [cwd]
 
-group = DefineGroup('JerryScript_demo_addCpp', src, depend = ['PKG_USING_JERRYSCRIPT'], CPPPATH = CPPPATH)
+group = DefineGroup('JerryScript', src, depend = ['PKG_USING_JERRYSCRIPT'], CPPPATH = CPPPATH)
 
 Return('group')

+ 1 - 1
examples/ImportModule/SConscript

@@ -6,6 +6,6 @@ src = Glob('*.c')
 
 CPPPATH = [cwd]
 
-group = DefineGroup('JerryScript_demo_addModule', src, depend = ['PKG_USING_JERRYSCRIPT'], CPPPATH = CPPPATH)
+group = DefineGroup('JerryScript', src, depend = ['PKG_USING_JERRYSCRIPT'], CPPPATH = CPPPATH)
 
 Return('group')

+ 12 - 0
examples/SConscript

@@ -0,0 +1,12 @@
+import os
+from building import *
+
+objs = []
+cwd  = GetCurrentDir()
+list = os.listdir(cwd)
+
+for item in list:
+    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
+        objs = objs + SConscript(os.path.join(item, 'SConscript'))
+
+Return('objs')