configure: Add date with rev information

Date makes it even clearer that when was the last commit for the build
that one is running. Add this info alongwith rev. Change inspired by
rustc.

Before
```
$ suricata -V
This is Suricata version 5.0.0-dev (rev 2d217e666)
```

After
```
This is Suricata version 5.0.0-dev (2d217e666 2019-07-12)
```

Closes redmine ticket #3092
pull/4062/head
Shivani Bhardwaj 6 years ago committed by Victor Julien
parent 3d5eccf084
commit 8c2c78f0b6

@ -2468,6 +2468,8 @@ fi
if test "$HAVE_GIT_CMD" != "no"; then if test "$HAVE_GIT_CMD" != "no"; then
if [ test -d .git ]; then if [ test -d .git ]; then
REVISION=`git rev-parse --short HEAD` REVISION=`git rev-parse --short HEAD`
DATE=`git log -1 --date=short --pretty=format:%cd`
REVISION="$REVISION $DATE"
AC_DEFINE_UNQUOTED([REVISION],[${REVISION}],[Git revision]) AC_DEFINE_UNQUOTED([REVISION],[${REVISION}],[Git revision])
fi fi
fi fi

@ -581,7 +581,7 @@ static void SetBpfStringFromFile(char *filename)
static void PrintUsage(const char *progname) static void PrintUsage(const char *progname)
{ {
#ifdef REVISION #ifdef REVISION
printf("%s %s (rev %s)\n", PROG_NAME, PROG_VER, xstr(REVISION)); printf("%s %s (%s)\n", PROG_NAME, PROG_VER, xstr(REVISION));
#else #else
printf("%s %s\n", PROG_NAME, PROG_VER); printf("%s %s\n", PROG_NAME, PROG_VER);
#endif #endif
@ -684,7 +684,7 @@ static void PrintBuildInfo(void)
const char *tls = "pthread key"; const char *tls = "pthread key";
#ifdef REVISION #ifdef REVISION
printf("This is %s version %s (rev %s)\n", PROG_NAME, PROG_VER, xstr(REVISION)); printf("This is %s version %s (%s)\n", PROG_NAME, PROG_VER, xstr(REVISION));
#elif defined RELEASE #elif defined RELEASE
printf("This is %s version %s RELEASE\n", PROG_NAME, PROG_VER); printf("This is %s version %s RELEASE\n", PROG_NAME, PROG_VER);
#else #else
@ -1054,7 +1054,7 @@ static void SCInstanceInit(SCInstance *suri, const char *progname)
static TmEcode PrintVersion(void) static TmEcode PrintVersion(void)
{ {
#ifdef REVISION #ifdef REVISION
printf("This is %s version %s (rev %s)\n", PROG_NAME, PROG_VER, xstr(REVISION)); printf("This is %s version %s (%s)\n", PROG_NAME, PROG_VER, xstr(REVISION));
#elif defined RELEASE #elif defined RELEASE
printf("This is %s version %s RELEASE\n", PROG_NAME, PROG_VER); printf("This is %s version %s RELEASE\n", PROG_NAME, PROG_VER);
#else #else
@ -1067,7 +1067,7 @@ static TmEcode LogVersion(SCInstance *suri)
{ {
const char *mode = suri->system ? "SYSTEM" : "USER"; const char *mode = suri->system ? "SYSTEM" : "USER";
#ifdef REVISION #ifdef REVISION
SCLogNotice("This is %s version %s (rev %s) running in %s mode", SCLogNotice("This is %s version %s (%s) running in %s mode",
PROG_NAME, PROG_VER, xstr(REVISION), mode); PROG_NAME, PROG_VER, xstr(REVISION), mode);
#elif defined RELEASE #elif defined RELEASE
SCLogNotice("This is %s version %s RELEASE running in %s mode", SCLogNotice("This is %s version %s RELEASE running in %s mode",

Loading…
Cancel
Save