diff options
| author | jonas <[email protected]> | 2021-09-02 10:36:07 +0800 |
|---|---|---|
| committer | jonas <[email protected]> | 2021-09-02 10:36:07 +0800 |
| commit | d72ee7b6cc19e3b0d5721b2b5fa047ed1a5fc7c4 (patch) | |
| tree | ab7034a4df4cb5171a68c2236f9f831c8cd27ed0 /components/finsh/SConscript | |
| parent | ab43390fe2c0e672771b73cf610e739a419aa06f (diff) | |
| parent | 8d175ab3d237dccc25450a8e12808fc87318eb2f (diff) | |
Merge branch 'master' of [email protected]:RT-Thread/rt-thread.git into bsp_hk32
# Conflicts:
# .ignore_format.yml
Diffstat (limited to 'components/finsh/SConscript')
| -rw-r--r-- | components/finsh/SConscript | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/components/finsh/SConscript b/components/finsh/SConscript index be04c56616..28fe02bac5 100644 --- a/components/finsh/SConscript +++ b/components/finsh/SConscript @@ -1,39 +1,19 @@ -Import('rtconfig') from building import * cwd = GetCurrentDir() src = Split(''' shell.c -cmd.c +msh.c ''') -fsh_src = Split(''' -finsh_compiler.c -finsh_error.c -finsh_heap.c -finsh_init.c -finsh_node.c -finsh_ops.c -finsh_parser.c -finsh_var.c -finsh_vm.c -finsh_token.c -''') - -msh_src = Glob('msh.c') +if GetDepend('MSH_USING_BUILT_IN_COMMANDS'): + src += ['cmd.c'] if GetDepend('RT_USING_DFS'): - msh_src += ['msh_file.c'] - -if not GetDepend('FINSH_USING_SYMTAB'): - src += ['symbol.c'] -if GetDepend('FINSH_USING_MSH'): - src = src + msh_src -if not GetDepend('FINSH_USING_MSH_ONLY'): - src = src + fsh_src + src += ['msh_file.c'] CPPPATH = [cwd] -group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH) +group = DefineGroup('Finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH) Return('group') |
