ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-20 11:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with ClioVersion to prevent crash at runtime (#473)

Browse Source 
Fixes #474
This commit is contained in:
Alex Kremer
2023-01-16 16:42:57 +00:00
committed by GitHub
parent 047d64983c
commit 81bf9894e4
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMake/Build.cpp.in
View File

@@ -17,12 +17,7 @@
*/ */
//============================================================================== //==============================================================================
#include <ripple/beast/core/SemanticVersion.h>
#include <boost/preprocessor/stringize.hpp>
#include <algorithm>
#include <main/Build.h> #include <main/Build.h>
#include <optional>
#include <stdexcept>
namespace Build { namespace Build {
static constexpr char versionString[] = "@VERSION@"; static constexpr char versionString[] = "@VERSION@";
@@ -30,13 +25,7 @@ static constexpr char versionString[] = "@VERSION@";
std::string const& std::string const&
getClioVersionString() getClioVersionString()
{ {
static std::string const value = [] { static std::string const value = versionString;
std::string const s = versionString;
beast::SemanticVersion v;
if (!v.parse(s) || v.print() != s)
throw std::runtime_error(s + ": Bad server version string");
return s;
}();
return value; return value;
} }

21
CMake/ClioVersion.cmake
View File

@@ -4,18 +4,23 @@
find_package(Git REQUIRED) find_package(Git REQUIRED)
execute_process(COMMAND ${GIT_EXECUTABLE} branch --show-current OUTPUT_VARIABLE BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) set(GIT_COMMAND rev-parse --short HEAD)
execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE REV OUTPUT_STRIP_TRAILING_WHITESPACE)
set(GIT_COMMAND describe --tags) set(GIT_COMMAND branch --show-current)
execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) if(BRANCH STREQUAL "")
set(BRANCH "dev")
endif()
set(VERSION "${VERSION}") if(NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name YYYYMMDDHMS-<branch>-<git-ref>
if(NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name YYYYMMDDHMS-<git-ref>
set(GIT_COMMAND rev-parse --short HEAD)
execute_process(COMMAND date +%Y%m%d%H%M%S OUTPUT_VARIABLE DATE OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND date +%Y%m%d%H%M%S OUTPUT_VARIABLE DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
set(VERSION "${VERSION}-${DATE}") set(VERSION "${DATE}-${BRANCH}-${REV}")
else()
set(GIT_COMMAND describe --tags)
execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE TAG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
set(VERSION "${TAG_VERSION}-${REV}")
endif() endif()
if(CMAKE_BUILD_TYPE MATCHES Debug) if(CMAKE_BUILD_TYPE MATCHES Debug)