From 7b9e6677fffeff5e57b13f5a8bc75274d2bc0c7e Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Mon, 26 Aug 2019 15:48:20 +0200 Subject: [PATCH] GRPC: Move to version strings rather than int to avoid octal numbers --- ApplicationCode/Adm/RiaVersionInfo.h.cmake | 6 +++--- ApplicationCode/GrpcInterface/RiaGrpcAppService.cpp | 6 +++--- ResInsightVersion.cmake | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ApplicationCode/Adm/RiaVersionInfo.h.cmake b/ApplicationCode/Adm/RiaVersionInfo.h.cmake index befafb8ef0..f3825c0350 100644 --- a/ApplicationCode/Adm/RiaVersionInfo.h.cmake +++ b/ApplicationCode/Adm/RiaVersionInfo.h.cmake @@ -27,8 +27,8 @@ #define PRODUCTVER "@PRODUCTVER@" #define STRPRODUCTVER "@STRPRODUCTVER@" -#define RESINSIGHT_MAJOR_VERSION @RESINSIGHT_MAJOR_VERSION@ -#define RESINSIGHT_MINOR_VERSION @RESINSIGHT_MINOR_VERSION@ -#define RESINSIGHT_PATCH_VERSION @RESINSIGHT_PATCH_VERSION@ +#define RESINSIGHT_MAJOR_VERSION "@RESINSIGHT_MAJOR_VERSION@" +#define RESINSIGHT_MINOR_VERSION "@RESINSIGHT_MINOR_VERSION@" +#define RESINSIGHT_PATCH_VERSION "@RESINSIGHT_PATCH_VERSION@" #define RESINSIGHT_OCTAVE_VERSION "@OCTAVE_VERSION_STRING@" diff --git a/ApplicationCode/GrpcInterface/RiaGrpcAppService.cpp b/ApplicationCode/GrpcInterface/RiaGrpcAppService.cpp index 8224ce9e62..4c907bdd55 100644 --- a/ApplicationCode/GrpcInterface/RiaGrpcAppService.cpp +++ b/ApplicationCode/GrpcInterface/RiaGrpcAppService.cpp @@ -27,9 +27,9 @@ //-------------------------------------------------------------------------------------------------- grpc::Status RiaGrpcAppService::GetVersion(grpc::ServerContext* context, const rips::Empty* request, rips::Version* reply) { - reply->set_major_version(RESINSIGHT_MAJOR_VERSION); - reply->set_minor_version(RESINSIGHT_MINOR_VERSION); - reply->set_patch_version(RESINSIGHT_PATCH_VERSION); + reply->set_major_version(QString(RESINSIGHT_MAJOR_VERSION).toInt()); + reply->set_minor_version(QString(RESINSIGHT_MINOR_VERSION).toInt()); + reply->set_patch_version(QString(RESINSIGHT_PATCH_VERSION).toInt()); return grpc::Status::OK; } diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index caf6d777e5..6d7d158be3 100644 --- a/ResInsightVersion.cmake +++ b/ResInsightVersion.cmake @@ -1,6 +1,6 @@ set(RESINSIGHT_MAJOR_VERSION 2019) -set(RESINSIGHT_MINOR_VERSION 8) +set(RESINSIGHT_MINOR_VERSION 08) set(RESINSIGHT_PATCH_VERSION 0) # Opional text with no restrictions