diff options
| author | Ron Yorston <rmy@pobox.com> | 2018-11-21 10:11:01 +0000 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-11-27 10:38:10 +0100 |
| commit | 7b42f8fc76d78fe9c6b0cbe15e1425f2fd9fb5e8 (patch) | |
| tree | c18d535a6a1821a683f2bebf0370c1d77c4d86a1 /include | |
| parent | dffc8ff6a638a4ae865821eb2d0852124c096c11 (diff) | |
| download | busybox-7b42f8fc76d78fe9c6b0cbe15e1425f2fd9fb5e8.tar.gz | |
Tweaks to build process for embedded scripts
- Force a rebuild if a script in applets_sh is changed.
- Move the dummy usage messages for custom applets to usage.h and
change the name from 'dummy' to 'scripted'.
- Hide an error from gen_build_files.sh if an embed directory exists
but is empty.
- Tidy up embedded_scripts script.
v2: Remove a couple of unnecessary tests in embedded_scripts, as
pointed out by Xabier Oneca.
Drop the stripping of comments.
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.src.h | 6 | ||||
| -rw-r--r-- | include/usage.src.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/applets.src.h b/include/applets.src.h index a9db5d160..60968cec7 100644 --- a/include/applets.src.h +++ b/include/applets.src.h @@ -22,12 +22,6 @@ s - suid type: BB_SUID_REQUIRE or BB_SUID_MAYBE applet. */ -#define NOUSAGE_STR "\b" - -#define dummy_trivial_usage NOUSAGE_STR \ - -#define dummy_full_usage "" \ - #if defined(PROTOTYPES) # define APPLET(name,l,s) int name##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; # define APPLET_ODDNAME(name,main,l,s,help) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; diff --git a/include/usage.src.h b/include/usage.src.h index 00369dfb3..d22efd3ba 100644 --- a/include/usage.src.h +++ b/include/usage.src.h @@ -14,6 +14,9 @@ #define NOUSAGE_STR "\b" +#define scripted_trivial_usage NOUSAGE_STR +#define scripted_full_usage "" + #if !ENABLE_USE_BB_CRYPT || ENABLE_USE_BB_CRYPT_SHA # define CRYPT_METHODS_HELP_STR "des,md5,sha256/512" \ " (default "CONFIG_FEATURE_DEFAULT_PASSWD_ALGO")" |