Using version script to get the revision

ntop · Dec 7, 2018 · 469937d · 469937d
1 parent 21244de
commit 469937d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/kernel/configure b/kernel/configure
@@ -1679,11 +1679,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-GIT_COMMIT_COUNT=`git rev-list --all |wc -l`
-GIT_BRANCH=`git branch --no-color|cut -d ' ' -f 2`
-GIT_HASH=`git log --pretty=format:"%H (%ad)"|head -1`
-VERS=`cat ./linux/pf_ring.h | grep RING_VERSION | head -1 | cut -d '"' -f 2`
-GIT_RELEASE=`git rev-list --all | wc -l`
+GIT_COMMIT_COUNT=`../package/version.sh --revision`
+GIT_BRANCH=`git branch | grep \* | cut -d ' ' -f2`
+GIT_HASH=`../package/version.sh --hash`
+VERS=`../package/version.sh --release`
+GIT_RELEASE=`../package/version.sh --revision`
 
 
 

diff --git a/kernel/configure.in b/kernel/configure.in
@@ -1,10 +1,10 @@
 AC_INIT([Makefile.in], 1.0)
 
-GIT_COMMIT_COUNT=`git rev-list --all |wc -l`
-GIT_BRANCH=`git branch --no-color|cut -d ' ' -f 2`
-GIT_HASH=`git log --pretty=format:"%H (%ad)"|head -1`
-VERS=`cat ./linux/pf_ring.h | grep RING_VERSION | head -1 | cut -d '"' -f 2`
-GIT_RELEASE=`git rev-list --all | wc -l`
+GIT_COMMIT_COUNT=`../package/version.sh --revision`
+GIT_BRANCH=`git branch | grep \* | cut -d ' ' -f2`
+GIT_HASH=`../package/version.sh --hash`
+VERS=`../package/version.sh --release`
+GIT_RELEASE=`../package/version.sh --revision`
 
 AC_SUBST(VERS)
 AC_SUBST(GIT_COMMIT_COUNT)