Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-10-14 23:47:59 +02:00
parent 88f196f1a9
commit 92a379da7f
3 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cmake/genrev.cmake
View File

@@ -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()

2
cmake/showoptions.cmake
View File

@@ -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()

12
revision.h.in.cmake
View File

@@ -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__