From 3642b54d42f56a9e6feb030d0c70cd3e4f2203f9 Mon Sep 17 00:00:00 2001 From: Mike Copperwhite Date: Mon, 20 Feb 2017 23:19:11 +0000 Subject: [PATCH] Update issue #299 : Set build number from APPVEYOR_BUILD_NUMBER when built on Appveyor using Visual Studio 2013 or 2015 --- src/VersionNo.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/VersionNo.h b/src/VersionNo.h index 2f37aa1..8f37c50 100644 --- a/src/VersionNo.h +++ b/src/VersionNo.h @@ -6,16 +6,18 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 7 #define VERSION_REVISION 1 -#define VERSION_BUILD 0 // todo revision from git -#define VERSION_MODIFIER - // If built on appveyor, pass build version information through -//#define APPVEYOR_BUILD_VERSION 98.8.34.1345 #if defined(APPVEYOR_BUILD_VERSION) && defined(APPVEYOR_BUILD_NUMBER) -#define APPVEYOR_BUILD_STRING "Appveyor " STRINGIZE(APPVEYOR_BUILD_VERSION) " : " STRINGIZE(APPVEYOR_BUILD_NUMBER) + +#define VERSION_BUILD APPVEYOR_BUILD_NUMBER +#define APPVEYOR_BUILD_STRING "Appveyor build version" STRINGIZE(APPVEYOR_BUILD_VERSION) + #else + +#define VERSION_BUILD 0 // todo revision from git #define APPVEYOR_BUILD_STRING "" + #endif #define VER_FILE_DESCRIPTION_STR "Built " __DATE__ " " __TIME__ " " APPVEYOR_BUILD_STRING