From b519f76d545cfdb5e5b3a23d5d06b79be9bd065a Mon Sep 17 00:00:00 2001
From: Luca Giovenzana <luca@giovenzana.org>
Date: Thu, 21 May 2015 00:57:46 +0200
Subject: Update configure.ac: introduced git tag for version, incremental
 number of commits and release

1.5.2-43-gb3a292d-dirty
^     ^  ^        ^
|     |  |        |
|     |  |        if there are uncommitted changes
|     |  SHA of HEAD
|     number of commits since last tag
last tag
---
 configure.ac | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 7c80bdf06..eba84e705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,32 +10,31 @@ AC_PROG_CC
 AX_PTHREAD
 
 if test -d ".git"; then :
-GIT_TAG=`git rev-parse HEAD`
-GIT_DATE=`date +%Y%m%d`
-GIT_RELEASE="${PACKAGE_VERSION} (${GIT_TAG}:${GIT_DATE})"
+     GIT_TAG=`git log -1 --format=%H`
+     GIT_DATE=`git log -1 --format=%cd`
+     GIT_RELEASE=`git describe --tags --long --dirty --always`
 else
-GIT_RELEASE="${PACKAGE_VERSION}"
-SVN_DATE=`date`
+     GIT_RELEASE="${PACKAGE_VERSION}"
+     GIT_DATE=`date`
 fi
 
-AC_DEFINE_UNQUOTED(NDPI_GIT_RELEASE, "r${GIT_RELEASE}", [SVN Release])
-AC_DEFINE_UNQUOTED(NDPI_SVN_DATE, "${SVN_DATE}", [Last SVN change])
+AC_DEFINE_UNQUOTED(NDPI_GIT_RELEASE, "${GIT_RELEASE}", [GIT Release])
+AC_DEFINE_UNQUOTED(NDPI_GIT_DATE, "${GIT_DATE}", [Last GIT change])
 
 AC_CHECK_HEADERS([netinet/in.h stdint.h stdlib.h string.h unistd.h])
 
 PCAP_HOME=$HOME/PF_RING/userland
 
 if test -d $PCAP_HOME; then :
-   echo -n ""
+     echo -n ""
 else
-   PCAP_HOME=`pwd`/../../PF_RING/userland
+     PCAP_HOME=`pwd`/../../PF_RING/userland
 fi
-
 SHORT_MACHINE=`uname -m | cut -b1-3`
 if test $SHORT_MACHINE = "arm"; then
-LIBNUMA=""
+     LIBNUMA=""
 else
-LIBNUMA="-lnuma"
+     LIBNUMA="-lnuma"
 fi
 
 if test -f $PCAP_HOME/libpcap/libpcap.a; then :
@@ -57,11 +56,11 @@ else
 fi
 
 if test -d /usr/local/include/json-c/; then :
-   CFLAGS="$CFLAGS -I/usr/local/include/json-c/"
-   LDFLAGS="$LDFLAGS -L/usr/local/lib -ljson-c"
+     CFLAGS="$CFLAGS -I/usr/local/include/json-c/"
+     LDFLAGS="$LDFLAGS -L/usr/local/lib -ljson-c"
 else
-  CFLAGS="$CFLAGS $(pkg-config --cflags json-c)"
-  LDFLAGS="$LDFLAGS $(pkg-config --libs json-c)"
+     CFLAGS="$CFLAGS $(pkg-config --cflags json-c)"
+     LDFLAGS="$LDFLAGS $(pkg-config --libs json-c)"
 fi
 
 OLD_LIBS=$LIBS
-- 
cgit v1.2.3


From de03e1efe4903dbcda84a8a2491cc9e1eeef210b Mon Sep 17 00:00:00 2001
From: Luca Deri <deri@ntop.org>
Date: Thu, 21 May 2015 19:33:35 +0200
Subject: Modified GIT version format as shown ndpiReader -r

---
 configure.ac         | 6 ++++--
 example/ndpiReader.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index eba84e705..598c0a22b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,11 @@ AC_PROG_CC
 AX_PTHREAD
 
 if test -d ".git"; then :
-     GIT_TAG=`git log -1 --format=%H`
+     GIT_TAG=`git log -1 --format=%h`
      GIT_DATE=`git log -1 --format=%cd`
-     GIT_RELEASE=`git describe --tags --long --dirty --always`
+     GIT_NUM=`git rev-list HEAD --count`
+     GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+     GIT_RELEASE="${PACKAGE_VERSION}-${GIT_BRANCH}-${GIT_NUM}-${GIT_TAG}"
 else
      GIT_RELEASE="${PACKAGE_VERSION}"
      GIT_DATE=`date`
diff --git a/example/ndpiReader.c b/example/ndpiReader.c
index 50ace72b1..558d204ed 100644
--- a/example/ndpiReader.c
+++ b/example/ndpiReader.c
@@ -273,7 +273,7 @@ static void parseOptions(int argc, char **argv) {
       break;
 
     case 'r':
-      printf("ndpiReader, nDPI (%s)\n\n", ndpi_revision());
+      printf("ndpiReader - nDPI (%s)\n", ndpi_revision());
       exit(0);
 
     case 'v':
-- 
cgit v1.2.3