From 90afbad4c1f115d5363fe99eb797d2458cd298a0 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 17 Apr 2015 02:46:11 -0500 Subject: Make toybox --version use the "git describe" info if it's available. --- main.c | 2 ++ scripts/make.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/main.c b/main.c index a800deea..57022442 100644 --- a/main.c +++ b/main.c @@ -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() -- cgit v1.2.3