From f46d313392fb130f61e3b7fcb8946bb33c6c613c Mon Sep 17 00:00:00 2001 From: Tomasz Poradowski Date: Sun, 30 Sep 2018 00:21:24 +0200 Subject: [PATCH] use version information from src/release.h - v4.0.2.3 --- msvs/RedisServer.vcxproj | 1 + src/release.c | 19 ++++++------------- src/version.h | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/msvs/RedisServer.vcxproj b/msvs/RedisServer.vcxproj index 90587b70..dfbc94c1 100644 --- a/msvs/RedisServer.vcxproj +++ b/msvs/RedisServer.vcxproj @@ -296,6 +296,7 @@ copy /Y $(OutputPath)redis-server.pdb $(OutputPath)redis-check-aof.pdb + diff --git a/src/release.c b/src/release.c index 33f08d8a..d702ef4d 100644 --- a/src/release.c +++ b/src/release.c @@ -27,19 +27,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* Every time the Redis Git SHA1 or Dirty status changes only this small - * file is recompiled, as we access this information in all the other - * files using this functions. */ - -#ifdef _WIN32 -#include "Win32_Interop/Win32_Portability.h" -#define REDIS_GIT_SHA1 "00000000" /* TODO: Modify build to write them to release.h from the environment */ -#define REDIS_GIT_DIRTY "0" -#define REDIS_BUILD_ID "0000" -#endif + /* Every time the Redis Git SHA1 or Dirty status changes only this small + * file is recompiled, as we access this information in all the other + * files using this functions. */ #include -POSIX_ONLY(#include "release.h") +#include "release.h" #include "version.h" #include "crc64.h" @@ -54,5 +47,5 @@ char *redisGitDirty(void) { uint64_t redisBuildId(void) { char *buildid = REDIS_VERSION REDIS_BUILD_ID REDIS_GIT_DIRTY REDIS_GIT_SHA1; - return crc64(0,(unsigned char*)buildid,strlen(buildid)); -} + return crc64(0, (unsigned char*) buildid, strlen(buildid)); +} \ No newline at end of file diff --git a/src/version.h b/src/version.h index ab90c7e1..cbf37107 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define REDIS_VERSION "4.0.2.2" +#define REDIS_VERSION "4.0.2.3"