diff options
| -rw-r--r-- | main.c | 2 | ||||
| -rwxr-xr-x | scripts/make.sh | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -5,7 +5,9 @@ #include "toys.h" +#ifndef TOYBOX_VERSION #define TOYBOX_VERSION "0.5.2" +#endif // Populate toy_list[]. diff --git a/scripts/make.sh b/scripts/make.sh index 4cb19272..3d9eed3f 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -58,9 +58,11 @@ fi # Extract a list of toys/*/*.c files to compile from the data in $KCONFIG_CONFIG # (First command names, then filenames with relevant {NEW,OLD}TOY() macro.) +GITHASH="$(git describe --tags --abbrev=12 2>/dev/null)" +[ ! -z "$GITHASH" ] && GITHASH="-DTOYBOX_VERSION=\"$GITHASH\"" TOYFILES="$(sed -n 's/^CONFIG_\([^=]*\)=.*/\1/p' "$KCONFIG_CONFIG" | xargs | tr ' [A-Z]' '|[a-z]')" TOYFILES="$(egrep -l "TOY[(]($TOYFILES)[ ,]" toys/*/*.c)" -BUILD="$(echo ${CROSS_COMPILE}${CC} $CFLAGS -I . $OPTIMIZE)" +BUILD="$(echo ${CROSS_COMPILE}${CC} $CFLAGS -I . $OPTIMIZE $GITHASH)" FILES="$(echo lib/*.c main.c $TOYFILES)" genbuildsh() |