diff options
author | Ron Yorston | 2018-11-21 10:11:01 +0000 |
---|---|---|
committer | Denys Vlasenko | 2018-11-27 10:38:10 +0100 |
commit | 7b42f8fc76d78fe9c6b0cbe15e1425f2fd9fb5e8 (patch) | |
tree | c18d535a6a1821a683f2bebf0370c1d77c4d86a1 /scripts | |
parent | dffc8ff6a638a4ae865821eb2d0852124c096c11 (diff) | |
download | busybox-7b42f8fc76d78fe9c6b0cbe15e1425f2fd9fb5e8.zip 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 'scripts')
-rwxr-xr-x | scripts/embedded_scripts | 22 | ||||
-rwxr-xr-x | scripts/gen_build_files.sh | 4 |
2 files changed, 10 insertions, 16 deletions
diff --git a/scripts/embedded_scripts b/scripts/embedded_scripts index c2e7c69..86ad44d 100755 --- a/scripts/embedded_scripts +++ b/scripts/embedded_scripts @@ -81,21 +81,15 @@ exec >"$target.$$" if [ $n -ne 0 ] then printf '#ifdef DEFINE_SCRIPT_DATA\n' - if [ $n -ne 0 ] - then - printf 'const uint16_t applet_numbers[] = {\n' - for i in $custom_scripts $applet_scripts - do - # TODO support applets with names including invalid characters - printf '\tAPPLET_NO_%s,\n' $i - done - printf '};\n' - fi + printf 'const uint16_t applet_numbers[] = {\n' + for i in $custom_scripts $applet_scripts + do + # TODO support applets with names including invalid characters + printf '\tAPPLET_NO_%s,\n' $i + done + printf '};\n' printf '#else\n' - if [ $n -ne 0 ] - then - printf 'extern const uint16_t applet_numbers[];\n' - fi + printf 'extern const uint16_t applet_numbers[];\n' printf '#endif\n' fi diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh index 64e4bff..362632d 100755 --- a/scripts/gen_build_files.sh +++ b/scripts/gen_build_files.sh @@ -23,9 +23,9 @@ custom_scripts() custom_loc="$1" if [ -d "$custom_loc" ] then - for i in $(cd "$custom_loc"; ls *) + for i in $(cd "$custom_loc"; ls * 2>/dev/null) do - printf "APPLET_SCRIPTED(%s, scripted, BB_DIR_USR_BIN, BB_SUID_DROP, dummy)\n" $i; + printf "APPLET_SCRIPTED(%s, scripted, BB_DIR_USR_BIN, BB_SUID_DROP, scripted)\n" $i; done fi } |