Skip to content

Commit d23c036

Browse files
committed
Fix a logic bug in build number padding.
1 parent ef4db77 commit d23c036

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

bin/CoreCommon.ver

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define VER_PRODUCTMAJORVERSION CHAKRA_CORE_MAJOR_VERSION
3232
#define VER_PRODUCTMINORVERSION CHAKRA_CORE_MINOR_VERSION
3333

34-
// Flags
34+
// File Flags
3535
#if DBG
3636
#define VER_DEBUG VS_FF_DEBUG
3737
#else
@@ -50,6 +50,8 @@
5050
#define VER_PRERELEASE 0
5151
#endif
5252

53+
#define VER_FILEFLAGS (VER_DEBUG|VER_PRIVATE|VER_PRERELEASE)
54+
5355
// File description suffix
5456
#if DBG
5557
#define VER_FILEDESCRIPTION_SUFFIX1_STR L"Debug"
@@ -83,8 +85,6 @@
8385
#define CHAKRA_VERSION_BUILD_NUMBER_PADDING 00
8486
#elif (CHAKRA_VERSION_BUILD_NUMBER < 10000)
8587
#define CHAKRA_VERSION_BUILD_NUMBER_PADDING 0
86-
#else
87-
#define CHAKRA_VERSION_BUILD_NUMBER_PADDING CHAKRA_VERSION_BUILD_NUMBER
8888
#endif
8989

9090
#if (CHAKRA_VERSION_BUILD_QFE < 10)
@@ -95,14 +95,22 @@
9595
#define CHAKRA_VERSION_BUILD_QFE_PADDING 00
9696
#elif (CHAKRA_VERSION_BUILD_QFE < 10000)
9797
#define CHAKRA_VERSION_BUILD_QFE_PADDING 0
98-
#else
99-
#define CHAKRA_VERSION_BUILD_QFE_PADDING CHAKRA_VERSION_BUILD_QFE
10098
#endif
10199

102100
#define CONCAT_PADDING_(padding,value) padding ## value
103101
#define CONCAT_PADDING(padding,value) CONCAT_PADDING_(padding,value)
102+
103+
#ifdef CHAKRA_VERSION_BUILD_NUMBER_PADDING
104104
#define PADDED_CHAKRA_VERSION_BUILD_NUMBER CONCAT_PADDING(CHAKRA_VERSION_BUILD_NUMBER_PADDING,CHAKRA_VERSION_BUILD_NUMBER)
105+
#else
106+
#define PADDED_CHAKRA_VERSION_BUILD_NUMBER CHAKRA_VERSION_BUILD_NUMBER
107+
#endif
108+
109+
#ifdef CHAKRA_VERSION_BUILD_QFE_PADDING
105110
#define PADDED_CHAKRA_VERSION_BUILD_QFE CONCAT_PADDING(CHAKRA_VERSION_BUILD_QFE_PADDING,CHAKRA_VERSION_BUILD_QFE)
111+
#else
112+
#define PADDED_CHAKRA_VERSION_BUILD_QFE CHAKRA_VERSION_BUILD_QFE
113+
#endif
106114

107115
#ifdef CHAKRA_VERSION_BUILD_DATE
108116
#define __BUILDDATE__ PADDED_CHAKRA_VERSION_BUILD_NUMBER.PADDED_CHAKRA_VERSION_BUILD_QFE.CHAKRA_VERSION_BUILD_DATE
@@ -118,8 +126,6 @@
118126

119127
#endif // defined(CHAKRA_VERSION_BUILD_NUMBER) && defined(CHAKRA_VERSION_BUILD_QFE)
120128

121-
#define VER_FILEFLAGS (VER_DEBUG|VER_PRIVATE|VER_PRERELEASE)
122-
123129
#define VER_PRODUCTVERSION VER_PRODUCTMAJORVERSION,VER_PRODUCTMINORVERSION,VER_PRODUCTBUILD,VER_PRODUCTBUILD_QFE
124130

125131
#define VER_PRODUCTVERSION_MAJORMINOR2(x,y) #x "." #y

0 commit comments

Comments
 (0)