From ba83ddc3c4e2fc16865b43f87081ab403a4941a9 Mon Sep 17 00:00:00 2001 From: yangjie11 Date: Mon, 30 Nov 2020 15:45:58 +0800 Subject: [SConscript] change libcpu to LIBARCH,and correcte letter case --- components/dfs/SConscript | 2 +- components/dfs/filesystems/devfs/SConscript | 2 +- components/dfs/filesystems/elmfat/SConscript | 2 +- components/dfs/filesystems/jffs2/SConscript | 2 +- components/dfs/filesystems/nfs/SConscript | 2 +- components/dfs/filesystems/ramfs/SConscript | 2 +- components/dfs/filesystems/romfs/SConscript | 2 +- components/dfs/filesystems/uffs/SConscript | 2 +- components/finsh/SConscript | 2 +- components/libc/compilers/armlibc/SConscript | 2 +- components/libc/compilers/common/SConscript | 2 +- components/libc/compilers/minilibc/SConscript | 2 +- components/libc/compilers/newlib/SConscript | 2 +- components/libc/getline/SConscript | 2 +- components/libc/libdl/SConscript | 2 +- components/libc/mmap/SConscript | 2 +- components/libc/signal/SConscript | 2 +- components/libc/termios/SConscript | 2 +- components/net/netdev/SConscript | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) (limited to 'components') diff --git a/components/dfs/SConscript b/components/dfs/SConscript index 3ccaeb1080..edfd4e42b5 100644 --- a/components/dfs/SConscript +++ b/components/dfs/SConscript @@ -13,7 +13,7 @@ CPPPATH = [cwd + "/include"] if GetDepend('RT_USING_POSIX'): src += ['src/poll.c', 'src/select.c'] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH) if GetDepend('RT_USING_DFS'): # search in the file system implementation diff --git a/components/dfs/filesystems/devfs/SConscript b/components/dfs/filesystems/devfs/SConscript index 898b04a234..a2c0d843f0 100644 --- a/components/dfs/filesystems/devfs/SConscript +++ b/components/dfs/filesystems/devfs/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_DEVFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_DEVFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/elmfat/SConscript b/components/dfs/filesystems/elmfat/SConscript index 8b7ec02d43..173c0a9d65 100644 --- a/components/dfs/filesystems/elmfat/SConscript +++ b/components/dfs/filesystems/elmfat/SConscript @@ -21,6 +21,6 @@ if GetDepend('RT_DFS_ELM_USE_LFN'): else: src += ['option/ccsbcs.c'] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_ELMFAT'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_ELMFAT'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/jffs2/SConscript b/components/dfs/filesystems/jffs2/SConscript index 47854393e3..85d3a4d8d2 100644 --- a/components/dfs/filesystems/jffs2/SConscript +++ b/components/dfs/filesystems/jffs2/SConscript @@ -45,6 +45,6 @@ src/write.c CPPPATH = [cwd, cwd + '/include', cwd + '/src', cwd + '/cyg', cwd + '/kernel', cwd + '/cyg/compress'] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_JFFS2'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_JFFS2'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/nfs/SConscript b/components/dfs/filesystems/nfs/SConscript index f830dfc754..b340d36de2 100644 --- a/components/dfs/filesystems/nfs/SConscript +++ b/components/dfs/filesystems/nfs/SConscript @@ -8,6 +8,6 @@ CPPPATH = [cwd] SrcRemove(src, ['rpc/auth_none.c']) -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_NFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_NFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/ramfs/SConscript b/components/dfs/filesystems/ramfs/SConscript index 1304f59629..12977adf53 100644 --- a/components/dfs/filesystems/ramfs/SConscript +++ b/components/dfs/filesystems/ramfs/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_MEMHEAP', 'RT_USING_DFS_RAMFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_MEMHEAP', 'RT_USING_DFS_RAMFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/romfs/SConscript b/components/dfs/filesystems/romfs/SConscript index bfd633ce91..d31941eb8a 100644 --- a/components/dfs/filesystems/romfs/SConscript +++ b/components/dfs/filesystems/romfs/SConscript @@ -10,6 +10,6 @@ if GetDepend('DFS_ROMFS_ROOT'): # A new ROMFS root has been defined, we should remove the romfs.c SrcRemove(src, ['romfs.c']) -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/uffs/SConscript b/components/dfs/filesystems/uffs/SConscript index 53f7713fc2..1ccd4a6869 100644 --- a/components/dfs/filesystems/uffs/SConscript +++ b/components/dfs/filesystems/uffs/SConscript @@ -33,6 +33,6 @@ src = src + uffs CPPPATH = [cwd, cwd + '/src/inc'] -group = DefineGroup('Filesystem', src , depend = ['RT_USING_DFS', 'RT_USING_DFS_UFFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src , depend = ['RT_USING_DFS', 'RT_USING_DFS_UFFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/finsh/SConscript b/components/finsh/SConscript index 88d4713d58..706165a47e 100644 --- a/components/finsh/SConscript +++ b/components/finsh/SConscript @@ -34,6 +34,6 @@ if not GetDepend('FINSH_USING_MSH_ONLY'): CPPPATH = [cwd] -group = DefineGroup('Finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH) +group = DefineGroup('FinSH', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/armlibc/SConscript b/components/libc/compilers/armlibc/SConscript index 2d366901c4..5f8f65a563 100644 --- a/components/libc/compilers/armlibc/SConscript +++ b/components/libc/compilers/armlibc/SConscript @@ -15,7 +15,7 @@ if GetDepend('RT_USING_MODULE') == False: SrcRemove(src, ['libc_syms.c']) if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': - group = DefineGroup('Libc', src, depend = ['RT_USING_LIBC'], + group = DefineGroup('LIBC', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index 21a49d9c57..f661a1ee0d 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -17,6 +17,6 @@ if GetDepend('RT_USING_POSIX') == False: SrcRemove(src, ['unistd.c']) if not GetDepend('RT_USING_MINILIBC') and (GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME')): - group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH) + group = DefineGroup('LIBC', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/minilibc/SConscript b/components/libc/compilers/minilibc/SConscript index efdcf5d097..cdaf9ec32b 100644 --- a/components/libc/compilers/minilibc/SConscript +++ b/components/libc/compilers/minilibc/SConscript @@ -9,7 +9,7 @@ CPPPATH = [cwd] CPPDEFINES = ['RT_USING_MINILIBC'] if rtconfig.PLATFORM == 'gcc' and rtconfig.ARCH != 'sim' and not GetDepend('RT_USING_LIBC') and GetDepend('RT_USING_MINILIBC'): - group = DefineGroup('Libc', src, depend = [''], + group = DefineGroup('LIBC', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript index bd444ab732..11de59bec4 100644 --- a/components/libc/compilers/newlib/SConscript +++ b/components/libc/compilers/newlib/SConscript @@ -15,7 +15,7 @@ CPPDEFINES = ['RT_USING_NEWLIB'] LIBS = ['c', 'm'] if rtconfig.PLATFORM == 'gcc': - group = DefineGroup('Newlib', src, depend = ['RT_USING_LIBC'], + group = DefineGroup('NewLIB', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS) Return('group') diff --git a/components/libc/getline/SConscript b/components/libc/getline/SConscript index f85843dada..6c9a2a164c 100644 --- a/components/libc/getline/SConscript +++ b/components/libc/getline/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Libc', src, +group = DefineGroup('LIBC', src, depend = ['RT_USING_LIBC', 'RT_USING_POSIX','RT_USING_POSIX_GETLINE'], CPPPATH = CPPPATH) diff --git a/components/libc/libdl/SConscript b/components/libc/libdl/SConscript index 05efab351c..28265521f6 100644 --- a/components/libc/libdl/SConscript +++ b/components/libc/libdl/SConscript @@ -7,7 +7,7 @@ group = [] CPPPATH = [cwd] if rtconfig.PLATFORM == 'gcc': - group = DefineGroup('Libc', src, + group = DefineGroup('LIBC', src, depend = ['RT_USING_MODULE'], CPPPATH = CPPPATH) diff --git a/components/libc/mmap/SConscript b/components/libc/mmap/SConscript index 0b84003241..53036ad436 100644 --- a/components/libc/mmap/SConscript +++ b/components/libc/mmap/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Libc', src, +group = DefineGroup('LIBC', src, depend = ['RT_USING_DFS', 'RT_USING_POSIX_MMAP'], CPPPATH = CPPPATH) diff --git a/components/libc/signal/SConscript b/components/libc/signal/SConscript index 407d60c728..f32a1221ea 100644 --- a/components/libc/signal/SConscript +++ b/components/libc/signal/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Libc', src, +group = DefineGroup('LIBC', src, depend = ['RT_USING_SIGNALS', 'RT_USING_PTHREADS', 'RT_USING_LIBC'], CPPPATH = CPPPATH) diff --git a/components/libc/termios/SConscript b/components/libc/termios/SConscript index 977ff7e0a2..4bd0a42eb8 100644 --- a/components/libc/termios/SConscript +++ b/components/libc/termios/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Libc', src, +group = DefineGroup('LIBC', src, depend = ['RT_USING_LIBC', 'RT_USING_POSIX', 'RT_USING_POSIX_TERMIOS'], CPPPATH = CPPPATH) diff --git a/components/net/netdev/SConscript b/components/net/netdev/SConscript index 5fa858e968..0db486b2de 100644 --- a/components/net/netdev/SConscript +++ b/components/net/netdev/SConscript @@ -8,6 +8,6 @@ src = Glob('src/*.c') CPPPATH = [cwd + '/include'] -group = DefineGroup('Netdev', src, depend = ['RT_USING_NETDEV'], CPPPATH = CPPPATH) +group = DefineGroup('NetDev', src, depend = ['RT_USING_NETDEV'], CPPPATH = CPPPATH) Return('group') -- cgit v1.3.1