Added abilty to set build info
build info is displayed at startup Fixes #1410
This commit is contained in:
parent
76d5aa1d51
commit
27be179939
1
.gitignore
vendored
1
.gitignore
vendored
@ -56,6 +56,7 @@ Makefile
|
|||||||
*.a
|
*.a
|
||||||
*.d
|
*.d
|
||||||
*.so
|
*.so
|
||||||
|
BuildInfo.h
|
||||||
CMakeCache.txt
|
CMakeCache.txt
|
||||||
CMakeFiles
|
CMakeFiles
|
||||||
Makefile
|
Makefile
|
||||||
|
@ -18,6 +18,25 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE})
|
|||||||
set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE})
|
set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(DEFINED ENV{BUILD_ID})
|
||||||
|
set(BUILD_ID $ENV{BUILD_ID})
|
||||||
|
set(BUILD_SERIES_NAME $ENV{BUILD_SERIES_NAME})
|
||||||
|
set(BUILD_DATETIME $ENV{BUILD_DATETIME})
|
||||||
|
if(DEFINED ENV{BUILD_COMMIT_ID})
|
||||||
|
set(BUILD_COMMIT_ID $ENV{BUILD_COMMIT_ID})
|
||||||
|
else()
|
||||||
|
message("Commit id not set, attempting to determine id from git")
|
||||||
|
execute_process(
|
||||||
|
COMMAND git rev-parse HEAD
|
||||||
|
RESULT_VARIABLE GIT_EXECUTED
|
||||||
|
OUTPUT_VARIABLE BUILD_COMMIT_ID)
|
||||||
|
string(STRIP ${BUILD_COMMIT_ID} BUILD_COMMIT_ID)
|
||||||
|
if (NOT (GIT_EXECUTED EQUAL 0))
|
||||||
|
message(FATAL_ERROR "Could not identifiy git commit id")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
# This has to be done before any flags have been set up.
|
# This has to be done before any flags have been set up.
|
||||||
if(${BUILD_TOOLS})
|
if(${BUILD_TOOLS})
|
||||||
add_subdirectory(Tools/MCADefrag/)
|
add_subdirectory(Tools/MCADefrag/)
|
||||||
|
15
src/BuildInfo.h.cmake
Normal file
15
src/BuildInfo.h.cmake
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#cmakedefine BUILD_ID
|
||||||
|
|
||||||
|
#ifdef BUILD_ID
|
||||||
|
|
||||||
|
#undef BUILD_ID
|
||||||
|
|
||||||
|
#define BUILD_SERIES_NAME "@BUILD_SERIES_NAME@"
|
||||||
|
#define BUILD_ID "@BUILD_ID@"
|
||||||
|
#define BUILD_COMMIT_ID "@BUILD_COMMIT_ID@"
|
||||||
|
#define BUILD_DATETIME "@BUILD_DATETIME@"
|
||||||
|
#endif
|
||||||
|
|
@ -75,6 +75,7 @@ SET (HDRS
|
|||||||
BlockInfo.h
|
BlockInfo.h
|
||||||
BlockTracer.h
|
BlockTracer.h
|
||||||
BoundingBox.h
|
BoundingBox.h
|
||||||
|
BuildInfo.h.cmake
|
||||||
ByteBuffer.h
|
ByteBuffer.h
|
||||||
ChatColor.h
|
ChatColor.h
|
||||||
Chunk.h
|
Chunk.h
|
||||||
@ -140,6 +141,8 @@ include_directories(".")
|
|||||||
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/sqlite")
|
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/sqlite")
|
||||||
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/SQLiteCpp/include")
|
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/SQLiteCpp/include")
|
||||||
|
|
||||||
|
configure_file("BuildInfo.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/BuildInfo.h")
|
||||||
|
|
||||||
if (NOT MSVC)
|
if (NOT MSVC)
|
||||||
# Bindings need to reference other folders, so they are done here instead
|
# Bindings need to reference other folders, so they are done here instead
|
||||||
# lib dependencies are not included
|
# lib dependencies are not included
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
#include "DeadlockDetect.h"
|
#include "DeadlockDetect.h"
|
||||||
#include "OSSupport/Timer.h"
|
#include "OSSupport/Timer.h"
|
||||||
#include "LoggerListeners.h"
|
#include "LoggerListeners.h"
|
||||||
|
#include "BuildInfo.h"
|
||||||
|
|
||||||
#include "inifile/iniFile.h"
|
#include "inifile/iniFile.h"
|
||||||
|
|
||||||
@ -111,6 +112,11 @@ void cRoot::Start(void)
|
|||||||
|
|
||||||
LOG("--- Started Log ---\n");
|
LOG("--- Started Log ---\n");
|
||||||
|
|
||||||
|
#ifdef BUILD_ID
|
||||||
|
LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID );
|
||||||
|
LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME );
|
||||||
|
#endif
|
||||||
|
|
||||||
cDeadlockDetect dd;
|
cDeadlockDetect dd;
|
||||||
|
|
||||||
m_bStop = false;
|
m_bStop = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user