Merge branch 'master' of https://github.com/RT-Thread/rt-thread

1 files changed, 46 insertions, 12 deletions

diff --git a/components/external/espruino/SConscript b/components/external/espruino/SConscript
index 3d5c775064..7e94473d94 100644
--- a/components/external/espruino/SConscript
+++ b/components/external/espruino/SConscript
@@ -1,19 +1,53 @@
 from building import *
-import os
 
 cwd = GetCurrentDir()
-# source files 
-src = Split('''
-''')
+path = [cwd, cwd + '/src', cwd + '/gen', cwd + '/libs', cwd + '/targets/rtthread']
 
-ESPRUINO_SRC_PATH = cwd + '/src'
-if GetDepend('RT_USING_JS') and not os.path.exists(ESPRUINO_SRC_PATH):
-    print '================ERROR============================'
-    print 'Please get espruino source files and put them under espruino folder'
-    print '================================================='
-    exit(0)
+src	= Split("""
+src/jsdevices.c
+src/jslex.c
+src/jswrap_array.c
+src/jswrap_json.c
+src/jswrap_process.c
+src/jsutils.c
+src/jswrap_interactive.c
+src/jswrap_onewire.c
+src/jswrap_string.c
+src/jsparse.c
+src/jswrap_arraybuffer.c
+src/jswrap_modules.c
+src/jswrap_serial.c
+src/jsinteractive.c
+src/jsvar.c
+src/jswrap_io.c
+src/jswrap_pin.c
+src/jspin.c
+src/jswrap_functions.c
+src/jswrap_object.c
+src/jswrap_spi_i2c.c
+"""
+)
 
-CPPPATH = [cwd + '/src', cwd + '/gen', cwd + '/libs', cwd + '/targets/rtthread']
-group = DefineGroup('Espruino', src, depend = ['RT_USING_JS'], CPPPATH = CPPPATH)
+gen = Split("""
+gen/jspininfo.c
+gen/jswrapper.c
+"""
+)
+
+target = Split("""
+targets/rtthread/espruino.c  
+targets/rtthread/jshardware.c
+"""
+)
+
+libs = Split(
+"""
+libs/jswrap_math.c
+"""
+)
+
+src	= src + gen + target + libs
+
+group = DefineGroup('Espruino', src, depend = ['RT_USING_JS', 'RT_USING_NEWLIB'], CPPPATH = path)
 
 Return('group')