BuildSystem: Clean up the revision.h generation a tad bit

--HG--
branch : trunk

3 files changed, 24 insertions, 25 deletions

diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake
index 29d95b4f8ff..7cd18bd48fd 100644
--- a/cmake/genrev.cmake
+++ b/cmake/genrev.cmake
@@ -11,7 +11,7 @@
 execute_process(
   COMMAND hg id -n
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  OUTPUT_VARIABLE hg_rev_id_str
+  OUTPUT_VARIABLE rev_id_str
   OUTPUT_STRIP_TRAILING_WHITESPACE
   ERROR_QUIET
 )
@@ -19,42 +19,42 @@ execute_process(
 execute_process(
   COMMAND hg id -i
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  OUTPUT_VARIABLE hg_rev_hash_str
+  OUTPUT_VARIABLE rev_hash_str
   OUTPUT_STRIP_TRAILING_WHITESPACE
   ERROR_QUIET
 )
 
 if(EXISTS ${CMAKE_SOURCE_DIR}/.hg_archival.txt)
   file(READ
-    ${CMAKE_SOURCE_DIR}/.hg_archival.txt hg_rev_hash_str
+    ${CMAKE_SOURCE_DIR}/.hg_archival.txt rev_hash_str
     LIMIT 10
     OFFSET 7
     NEWLINE_CONSUME
   )
-  string(STRIP ${hg_rev_hash_str} hg_rev_hash_str)
-  set(hg_rev_id_str "Archive")
-  set(hg_rev_id "0")
-  set(hg_rev_hash ${hg_rev_hash_str})
+  string(STRIP ${rev_hash_str} rev_hash_str)
+  set(rev_id_str "Archive")
+  set(rev_id "0")
+  set(rev_hash ${rev_hash_str})
 endif()
 
 # Last minute check - ensure that we have a proper revision
 # If everything above fails (means the user has erased the mercurial revisional control directory, or runs archive and erased their .hg_archival.txt)
-if(NOT hg_rev_id_str)
+if(NOT rev_id_str)
   message("")
   message(STATUS "WARNING - No revision-information found - have you been tampering with the sources?")
 
   # Ok, since we have no valid ways of finding/setting the revision, let's force some defaults
-  set(hg_rev_hash_str "Archive")
-  set(hg_rev_hash "0")
-  set(hg_rev_id_str "0")
-  set(hg_rev_id "0")
+  set(rev_hash_str "Archive")
+  set(rev_hash "0")
+  set(rev_id_str "0")
+  set(rev_id "0")
 endif()
 
 # Strip off excess strings (shows when the source is actually modified)
-if(NOT hg_rev_id_str MATCHES "Archive")
-  string(REPLACE "+" "" hg_rev_id ${hg_rev_id_str})
+if(NOT rev_id_str MATCHES "Archive")
+  string(REPLACE "+" "" rev_id ${rev_id_str})
 endif()
-string(REPLACE "+" "" hg_rev_hash ${hg_rev_hash_str})
+string(REPLACE "+" "" rev_hash ${rev_hash_str})
 
 # Its not set during initial run
 if(NOT BUILDDIR)
@@ -62,12 +62,11 @@ if(NOT BUILDDIR)
 endif()
 
 # Create the actual revision.h file from the above params
-
-if(NOT hg_rev_id MATCHES "${hg_rev_id_cached}")
+if(NOT ("${rev_id_cached}" MATCHES "${rev_id_str}"))
   configure_file(
     "${CMAKE_SOURCE_DIR}/revision.h.in.cmake"
     "${BUILDDIR}/revision.h"
     @ONLY
   )
-  set(hg_rev_id_cached ${hg_rev_id} CACHE TYPE STRING)
+  set(rev_id_cached "${rev_id_str}" CACHE TYPE INTERNAL)
 endif()
diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake
index e653f05b8a7..2883eda5dbc 100644
--- a/cmake/showoptions.cmake
+++ b/cmake/showoptions.cmake
@@ -1,7 +1,7 @@
 # output generic information about the core and buildtype chosen
 
 message("")
-message("* TrinityCore revision   : ${hg_rev_id_str} (${hg_rev_hash_str})")
+message("* TrinityCore revision   : ${rev_id_str} (${rev_hash_str})")
 if( UNIX )
   message("* Build binaries in      : ${CMAKE_BUILD_TYPE} mode")
 endif()
diff --git a/revision.h.in.cmake b/revision.h.in.cmake
index 850b40fb292..181a34a57f3 100644
--- a/revision.h.in.cmake
+++ b/revision.h.in.cmake
@@ -1,9 +1,9 @@
 #ifndef __REVISION_H__
 #define __REVISION_H__
- #define _REVISION      "@hg_rev_id_str@"
- #define _HASH          "@hg_rev_hash_str@"
- #define FILEVER        0,0,@hg_rev_id@,0
- #define PRODUCTVER     0,0,@hg_rev_id@,0
- #define STRFILEVER     "0, 0, @hg_rev_id@, @hg_rev_hash@"
- #define STRPRODUCTVER  "0, 0, @hg_rev_id@, @hg_rev_hash@"
+ #define _REVISION      "@rev_id_str@"
+ #define _HASH          "@rev_hash_str@"
+ #define FILEVER        0,0,@rev_id@,0
+ #define PRODUCTVER     0,0,@rev_id@,0
+ #define STRFILEVER     "0, 0, @rev_id@, @rev_hash@"
+ #define STRPRODUCTVER  "0, 0, @rev_id@, @rev_hash@"
 #endif // __REVISION_H__