mirror of https://github.com/oxen-io/lokinet
macro removals
clean up version cmake stuff clean up generated cpp version stuff make all the windows rc stuff get generated by cmake bump release motto message properly inject release motto into versionpull/1923/head
parent
1eba0f836e
commit
f05c2ebc71
@ -1,27 +1,16 @@
|
||||
#include <constants/version.hpp>
|
||||
#include <constants/version.h>
|
||||
#include <constants/proto.hpp>
|
||||
|
||||
// clang-format off
|
||||
#define LLARP_STRINGIFY2(val) #val
|
||||
#define LLARP_STRINGIFY(val) LLARP_STRINGIFY2(val)
|
||||
|
||||
#define LLARP_VERSION_STR \
|
||||
LLARP_STRINGIFY(LLARP_VERSION_MAJOR) \
|
||||
"." LLARP_STRINGIFY(LLARP_VERSION_MINOR) "." LLARP_STRINGIFY( \
|
||||
LLARP_VERSION_PATCH)
|
||||
#define LLARP_VERSION_FULL LLARP_VERSION_STR "-@VERSIONTAG@"
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
// clang-format off
|
||||
const std::array<uint16_t, 3> VERSION{{LLARP_VERSION_MAJOR, LLARP_VERSION_MINOR, LLARP_VERSION_PATCH}};
|
||||
const std::array<uint64_t, 4> ROUTER_VERSION{{llarp::constants::proto_version, LLARP_VERSION_MAJOR, LLARP_VERSION_MINOR, LLARP_VERSION_PATCH}};
|
||||
const char* const VERSION_STR = LLARP_VERSION_STR;
|
||||
const std::array<uint16_t, 3> VERSION{{@lokinet_VERSION_MAJOR@, @lokinet_VERSION_MINOR@, @lokinet_VERSION_PATCH@}};
|
||||
const std::array<uint64_t, 4> ROUTER_VERSION{{llarp::constants::proto_version, @lokinet_VERSION_MAJOR@, @lokinet_VERSION_MINOR@, @lokinet_VERSION_PATCH@}};
|
||||
const char* const VERSION_STR = "@lokinet_VERSION_MAJOR@.@lokinet_VERSION_MINOR@.@lokinet_VERSION_PATCH@";
|
||||
const char* const VERSION_TAG = "@VERSIONTAG@";
|
||||
const char* const VERSION_FULL = LLARP_NAME "-" LLARP_VERSION_STR "-@VERSIONTAG@";
|
||||
const char* const VERSION_FULL = "lokinet-@lokinet_VERSION_MAJOR@.@lokinet_VERSION_MINOR@.@lokinet_VERSION_PATCH@-@VERSIONTAG@";
|
||||
|
||||
const char* const RELEASE_MOTTO = LLARP_RELEASE_MOTTO;
|
||||
const char* const DEFAULT_NETID = LLARP_DEFAULT_NETID;
|
||||
const char* const RELEASE_MOTTO = "@RELEASE_MOTTO@";
|
||||
const char* const DEFAULT_NETID = "lokinet";
|
||||
// clang-format on
|
||||
} // namespace llarp
|
||||
|
@ -1,24 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
// Don't include this file directly but rather go through version.hpp instead.
|
||||
// This is only here so version.cpp.in and the weird archaic windows build
|
||||
// recipies can use the version.
|
||||
|
||||
#define LLARP_NAME "lokinet"
|
||||
|
||||
#define LLARP_DEFAULT_NETID "lokinet"
|
||||
|
||||
#ifndef LLARP_RELEASE_MOTTO
|
||||
#define LLARP_RELEASE_MOTTO "(dev build)"
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && defined(RC_INVOKED)
|
||||
#define LLARP_VERSION LLARP_VERSION_MAJOR, LLARP_VERSION_MINOR, LLARP_VERSION_PATCH, 0
|
||||
|
||||
#define MAKE_TRIPLET(X, Y, Z) TRIPLET_CAT(X, ., Y, ., Z)
|
||||
#define TRIPLET_CAT(X, D1, Y, D2, Z) X##D1##Y##D2##Z
|
||||
|
||||
#define LLARP_VERSION_TRIPLET \
|
||||
MAKE_TRIPLET(LLARP_VERSION_MAJOR, LLARP_VERSION_MINOR, LLARP_VERSION_PATCH)
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue