From 3d80e414ff6c03ff04fecb914e7aa9b3fb535e03 Mon Sep 17 00:00:00 2001
From: Bernard Xiong <bernard.xiong@gmail.com>
Date: Tue, 25 Feb 2014 13:43:59 +0800
Subject: [PATCH] [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(-)

diff --git a/components/dfs/filesystems/romfs/mkromfs.py b/components/dfs/filesystems/romfs/mkromfs.py
index a84458e89..d1354eb25 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 03088359f..7e94473d9 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 372d93f06..6427e7c0d 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):