diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-12-27 11:15:36 +0100 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-12-27 11:15:36 +0100 |
| commit | 9a741a66a4982cf324834dc2f1e5cff6e6038ade (patch) | |
| tree | b7a9ff16dad7d68f234d95ddb0816ec77b4a66f4 | |
| parent | 8b5b2eeaa152129dd23a9c127bd59ec260956c42 (diff) | |
| download | colobot-9a741a66a4982cf324834dc2f1e5cff6e6038ade.tar.gz colobot-9a741a66a4982cf324834dc2f1e5cff6e6038ade.tar.bz2 colobot-9a741a66a4982cf324834dc2f1e5cff6e6038ade.zip | |
Changed version display in bottom-right corner to be actually version number instead of date
| -rw-r--r-- | CMakeLists.txt | 25 | ||||
| -rw-r--r-- | src/common/config.h.cmake | 1 | ||||
| -rw-r--r-- | src/ui/maindialog.cpp | 3 |
3 files changed, 19 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 482186f..c4405d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,15 +21,22 @@ set(COLOBOT_VERSION_REVISION 2) set(COLOBOT_VERSION_UNRELEASED "+alpha") # Append git characteristics to version -if(DEFINED COLOBOT_VERSION_UNRELEASED AND EXISTS "${CMAKE_SOURCE_DIR}/.git") - find_package(Git) - execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD - OUTPUT_VARIABLE GIT_BRANCH - OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD - OUTPUT_VARIABLE GIT_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE) - set(COLOBOT_VERSION_UNRELEASED "${COLOBOT_VERSION_UNRELEASED}-git-${GIT_BRANCH}~r${GIT_REVISION}") +if(DEFINED COLOBOT_VERSION_UNRELEASED) + if(EXISTS "${CMAKE_SOURCE_DIR}/.git") + find_package(Git) + execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD + OUTPUT_VARIABLE GIT_BRANCH + OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD + OUTPUT_VARIABLE GIT_REVISION + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(COLOBOT_VERSION_UNRELEASED "${COLOBOT_VERSION_UNRELEASED}-git-${GIT_BRANCH}~r${GIT_REVISION}") + set(COLOBOT_VERSION_DISPLAY "git-${GIT_BRANCH}~r${GIT_REVISION}") + else() + set(COLOBOT_VERSION_DISPLAY "${COLOBOT_VERSION_CODENAME}-${COLOBOT_VERSION_UNRELEASED}") + endif() +else() + set(COLOBOT_VERSION_DISPLAY "${COLOBOT_VERSION_MAJOR}.${COLOBOT_VERSION_MINOR}.${COLOBOT_VERSION_REVISION}${COLOBOT_VERSION_RELEASE_CODENAME}") endif() set(COLOBOT_VERSION_FULL "${COLOBOT_VERSION_MAJOR}.${COLOBOT_VERSION_MINOR}.${COLOBOT_VERSION_REVISION}${COLOBOT_VERSION_UNRELEASED}${COLOBOT_VERSION_RELEASE_CODENAME}") diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake index 6408b6e..98ccefe 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -27,6 +27,7 @@ #define COLOBOT_VERSION "@COLOBOT_VERSION_FULL@" #define COLOBOT_CODENAME "@COLOBOT_VERSION_CODENAME@" #define COLOBOT_FULLNAME "Colobot @COLOBOT_VERSION_CODENAME@" +#define COLOBOT_VERSION_DISPLAY "@COLOBOT_VERSION_DISPLAY@" #define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@" #define COLOBOT_I18N_DIR "@COLOBOT_INSTALL_I18N_DIR@" diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 7540f3d..f9ca09c 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -20,6 +20,7 @@ #include "app/app.h" #include "app/system.h" +#include "common/config.h" #include "common/global.h" #include "common/event.h" #include "common/logger.h" @@ -1976,7 +1977,7 @@ ddim.y = 9.0f/480.0f; ddim.y = 10.0f/480.0f; //#endif //GetResource(RES_TEXT, RT_VERSION_ID, name); - pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, __DATE__); + pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, COLOBOT_VERSION_DISPLAY); pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontSize(9.0f); } |