From 6c6fa3190f1e712622efb2cca4dc7bbe92e1d89d Mon Sep 17 00:00:00 2001 From: Felix Rieseberg Date: Tue, 6 Feb 2018 14:33:51 -0800 Subject: [PATCH] Fix PRE_RELEASE_VERSION (on master) (#11844) * :wrench: Fix PRE_RELEASE_VERSION * :wrench: Fix spacing * :wrench: Fix this, but harder --- atom/common/atom_version.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h index a279283cf09d..5fa39680ca81 100644 --- a/atom/common/atom_version.h +++ b/atom/common/atom_version.h @@ -10,19 +10,22 @@ #define ATOM_PATCH_VERSION 2 #define ATOM_PRE_RELEASE_VERSION -beta.2 -#ifndef ATOM_PRE_RELEASE_VERSION -# define ATOM_PRE_RELEASE_VERSION "" -#endif - #ifndef ATOM_STRINGIFY #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n) #define ATOM_STRINGIFY_HELPER(n) #n #endif -# define ATOM_VERSION_STRING ATOM_STRINGIFY(ATOM_MAJOR_VERSION) "." \ +#ifndef ATOM_PRE_RELEASE_VERSION + #define ATOM_VERSION_STRING ATOM_STRINGIFY(ATOM_MAJOR_VERSION) "." \ + ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." \ + ATOM_STRINGIFY(ATOM_PATCH_VERSION) +#else + #define ATOM_VERSION_STRING ATOM_STRINGIFY(ATOM_MAJOR_VERSION) "." \ ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." \ ATOM_STRINGIFY(ATOM_PATCH_VERSION) \ ATOM_STRINGIFY(ATOM_PRE_RELEASE_VERSION) +#endif + #define ATOM_VERSION "v" ATOM_VERSION_STRING