From 70fb51ca3ed1e320d484b5e954e098fd70eb982b Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 20 Jun 2021 15:16:09 +0200 Subject: [PATCH] Removed version.h. --- modules/drogon/detect.py | 1 - modules/drogon/drogon/config/drogon/version.h | 5 ----- modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc | 5 ++--- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 modules/drogon/drogon/config/drogon/version.h diff --git a/modules/drogon/detect.py b/modules/drogon/detect.py index 8e7e159..0fb04dc 100644 --- a/modules/drogon/detect.py +++ b/modules/drogon/detect.py @@ -69,7 +69,6 @@ def configure(env): env.Append(CPPDEFINES=["OPENSSL_FOUND"]) env.Prepend(CPPPATH=["#modules/drogon/drogon/lib/inc"]) - env.Prepend(CPPPATH=["#modules/drogon/drogon/config"]) env.Prepend(CPPPATH=["#modules/drogon"]) env.Prepend(CPPPATH=["#modules/drogon/trantor"]) diff --git a/modules/drogon/drogon/config/drogon/version.h b/modules/drogon/drogon/config/drogon/version.h deleted file mode 100644 index a1474f5..0000000 --- a/modules/drogon/drogon/config/drogon/version.h +++ /dev/null @@ -1,5 +0,0 @@ -#define MAJOR 1 -#define MINOR 6 -#define PATCH 0 -#define DROGON_VERSION "1.6.0" -#define DROGON_VERSION_SHA1 "" diff --git a/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc b/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc index ee45d80..ae2103d 100644 --- a/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc +++ b/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc @@ -33,7 +33,6 @@ #include #include -#include #include #include #include @@ -95,11 +94,11 @@ drogon::InitBeforeMainFunction drogon::HttpAppFrameworkImpl::initFirst_([]() { namespace drogon { std::string getVersion() { - return DROGON_VERSION; + return "1"; } std::string getGitCommit() { - return DROGON_VERSION_SHA1; + return "DROGON_VERSION_SHA1"; } HttpResponsePtr defaultErrorHandler(HttpStatusCode code) {