From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 5 Mar 2015 11:35:42 +0000 (+0000)
Subject: Restore build id parsing.
X-Git-Tag: 0.9.0~561
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=17ffcdc70c6424f3ab3fa8c8d9670ce2619c1ae7;p=rspamd.git

Restore build id parsing.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c26cfbf8..5bce194f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -887,12 +887,15 @@ ENDIF(NOT DESTDIR)
 
 # Try to detect tip version from hg
 SET(ID "unknown")
-FIND_PROGRAM(HG "hg")
+FIND_PROGRAM(HG "git")
 
 IF(HG)
-    EXECUTE_PROCESS(COMMAND "${HG}" id OUTPUT_VARIABLE HG_ID ERROR_QUIET)   
+    EXECUTE_PROCESS(COMMAND "${HG}" rev-parse --verify HEAD 
+    	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    	OUTPUT_VARIABLE HG_ID ERROR_QUIET)
     IF(HG_ID)
-        STRING(REGEX MATCH ^[0-9a-z]+ RSPAMD_ID "${HG_ID}")
+        STRING(SUBSTRING "${HG_ID}" 0 10 RSPAMD_ID)
+        MESSAGE(STATUS "Git revision: ${RSPAMD_ID}")
     ELSE(HG_ID)
         FIND_FILE(HG_ARCH ".hg_archival.txt" "${CMAKE_CURRENT_SOURCE_DIR}")   
         IF(HG_ARCH)