From 5a3f2ba2010035d146710d9811c966cbab6e0de5 Mon Sep 17 00:00:00 2001 From: David Puglielli Date: Tue, 25 Jul 2017 11:44:01 -0700 Subject: [PATCH] Update version.h Fixed the location of the dash, since pecl does not like dashes it gets included in VER_FILEVERSION_STR instead of SEMVER_PRERELEASE. --- source/shared/version.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/shared/version.h b/source/shared/version.h index 7237b2a8..98eebfae 100644 --- a/source/shared/version.h +++ b/source/shared/version.h @@ -35,7 +35,7 @@ // for stable releases should be empty // "-RC" for release candidates // "-preview" for ETP -#define SEMVER_PRERELEASE "-preview" +#define SEMVER_PRERELEASE "preview" // Semantic versioning build metadata, build meta data is not counted in precedence order. #define SEMVER_BUILDMETA @@ -47,8 +47,10 @@ // Main version, dot separated 3 digits, Major.Minor.Patch #define VER_APIVERSION_STR STRINGIFY( SQLVERSION_MAJOR ) "." STRINGIFY( SQLVERSION_MINOR ) "." STRINGIFY( SQLVERSION_PATCH ) -// Remove "-" if SEMVER_PRERELEASE is empty (for stable releases) -#define VER_FILEVERSION_STR VER_APIVERSION_STR SEMVER_PRERELEASE SEMVER_BUILDMETA +// For preview release, we want the following: +// #define VER_FILEVERSION_STR VER_APIVERSION_STR "-" SEMVER_PRERELEASE SEMVER_BUILDMETA +// because pecl doesn't like dashes. However, if SEMVER_PRERELEASE is empty, the "-" must be removed +#define VER_FILEVERSION_STR VER_APIVERSION_STR "-" SEMVER_PRERELEASE SEMVER_BUILDMETA #define _FILEVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_PATCH,SQLVERSION_BUILD // PECL package version macros (can't have '-' or '+')