diff --git a/genver.sh b/genver.sh index e9038a1..9200e3f 100755 --- a/genver.sh +++ b/genver.sh @@ -2,16 +2,20 @@ # Script to generate version information file +# Current git hash +HASH="$(git describe --always --dirty)" + # Current git tag TAG="$(git describe --always --dirty --tags)" # Output filename OUTFILE='src/version.c' -sed -e "s//$TAG/g" < "$OUTFILE" +sed -e "s//$HASH/g" -e "s//$TAG/g" < "$OUTFILE" /* Build version information. This file generated by genver.sh */ const char GIT_HASH[] = ""; +const char GIT_TAG[] = ""; const char CC_VERSION[] = __VERSION__; const char BUILD_DATE[] = __DATE__; EOF diff --git a/src/home.c b/src/home.c index ad4d8d7..2f08e83 100644 --- a/src/home.c +++ b/src/home.c @@ -2,6 +2,7 @@ #include #include "screens.h" +#include "version.h" void draw_home(struct Screen *screen, char *input) { static char* banner = "" @@ -17,4 +18,8 @@ void draw_home(struct Screen *screen, char *input) { mvwprintw(screen->win, 1, 2, "Thank you for visiting:"); mvwprintw(screen->win, 2, 1, "%s", banner); mvwprintw(screen->win, 10, 1, "Your current input is: %s", input); + mvwprintw(screen->win, 11, 1, "Git hash: %s", GIT_HASH); + mvwprintw(screen->win, 12, 1, "Git tag: %s", GIT_TAG); + mvwprintw(screen->win, 13, 1, "CC version: %s", CC_VERSION); + mvwprintw(screen->win, 14, 1, "Build date: %s", BUILD_DATE); } diff --git a/src/version.h b/src/version.h index fcb477c..876f30f 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,6 @@ /* Header for version information constants */ extern const char GIT_HASH[]; +extern const char GIT_TAG[]; extern const char CC_VERSION[]; extern const char BUILD_DATE[];