Skip to content

Commit

Permalink
Add "make list", rename make working->list_working and pending->list_…
Browse files Browse the repository at this point in the history
…pending,

and filter out commands that aren't nofork but aren't installed either
(toyflags 0, I.E. recognized aliases like "-sh" called from login).
  • Loading branch information
landley committed Feb 14, 2016
1 parent 9502a77 commit 05b7529
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ toybox toybox_unstripped: toybox_stuff

.PHONY: clean distclean baseline bloatcheck install install_flat \
uinstall uninstall_flat test tests help toybox_stuff change \
working pending
list list_working list_pending

include kconfig/Makefile
-include .singlemake
Expand Down Expand Up @@ -66,8 +66,7 @@ tests:
help::
@echo ' toybox - Build toybox.'
@echo ' COMMANDNAME - Build individual toybox command as a standalone binary.'
@echo ' working - List working COMMANDNAMEs.'
@echo ' pending - List pending (unfinished) COMMANDNAMEs.'
@echo ' list - List COMMANDNAMEs (also list_working and list_pending)."
@echo ' change - Build each command standalone under change/.'
@echo ' baseline - Create toybox_old for use by bloatcheck.'
@echo ' bloatcheck - Report size differences between old and current versions'
Expand Down
8 changes: 5 additions & 3 deletions scripts/genconfig.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ genconfig > generated/Config.in || rm generated/Config.in
# Find names of commands that can be built standalone in these C files
toys()
{
grep 'TOY(.*)' "$@" | grep -v TOYFLAG_NOFORK | \
grep 'TOY(.*)' "$@" | grep -v TOYFLAG_NOFORK | grep -v "0))" | \
sed -rn 's/([^:]*):.*(OLD|NEW)TOY\( *([a-zA-Z][^,]*) *,.*/\1:\3/p'
}

Expand All @@ -140,8 +140,10 @@ do
WORKING="$WORKING $NAME"
done > .singlemake &&
echo -e "clean::\n\trm -f $WORKING $PENDING" >> .singlemake &&
echo -e "working:\n\t@echo $(echo $WORKING | tr ' ' '\n' | sort | xargs)" \
echo -e "list:\n\t@echo $(echo $WORKING $PENDING | tr ' ' '\n' | sort | xargs)"\
>> .singlemake &&
echo -e "pending:\n\t@echo $(echo $PENDING | tr ' ' '\n' | sort | xargs)" \
echo -e "list_working:\n\t@echo $(echo $WORKING | tr ' ' '\n' | sort | xargs)" \
>> .singlemake &&
echo -e "list_pending:\n\t@echo $(echo $PENDING | tr ' ' '\n' | sort | xargs)" \
>> .singlemake
)

0 comments on commit 05b7529

Please sign in to comment.