diff options
| author | Luca Deri <deri@Lucas-iMac.local> | 2015-04-19 22:33:49 +0200 |
|---|---|---|
| committer | Luca Deri <deri@Lucas-iMac.local> | 2015-04-19 22:33:49 +0200 |
| commit | e66b440d359ff3c59bbfdb0a641b748d2c064d9f (patch) | |
| tree | c5b5190639f1982407ad982b66ed4cb5618b604c | |
| parent | 62f665ea7f42b00728f6ea11eefe7a92469d9dee (diff) | |
Changed version id since we moved to git
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index b5079143f..952c365de 100644 --- a/configure.ac +++ b/configure.ac @@ -9,15 +9,16 @@ LT_INIT AC_PROG_CC AX_PTHREAD -if test -d ".svn"; then : -SVN_RELEASE=`svn info . | grep "^Revision"|cut -d " " -f 2` -SVN_DATE=`svn info . | grep "^Last Changed Date"|cut -d " " -f 4-` +if test -d ".git"; then : +GIT_TAG=`git rev-parse HEAD | cut -c 1-10` +GIT_DATE=`date +%Y%m%d` +GIT_RELEASE="${PACKAGE_VERSION} (${GIT_TAG}:${GIT_DATE})" else -SVN_RELEASE="${PACKAGE_VERSION}" +GIT_RELEASE="${PACKAGE_VERSION}" SVN_DATE=`date` fi -AC_DEFINE_UNQUOTED(NDPI_SVN_RELEASE, "r${SVN_RELEASE}", [SVN Release]) +AC_DEFINE_UNQUOTED(NDPI_GIT_RELEASE, "r${GIT_RELEASE}", [SVN Release]) AC_DEFINE_UNQUOTED(NDPI_SVN_DATE, "${SVN_DATE}", [Last SVN change]) AC_CHECK_HEADERS([netinet/in.h stdint.h stdlib.h string.h unistd.h]) @@ -75,7 +76,7 @@ AC_CHECK_LIB(json-c, json_object_new_object, AC_DEFINE_UNQUOTED(HAVE_JSON_C, 1, AC_CONFIG_FILES([Makefile src/lib/Makefile example/Makefile libndpi.pc]) AC_CONFIG_HEADERS(config.h) -AC_SUBST(SVN_RELEASE) +AC_SUBST(GIT_RELEASE) AC_SUBST(SVN_DATE) AC_SUBST(JSON_C_LIB) AC_SUBST(PCAP_INC) diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 22892c474..d9d59e9bc 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -5584,7 +5584,7 @@ void ndpi_free_flow(struct ndpi_flow_struct *flow) { #ifndef __KERNEL__ char* ndpi_revision() { - return(NDPI_SVN_RELEASE); + return(NDPI_GIT_RELEASE); } #endif |