From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Wed, 2 Feb 2011 13:31:06 +0000 (+0300)
Subject: Small fix for build id detection.
X-Git-Tag: 0.3.7~65
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d91bd23d16f2aff5150e6fc25229f20325bc9878;p=rspamd.git

Small fix for build id detection.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1437166a8..d6c3ac576 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -518,9 +518,18 @@ SET(ID "unknown")
 FIND_PROGRAM(HG "hg")
 
 IF(HG)
-    EXECUTE_PROCESS(COMMAND ${HG} "id" OUTPUT_VARIABLE HG_ID)   
+    EXECUTE_PROCESS(COMMAND "${HG} id > /dev/null" OUTPUT_VARIABLE HG_ID)   
     IF(HG_ID)
         STRING(REGEX MATCH ^[0-9a-z]+ ID "${HG_ID}")
+    ELSE(HG_ID)
+        FIND_FILE(HG_ARCH ".hg_archival.txt" "${CMAKE_CURRENT_SOURCE_DIR}")   
+        IF(HG_ARCH)
+            FILE(READ ${HG_ARCH} HG_ID)
+            IF(HG_ID)
+                STRING(REGEX MATCH "node: [0-9a-z]+" _tmp "${HG_ID}")
+                STRING(SUBSTRING "${_tmp}" 6 12 ID)
+            ENDIF(HG_ID)
+        ENDIF(HG_ARCH)
     ENDIF(HG_ID)
 ELSE(HG)
 # Now check .hg_archival.txt