chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[JS] fix the include path issue

This commit is contained in:
Bernard Xiong 2014-02-25 13:43:59 +08:00
parent 213f47e380
commit 3d80e414ff
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/dfs/filesystems/romfs/mkromfs.py
View File

@ -4,6 +4,7 @@ import string
basename = '' basename = ''
output = '' output = ''
sep = os.sep
def mkromfs_output(out): def mkromfs_output(out):
# print '%s' % out, # print '%s' % out,
@ -54,12 +55,12 @@ def mkromfs_dir(dirname, is_root = False):
fullpath = os.path.join(path, item) fullpath = os.path.join(path, item)
if os.path.isfile(fullpath): if os.path.isfile(fullpath):
subpath = fullpath[len(basename):] subpath = fullpath[len(basename):]
array = subpath.split('\\') array = subpath.split(sep)
arrayname = string.join(array, '_') arrayname = string.join(array, '_')
mkromfs_file(fullpath, arrayname) mkromfs_file(fullpath, arrayname)
subpath = path[len(basename):] subpath = path[len(basename):]
dir = subpath.split('\\') dir = subpath.split(sep)
direntname = string.join(dir, '_') direntname = string.join(dir, '_')
if is_root: if is_root:
mkromfs_output('const struct romfs_dirent _root_dirent[] = {\n') mkromfs_output('const struct romfs_dirent _root_dirent[] = {\n')
@ -69,12 +70,12 @@ def mkromfs_dir(dirname, is_root = False):
for item in list: for item in list:
fullpath = os.path.join(path, item) fullpath = os.path.join(path, item)
fn = fullpath[len(dirname):] fn = fullpath[len(dirname):]
if fn[0] == '\\': if fn[0] == sep:
fn = fn[1:] fn = fn[1:]
fn = fn.replace('\\', '/') fn = fn.replace('\\', '/')
subpath = fullpath[len(basename):] subpath = fullpath[len(basename):]
items = subpath.split('\\') items = subpath.split(sep)
item_name = string.join(items, '_') item_name = string.join(items, '_')
item_name = item_name.replace('.', '_') item_name = item_name.replace('.', '_')
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: for item in list:
fullpath = os.path.join(path, item) fullpath = os.path.join(path, item)
fn = fullpath[len(dirname):] fn = fullpath[len(dirname):]
if fn[0] == '\\': if fn[0] == sep:
fn = fn[1:] fn = fn[1:]
fn = fn.replace('\\', '/') fn = fn.replace('\\', '/')
subpath = fullpath[len(basename):] subpath = fullpath[len(basename):]
items = subpath.split('\\') items = subpath.split(sep)
item_name = string.join(items, '_') item_name = string.join(items, '_')
item_name = item_name.replace('.', '_') item_name = item_name.replace('.', '_')
item_name = item_name.replace('-', '_') item_name = item_name.replace('-', '_')

2
components/external/espruino/SConscript vendored
View File

@ -1,7 +1,7 @@
from building import * from building import *
cwd = GetCurrentDir() 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 = Split("""
src/jsdevices.c src/jsdevices.c

5
tools/building.py
View File

@ -284,11 +284,6 @@ def MergeGroup(src_group, group):
else: else:
src_group['LIBPATH'] = group['LIBPATH'] 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): def DefineGroup(name, src, depend, **parameters):
global Env global Env
if not GetDepend(depend): if not GetDepend(depend):