From b0f043ec863cfe48332afc5edffc37a949e4ae5c Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Fri, 22 Oct 2021 05:28:59 +0300
Subject: [PATCH] [make] USE_GIT_VERSION option to use commit info in version
 (closes #1702)

Signed-off-by: R4SAS <r4sas@i2pmail.org>
---
 Makefile          | 21 ++++++++++++++++-----
 daemon/Daemon.cpp |  2 +-
 libi2pd/version.h |  7 ++++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 59b1df1a..f1258874 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,17 @@ DAEMON_SRC_DIR := daemon
 # import source files lists
 include filelist.mk
 
-USE_AESNI	:= $(or $(USE_AESNI),yes)
-USE_STATIC	:= $(or $(USE_STATIC),no)
-USE_MESHNET	:= $(or $(USE_MESHNET),no)
-USE_UPNP	:= $(or $(USE_UPNP),no)
-DEBUG		:= $(or $(DEBUG),yes)
+USE_AESNI       := $(or $(USE_AESNI),yes)
+USE_STATIC      := $(or $(USE_STATIC),no)
+USE_MESHNET     := $(or $(USE_MESHNET),no)
+USE_UPNP        := $(or $(USE_UPNP),no)
+DEBUG           := $(or $(DEBUG),yes)
+
+# for debugging purposes only, when commit hash needed in trunk builds in i2pd version string
+USE_GIT_VERSION := $(or $(USE_GIT_VERSION),no)
+
+# for MacOS only, waiting for "1", not "yes"
+HOMEBREW        := $(or $(HOMEBREW),0)
 
 ifeq ($(DEBUG),yes)
 	CXX_DEBUG = -g
@@ -66,6 +72,11 @@ ifeq ($(USE_MESHNET),yes)
 	NEEDED_CXXFLAGS += -DMESHNET
 endif
 
+ifeq ($(USE_GIT_VERSION),yes)
+	GIT_VERSION := $(shell git describe --tags)
+	NEEDED_CXXFLAGS += -DGITVER=\"$(GIT_VERSION)\"
+endif
+
 NEEDED_CXXFLAGS += -MMD -MP -I$(LIB_SRC_DIR) -I$(LIB_CLIENT_SRC_DIR) -I$(LANG_SRC_DIR)
 
 LIB_OBJS        += $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
diff --git a/daemon/Daemon.cpp b/daemon/Daemon.cpp
index 445c4dfd..8cee7852 100644
--- a/daemon/Daemon.cpp
+++ b/daemon/Daemon.cpp
@@ -134,7 +134,7 @@ namespace util
 			// use stdout -- default
 		}
 
-		LogPrint(eLogNone,  "i2pd v", VERSION, " starting");
+		LogPrint(eLogNone,  "i2pd v", VERSION, " (", I2P_VERSION, ") starting");
 		LogPrint(eLogDebug, "FS: main config file: ", config);
 		LogPrint(eLogDebug, "FS: data directory: ", datadir);
 		LogPrint(eLogDebug, "FS: certificates directory: ", certsdir);
diff --git a/libi2pd/version.h b/libi2pd/version.h
index 97351c40..5aba36bd 100644
--- a/libi2pd/version.h
+++ b/libi2pd/version.h
@@ -19,7 +19,12 @@
 #define I2PD_VERSION_MINOR 39
 #define I2PD_VERSION_MICRO 0
 #define I2PD_VERSION_PATCH 0
-#define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
+#ifdef GITVER
+	#define I2PD_VERSION GITVER
+#else
+	#define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
+#endif
+
 #define VERSION I2PD_VERSION
 
 #ifdef MESHNET