From 121bb5fcdfb3bc5f3586a0937e1b24885236b53d Mon Sep 17 00:00:00 2001 From: geniusgogo Date: Tue, 25 Feb 2014 01:47:49 +0800 Subject: add JavaScript Interpreter --- components/external/espruino/SConscript | 71 +++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 16 deletions(-) (limited to 'components/external/espruino/SConscript') diff --git a/components/external/espruino/SConscript b/components/external/espruino/SConscript index 3d5c775064..ca4f32b403 100644 --- a/components/external/espruino/SConscript +++ b/components/external/espruino/SConscript @@ -1,19 +1,58 @@ +import rtconfig +Import('RTT_ROOT') from building import * -import os - -cwd = GetCurrentDir() -# source files -src = Split(''' -''') - -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) - -CPPPATH = [cwd + '/src', cwd + '/gen', cwd + '/libs', cwd + '/targets/rtthread'] -group = DefineGroup('Espruino', src, depend = ['RT_USING_JS'], CPPPATH = CPPPATH) + +path = [RTT_ROOT + r'/components/external/Espruino'] +path = path + [RTT_ROOT + r'/components/external/Espruino/src/'] +path = path + [RTT_ROOT + r'/components/external/Espruino/gen/'] +path = path + [RTT_ROOT + r'/components/external/Espruino/libs/'] +path = path + [RTT_ROOT + r'/components/external/Espruino/targets/rtthread/'] + +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 +""" +) + +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 += gen + target + libs + +group = DefineGroup('Espruino', src, depend = ['RT_USING_JS', 'RT_USING_NEWLIB'], CPPPATH = path) Return('group') -- cgit v1.3.1 From 213f47e380e87a26d60ba630a8256cb63224d2aa Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Tue, 25 Feb 2014 09:29:09 +0800 Subject: Update SConscript --- components/external/espruino/SConscript | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'components/external/espruino/SConscript') diff --git a/components/external/espruino/SConscript b/components/external/espruino/SConscript index ca4f32b403..03088359ff 100644 --- a/components/external/espruino/SConscript +++ b/components/external/espruino/SConscript @@ -1,12 +1,7 @@ -import rtconfig -Import('RTT_ROOT') from building import * -path = [RTT_ROOT + r'/components/external/Espruino'] -path = path + [RTT_ROOT + r'/components/external/Espruino/src/'] -path = path + [RTT_ROOT + r'/components/external/Espruino/gen/'] -path = path + [RTT_ROOT + r'/components/external/Espruino/libs/'] -path = path + [RTT_ROOT + r'/components/external/Espruino/targets/rtthread/'] +cwd = GetCurrentDir() +path = [cwd + '/src', cwd + '/gen', cwd + '/libs', cwd + '/targets/rtthread'] src = Split(""" src/jsdevices.c @@ -51,7 +46,7 @@ libs/jswrap_math.c """ ) -src += gen + target + libs +src = src + gen + target + libs group = DefineGroup('Espruino', src, depend = ['RT_USING_JS', 'RT_USING_NEWLIB'], CPPPATH = path) -- cgit v1.3.1 From 3d80e414ff6c03ff04fecb914e7aa9b3fb535e03 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Tue, 25 Feb 2014 13:43:59 +0800 Subject: [JS] fix the include path issue --- components/dfs/filesystems/romfs/mkromfs.py | 13 +++++++------ components/external/espruino/SConscript | 2 +- tools/building.py | 5 ----- 3 files changed, 8 insertions(+), 12 deletions(-) (limited to 'components/external/espruino/SConscript') diff --git a/components/dfs/filesystems/romfs/mkromfs.py b/components/dfs/filesystems/romfs/mkromfs.py index a84458e892..d1354eb259 100644 --- a/components/dfs/filesystems/romfs/mkromfs.py +++ b/components/dfs/filesystems/romfs/mkromfs.py @@ -4,6 +4,7 @@ import string basename = '' output = '' +sep = os.sep def mkromfs_output(out): # print '%s' % out, @@ -54,12 +55,12 @@ def mkromfs_dir(dirname, is_root = False): fullpath = os.path.join(path, item) if os.path.isfile(fullpath): subpath = fullpath[len(basename):] - array = subpath.split('\\') + array = subpath.split(sep) arrayname = string.join(array, '_') mkromfs_file(fullpath, arrayname) subpath = path[len(basename):] - dir = subpath.split('\\') + dir = subpath.split(sep) direntname = string.join(dir, '_') if is_root: mkromfs_output('const struct romfs_dirent _root_dirent[] = {\n') @@ -69,12 +70,12 @@ def mkromfs_dir(dirname, is_root = False): for item in list: fullpath = os.path.join(path, item) fn = fullpath[len(dirname):] - if fn[0] == '\\': + if fn[0] == sep: fn = fn[1:] fn = fn.replace('\\', '/') subpath = fullpath[len(basename):] - items = subpath.split('\\') + items = subpath.split(sep) item_name = string.join(items, '_') item_name = item_name.replace('.', '_') item_name = item_name.replace('-', '_') @@ -92,12 +93,12 @@ def mkromfs_dir(dirname, is_root = False): for item in list: fullpath = os.path.join(path, item) fn = fullpath[len(dirname):] - if fn[0] == '\\': + if fn[0] == sep: fn = fn[1:] fn = fn.replace('\\', '/') subpath = fullpath[len(basename):] - items = subpath.split('\\') + items = subpath.split(sep) item_name = string.join(items, '_') item_name = item_name.replace('.', '_') item_name = item_name.replace('-', '_') diff --git a/components/external/espruino/SConscript b/components/external/espruino/SConscript index 03088359ff..7e94473d94 100644 --- a/components/external/espruino/SConscript +++ b/components/external/espruino/SConscript @@ -1,7 +1,7 @@ from building import * cwd = GetCurrentDir() -path = [cwd + '/src', cwd + '/gen', cwd + '/libs', cwd + '/targets/rtthread'] +path = [cwd, cwd + '/src', cwd + '/gen', cwd + '/libs', cwd + '/targets/rtthread'] src = Split(""" src/jsdevices.c diff --git a/tools/building.py b/tools/building.py index 372d93f06f..6427e7c0dd 100644 --- a/tools/building.py +++ b/tools/building.py @@ -284,11 +284,6 @@ def MergeGroup(src_group, group): else: src_group['LIBPATH'] = group['LIBPATH'] - if src_group.has_key('LIBS'): - print src_group['LIBS'] - if src_group.has_key('LIBS'): - print src_group['LIBPATH'] - def DefineGroup(name, src, depend, **parameters): global Env if not GetDepend(depend): -- cgit v1.3.1