Buildsystem: Generating revision.h is now a part of build process (revision.h is back as target)

Buildsystem: Removed non-existing include directories

--HG--
branch : trunk

CMakeLists.txt

@@ -57,62 +57,6 @@ if( UNIX )
   find_package(BZip2)
 endif()
 
-# Find revision ID and hash of the sourcetree
-execute_process(
-  COMMAND hg id -n
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  OUTPUT_VARIABLE hg_rev_id_str
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-  ERROR_QUIET
-)
-execute_process(
-  COMMAND hg id -i
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  OUTPUT_VARIABLE hg_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
-    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})
-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)
-  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")
-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})
-endif()
-string(REPLACE "+" "" hg_rev_hash ${hg_rev_hash_str})
-
-# Create the actual revision.h file from the above params
-configure_file(
-  "${CMAKE_SOURCE_DIR}/revision.h.in.cmake"
-  "${CMAKE_BINARY_DIR}/revision.h"
-  @ONLY
-)
-message(STATUS "Created revision.h")
-
 # print out the results before continuing
 include(cmake/showoptions.cmake)
 

cmake/genrev.cmake

@@ -0,0 +1,65 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+execute_process(
+  COMMAND hg id -n
+  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+  OUTPUT_VARIABLE hg_rev_id_str
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+  ERROR_QUIET
+)
+
+execute_process(
+  COMMAND hg id -i
+  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+  OUTPUT_VARIABLE hg_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
+    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})
+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)
+  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")
+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})
+endif()
+string(REPLACE "+" "" hg_rev_hash ${hg_rev_hash_str})
+
+# Create the actual revision.h file from the above params
+configure_file(
+  "${CMAKE_SOURCE_DIR}/revision.h.in.cmake"
+  "${BUILDDIR}/revision.h"
+  @ONLY
+)
+message(STATUS "Created revision.h")

src/CMakeLists.txt

@@ -8,6 +8,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+add_subdirectory(revision.h)
 add_subdirectory(server)
 
 if(TOOLS)

src/revision.h/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage
+add_custom_target(revision.h ALL
+  COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/genrev.cmake
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+)

src/server/authserver/CMakeLists.txt

@@ -68,6 +68,8 @@ add_executable(authserver
   ${authserver_SRCS}
 )
 
+add_dependencies(authserver revision.h)
+
 if( NOT WIN32 )
   add_definitions(-D_TRINITY_REALM_CONFIG="${CONF_DIR}/authserver.conf")
 endif()

src/server/game/CMakeLists.txt

@@ -173,7 +173,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/Movement/MovementGenerators
   ${CMAKE_CURRENT_SOURCE_DIR}/Movement/Waypoints
   ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
-  ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP/Zones
   ${CMAKE_CURRENT_SOURCE_DIR}/Pools
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
   ${CMAKE_CURRENT_SOURCE_DIR}/Quests
@@ -198,6 +197,8 @@ include_directories(
 
 add_library(game STATIC ${game_STAT_SRCS})
 
+add_dependencies(game revision.h)
+
 # Generate precompiled header
 if( USE_COREPCH )
   if(CMAKE_COMPILER_IS_GNUCXX)

src/server/scripts/CMakeLists.txt

@@ -141,6 +141,8 @@ include_directories(
 
 add_library(scripts STATIC ${scripts_STAT_SRCS})
 
+add_dependencies(scripts revision.h)
+
 # Generate precompiled header
 if( USE_SCRIPTPCH )
   if(CMAKE_COMPILER_IS_GNUCXX)

src/server/worldserver/CMakeLists.txt

@@ -116,7 +116,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
   ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
   ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
-  ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP/Zones
   ${CMAKE_SOURCE_DIR}/src/server/game/Pools
   ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
   ${CMAKE_SOURCE_DIR}/src/server/game/Quests
@@ -149,6 +148,8 @@ if( NOT WIN32 )
   add_definitions(-D_TRINITY_CORE_CONFIG="${CONF_DIR}/worldserver.conf")
 endif()
 
+add_dependencies(worldserver revision.h)
+
 if( UNIX )
   set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}")
 endif()