Declare dependencies of command line editing in the build system

This commit is contained in:
Glenn L McGrath 2004-01-03 12:07:32 +00:00
parent ffa28d1b46
commit 3b25185733
2 changed files with 40 additions and 51 deletions

View File

@ -137,40 +137,12 @@ config CONFIG_MSH
comment "Bourne Shell Options" comment "Bourne Shell Options"
depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
config CONFIG_FEATURE_COMMAND_EDITING config CONFIG_FEATURE_SH_EXTRA_QUIET
bool "command line editing" bool "Hide message on interactive shell startup"
default n default n
depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
help help
Enable command editing in shell. Remove the busybox introduction when starting a shell.
config CONFIG_FEATURE_COMMAND_SAVEHISTORY
bool " history saving"
default n
depends on CONFIG_ASH
help
Enable history saving in ash shell.
config CONFIG_FEATURE_COMMAND_TAB_COMPLETION
bool "tab completion"
default n
depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
help
Enable tab completion in shell.
config CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
bool "username completion"
default n
depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
help
Enable username completion in shell.
config CONFIG_FEATURE_COMMAND_HISTORY
int "history size"
default 15
depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
help
Specify command history size in shell.
config CONFIG_FEATURE_SH_STANDALONE_SHELL config CONFIG_FEATURE_SH_STANDALONE_SHELL
bool "Standalone shell" bool "Standalone shell"
@ -188,20 +160,47 @@ config CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
Use a command builtin to the shell over one with the same name, Use a command builtin to the shell over one with the same name,
that may be on the system. that may be on the system.
config CONFIG_FEATURE_COMMAND_EDITING
bool "command line editing"
default n
depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
help
Enable command editing in shell.
config CONFIG_FEATURE_COMMAND_HISTORY
int "history size"
default 15
depends on CONFIG_FEATURE_COMMAND_EDITING
help
Specify command history size in shell.
config CONFIG_FEATURE_COMMAND_SAVEHISTORY
bool "history saving"
default n
depends on CONFIG_ASH && CONFIG_FEATURE_COMMAND_EDITING
help
Enable history saving in ash shell.
config CONFIG_FEATURE_COMMAND_TAB_COMPLETION
bool "tab completion"
default n
depends on CONFIG_FEATURE_COMMAND_EDITING
help
Enable tab completion in shell.
config CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
bool "username completion"
default n
depends on CONFIG_FEATURE_COMMAND_TAB_COMPLETION
help
Enable username completion in shell.
config CONFIG_FEATURE_SH_FANCY_PROMPT config CONFIG_FEATURE_SH_FANCY_PROMPT
bool "Fancy shell prompts" bool "Fancy shell prompts"
default n default n
depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH depends on CONFIG_FEATURE_COMMAND_EDITING
help help
Setting this option allows for prompts to use things like \w and Setting this option allows for prompts to use things like \w and
\$ and also using escape codes. \$ and also using escape codes.
config CONFIG_FEATURE_SH_EXTRA_QUIET
bool "Hide message on interactive shell startup"
default n
depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
help
Remove the busybox introduction when starting a shell.
endmenu endmenu

View File

@ -49,11 +49,7 @@
#define Isprint(c) ( (c) >= ' ' && (c) != ((unsigned char)'\233') ) #define Isprint(c) ( (c) >= ' ' && (c) != ((unsigned char)'\233') )
#endif #endif
#ifndef TEST #ifdef TEST
#define D(x)
#else
/* pretect redefined for test */ /* pretect redefined for test */
#undef CONFIG_FEATURE_COMMAND_EDITING #undef CONFIG_FEATURE_COMMAND_EDITING
@ -68,8 +64,6 @@
#define CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT #define CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
#define CONFIG_FEATURE_CLEAN_UP #define CONFIG_FEATURE_CLEAN_UP
#define D(x) x
#endif /* TEST */ #endif /* TEST */
#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION #ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
@ -79,10 +73,6 @@
#ifdef CONFIG_FEATURE_COMMAND_EDITING #ifdef CONFIG_FEATURE_COMMAND_EDITING
#ifndef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
#undef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
#endif
#if defined(CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION) || defined(CONFIG_FEATURE_SH_FANCY_PROMPT) #if defined(CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION) || defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
#define CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR #define CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
#endif #endif