Rework /version, don't show preview and ignored releases

Author: kimden

.gitignore

@@ -93,3 +93,6 @@ lib/astc-encoder
 lib/shaderc
 
 .DS_Store
+
+# Auto-generated files
+src/utils/version.hpp

CMakeLists.txt

@@ -9,12 +9,22 @@ execute_process(
 
 # Get the latest abbreviated commit hash of the working branch
 execute_process(
-  COMMAND git --no-pager describe --tags --always --dirty
+  COMMAND git --no-pager describe --tags --always --exclude "preview" --exclude "ign-*" --dirty
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE GIT_COMMIT_HASH
+  OUTPUT_VARIABLE GIT_VERSION
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+message(STATUS "Configuring file from: ${CMAKE_SOURCE_DIR}/src/utils/version.hpp.in")
+message(STATUS "Output file: ${CMAKE_SOURCE_DIR}/src/utils/version.hpp")
+
+configure_file(
+  ${CMAKE_SOURCE_DIR}/src/utils/version.hpp.in
+  ${CMAKE_SOURCE_DIR}/src/utils/version.hpp
+  @ONLY)
+
+include_directories(${CMAKE_BINARY_DIR}/generated)
+
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
 set(PROJECT_VERSION "git")
@@ -655,9 +665,6 @@ else()
     endif()
 endif()
 
-target_compile_definitions(supertuxkart PRIVATE "-DGIT_BRANCH=\"${GIT_BRANCH}\"")
-target_compile_definitions(supertuxkart PRIVATE "-DGIT_VERSION=\"${GIT_COMMIT_HASH}\"")
-
 # check if linking against libatomic is required
 include(CheckCXXSourceCompiles)
 check_cxx_source_compiles("

src/network/protocols/command_manager.cpp

@@ -50,6 +50,7 @@
 #include "utils/string_utils.hpp"
 #include "utils/team_manager.hpp"
 #include "utils/tournament.hpp"
+#include "utils/version.hpp"
 
 #include <algorithm>
 #include <fstream>
@@ -623,13 +624,12 @@ void CommandManager::initCommands()
 
     addTextResponse("description", getSettings()->getMotd());
     addTextResponse("moreinfo", getSettings()->getHelpMessage());
-    std::string version = "1.3 k 210fff beta";
-#ifdef GIT_VERSION
-    version = std::string(GIT_VERSION);
-    #ifdef GIT_BRANCH
-        version += ", branch " + std::string(GIT_BRANCH);
-    #endif
-#endif
+
+    std::string version = Version::version();
+    std::string branch = Version::branch();
+    if (!branch.empty())
+        version += ", branch " + branch;
+
     addTextResponse("version", version);
     addTextResponse("clear", std::string(30, '\n'));