mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #11103 from electron/full-version-string

Browse source 
fix: Provide full and correct version in `process.version`
This commit is contained in:
Charles Kerr 2017-11-14 19:18:03 -06:00 • committed by GitHub
commit 3a1106d026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
atom/common/atom_version.h
View file

@ -8,11 +8,10 @@
#define ATOM_MAJOR_VERSION 1
#define ATOM_MINOR_VERSION 8
#define ATOM_PATCH_VERSION 2
#define ATOM_PRE_RELEASE_VERSION -beta.2
#define ATOM_VERSION_IS_RELEASE 1
#ifndef ATOM_TAG
# define ATOM_TAG ""
#ifndef ATOM_PRE_RELEASE_VERSION
# define ATOM_PRE_RELEASE_VERSION ""
#endif
#ifndef ATOM_STRINGIFY
@ -20,17 +19,10 @@
#define ATOM_STRINGIFY_HELPER(n) #n
#endif
#if ATOM_VERSION_IS_RELEASE
# define ATOM_VERSION_STRING ATOM_STRINGIFY(ATOM_MAJOR_VERSION) "." \
ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." \
ATOM_STRINGIFY(ATOM_PATCH_VERSION) \
ATOM_TAG
#else
# define ATOM_VERSION_STRING ATOM_STRINGIFY(ATOM_MAJOR_VERSION) "." \
ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." \
ATOM_STRINGIFY(ATOM_PATCH_VERSION) \
ATOM_TAG "-pre"
#endif
ATOM_STRINGIFY(ATOM_PRE_RELEASE_VERSION)
#define ATOM_VERSION "v" ATOM_VERSION_STRING