svn commit: trunk/busybox: coreutils shell
aldot at busybox.net
aldot at busybox.net
Thu Jan 19 14:42:24 UTC 2006
Author: aldot
Date: 2006-01-19 06:42:23 -0800 (Thu, 19 Jan 2006)
New Revision: 13424
Log:
- cleanup Config.in. Use "select CONFIG_FOO" and add the corresponding
"depends on CONFIG_BAR" instead of the if !CONFIG_FOO ...default y stanza.
Modified:
trunk/busybox/coreutils/Config.in
trunk/busybox/shell/Config.in
Changeset:
Modified: trunk/busybox/coreutils/Config.in
===================================================================
--- trunk/busybox/coreutils/Config.in 2006-01-19 13:51:23 UTC (rev 13423)
+++ trunk/busybox/coreutils/Config.in 2006-01-19 14:42:23 UTC (rev 13424)
@@ -79,21 +79,13 @@
cut is used to print selected parts of lines from
each file to stdout.
-if CONFIG_WATCH
- config CONFIG_DATE
- default y
- comment "date (forced enabled for use with watch)"
-endif
+config CONFIG_DATE
+ bool "date"
+ default n
+ help
+ date is used to set the system date or display the
+ current time in the given format.
-if !CONFIG_WATCH
- config CONFIG_DATE
- bool "date"
- default n
- help
- date is used to set the system date or display the
- current time in the given format.
-endif
-
config CONFIG_FEATURE_DATE_ISOFMT
bool " Enable ISO date format output (-I)"
default y
@@ -179,20 +171,12 @@
expr is used to calculate numbers and print the result
to standard output.
-if CONFIG_HUSH || CONFIG_LASH || CONFIG_MSH
- config CONFIG_FALSE
- default y
- comment "false (forced enabled for use with shell)"
-endif
+config CONFIG_FALSE
+ bool "false"
+ default n
+ help
+ false returns an exit code of FALSE (1).
-if !CONFIG_HUSH && !CONFIG_LASH && !CONFIG_MSH
- config CONFIG_FALSE
- bool "false"
- default n
- help
- false returns an exit code of FALSE (1).
-endif
-
config CONFIG_FOLD
bool "fold"
default n
@@ -305,17 +289,16 @@
help
This enables the --color option to ls.
-if CONFIG_FEATURE_LS_COLOR
- config CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
- bool " Produce colored ls output by default"
- default n
- help
- Saying yes here will turn coloring on by default,
- even if no "--color" option is given to the ls command.
- This is not recommended, since the colors are not
- configurable, and the output may not be legible on
- many output screens.
-endif
+config CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
+ bool " Produce colored ls output by default"
+ default n
+ depends on CONFIG_FEATURE_LS_COLOR
+ help
+ Saying yes here will turn coloring on by default,
+ even if no "--color" option is given to the ls command.
+ This is not recommended, since the colors are not
+ configurable, and the output may not be legible on
+ many output screens.
config CONFIG_MD5SUM
bool "md5sum"
@@ -525,22 +508,14 @@
help
Enable this option for a faster tee, at expense of size.
-if CONFIG_ASH || CONFIG_HUSH || CONFIG_LASH || CONFIG_MSH
- config CONFIG_TEST
- default y
- comment "test (forced enabled for use with shell)"
-endif
+config CONFIG_TEST
+ bool "test"
+ default n
+ help
+ test is used to check file types and compare values,
+ returning an appropriate exit code. The shells (ash
+ and bash) have test builtin.
-if !CONFIG_ASH && !CONFIG_HUSH && !CONFIG_LASH && !CONFIG_MSH
- config CONFIG_TEST
- bool "test"
- default n
- help
- test is used to check file types and compare values,
- returning an appropriate exit code. The shells (ash
- and bash) have test builtin.
-endif
-
config CONFIG_FEATURE_TEST_64
bool " Extend test to 64 bit"
default n
@@ -581,21 +556,12 @@
useful for cases when no other way of expressing a character
is possible.
-if CONFIG_HUSH || CONFIG_LASH || CONFIG_MSH
- config CONFIG_TRUE
- default y
- comment "true (forced enabled for use with shell)"
-endif
+config CONFIG_TRUE
+ bool "true"
+ default n
+ help
+ true returns an exit code of TRUE (0).
-if !CONFIG_HUSH && !CONFIG_LASH && !CONFIG_MSH
- config CONFIG_TRUE
- bool "true"
- default n
- help
- true returns an exit code of TRUE (0).
-
-endif
-
config CONFIG_TTY
bool "tty"
default n
@@ -636,6 +602,7 @@
config CONFIG_WATCH
bool "watch"
default n
+ select CONFIG_DATE
help
watch is used to execute a program periodically, showing
output to the screen.
@@ -669,7 +636,7 @@
the default string `y'.
comment "Common options for cp and mv"
- depends on CONFIG_CP || CONFIG_MV
+ depends on CONFIG_CP || CONFIG_MV
config CONFIG_FEATURE_PRESERVE_HARDLINKS
bool " Preserve hard links"
@@ -693,7 +660,7 @@
unable to determine the current screen width.
comment "Common options for df, du, ls"
- depends on CONFIG_DF || CONFIG_DU || CONFIG_LS
+ depends on CONFIG_DF || CONFIG_DU || CONFIG_LS
config CONFIG_FEATURE_HUMAN_READABLE
bool " Support for human readable output (example 13k, 23M, 235G)"
@@ -703,7 +670,7 @@
Allow df, du, and ls to have human readable output.
comment "Common options for md5sum, sha1sum"
- depends on CONFIG_MD5SUM || CONFIG_SHA1SUM
+ depends on CONFIG_MD5SUM || CONFIG_SHA1SUM
config CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
bool " Enable -c, -s and -w options"
Modified: trunk/busybox/shell/Config.in
===================================================================
--- trunk/busybox/shell/Config.in 2006-01-19 13:51:23 UTC (rev 13423)
+++ trunk/busybox/shell/Config.in 2006-01-19 14:42:23 UTC (rev 13424)
@@ -36,6 +36,7 @@
config CONFIG_ASH
bool "ash"
default y
+ select CONFIG_TEST
help
Tha 'ash' shell adds about 60k in the default configuration and is
the most complete and most pedantically correct shell included with
@@ -161,6 +162,9 @@
config CONFIG_HUSH
bool "hush"
default n
+ select CONFIG_TRUE
+ select CONFIG_FALSE
+ select CONFIG_TEST
help
hush is a very small shell (just 18k) and it has fairly complete
Bourne shell grammar. It even handles all the normal flow control
@@ -175,6 +179,9 @@
config CONFIG_LASH
bool "lash"
default n
+ select CONFIG_TRUE
+ select CONFIG_FALSE
+ select CONFIG_TEST
help
lash is the very smallest shell (adds just 10k) and it is quite
usable as a command prompt, but it is not suitable for any but the
@@ -187,6 +194,9 @@
config CONFIG_MSH
bool "msh"
default n
+ select CONFIG_TRUE
+ select CONFIG_FALSE
+ select CONFIG_TEST
help
The minix shell (adds just 30k) is quite complete and handles things
like for/do/done, case/esac and all the things you expect a Bourne
More information about the busybox-cvs
mailing list