Another fix for id broken logic.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a87aff71d24af5d19fde2932869a3678917ee7a..3ca07b0a5ddc497e1918c804843eeec2428bba60 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -969,24 +969,15 @@ FIND_PROGRAM(HG "hg")
 IF(HG)
     EXECUTE_PROCESS(COMMAND "${HG}" id OUTPUT_VARIABLE HG_ID ERROR_QUIET)   
     IF(HG_ID)
-        STRING(REGEX MATCH ^[0-9a-z]+ ID "${HG_ID}")
+        STRING(REGEX MATCH ^[0-9a-z]+ RSPAMD_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)
+                STRING(SUBSTRING "${_tmp}" 6 12 RSPAMD_ID)
                        ENDIF(HG_ID)
-        ELSE(HG_ARCH)
-               # Maybe this is git copy
-               FIND_PROGRAM(GIT "git")
-               IF(GIT)
-                       EXECUTE_PROCESS(COMMAND "${GIT}" --git-dir=${CMAKE_SOURCE_DIR}/.git branch -v OUTPUT_VARIABLE GIT_ID ERROR_QUIET)
-                       IF(GIT_ID)
-                               STRING(REGEX REPLACE "^. [0-9a-z]+ ([0-9a-f]+) .*" \\1 ID "${GIT_ID}")
-                               ENDIF(GIT_ID)
-               ENDIF(GIT)
        ENDIF(HG_ARCH)
     ENDIF(HG_ID)
 ELSE(HG)
@@ -996,7 +987,7 @@ ELSE(HG)
         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)
+            STRING(SUBSTRING "${_tmp}" 6 12 RSPAMD_ID)
         ENDIF(HG_ID)
     ENDIF(HG_ARCH)
 ENDIF(HG)

diff --git a/config.h.in b/config.h.in
index 9dbc84c9b63c623571e72dbd9ac998bc900e822a..b3b1b0f2e3cf21a43cde1029aa9b2733195c08f2 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -214,7 +214,7 @@
 #define CMAKE_PREFIX "${CMAKE_INSTALL_PREFIX}"
 
 #define RVERSION          "${RSPAMD_VERSION}"
-#define RID               "${ID}"
+#define RID               "${RSPAMD_ID}"
 #define RSPAMD_MASTER_SITE_URL "${RSPAMD_MASTER_SITE_URL}"
 
 #define MODULES_NUM        ${RSPAMD_MODULES_NUM}