Fossil SCM
Display build/patch number for the MSVC compiler.
Commit
487e465263fd21c37164a1aa074048717d9212e96744ffec3bacbfee310ebf20
Parent
398c5cd1a7fce29…
1 file changed
+4
-2
+4
-2
| --- tools/mkversion.c | ||
| +++ tools/mkversion.c | ||
| @@ -88,11 +88,11 @@ | ||
| 88 | 88 | FILE *m,*u,*v; |
| 89 | 89 | char *z; |
| 90 | 90 | #if defined(__DMC__) /* e.g. 0x857 */ |
| 91 | 91 | int i = 0; |
| 92 | 92 | #endif |
| 93 | - int j = 0, x = 0, d = 0; | |
| 93 | + int j = 0, x = 0, d = 0, p = 0; | |
| 94 | 94 | size_t n; |
| 95 | 95 | int vn[3]; |
| 96 | 96 | char b[1000]; |
| 97 | 97 | char vx[1000]; |
| 98 | 98 | if( argc!=4 ){ |
| @@ -200,11 +200,13 @@ | ||
| 200 | 200 | #elif defined(__POCC__) /* e.g. 700 */ |
| 201 | 201 | d = (__POCC__ / 100); /* major */ |
| 202 | 202 | x = (__POCC__ % 100); /* minor */ |
| 203 | 203 | printf("#define COMPILER_VERSION \"%d.%02d\"\n", d, x); |
| 204 | 204 | #elif defined(_MSC_VER) /* e.g. 1800 */ |
| 205 | + /* _MSC_FULL_VER also defined, e.g. 193030709 */ | |
| 205 | 206 | d = (_MSC_VER / 100); /* major */ |
| 206 | 207 | x = (_MSC_VER % 100); /* minor */ |
| 207 | - printf("#define COMPILER_VERSION \"%d.%02d\"\n", d, x); | |
| 208 | + p = (_MSC_FULL_VER % 100000); /* build (patch) */ | |
| 209 | + printf("#define COMPILER_VERSION \"%d.%02d.%05d\"\n", d, x, p); | |
| 208 | 210 | #endif |
| 209 | 211 | return 0; |
| 210 | 212 | } |
| 211 | 213 |
| --- tools/mkversion.c | |
| +++ tools/mkversion.c | |
| @@ -88,11 +88,11 @@ | |
| 88 | FILE *m,*u,*v; |
| 89 | char *z; |
| 90 | #if defined(__DMC__) /* e.g. 0x857 */ |
| 91 | int i = 0; |
| 92 | #endif |
| 93 | int j = 0, x = 0, d = 0; |
| 94 | size_t n; |
| 95 | int vn[3]; |
| 96 | char b[1000]; |
| 97 | char vx[1000]; |
| 98 | if( argc!=4 ){ |
| @@ -200,11 +200,13 @@ | |
| 200 | #elif defined(__POCC__) /* e.g. 700 */ |
| 201 | d = (__POCC__ / 100); /* major */ |
| 202 | x = (__POCC__ % 100); /* minor */ |
| 203 | printf("#define COMPILER_VERSION \"%d.%02d\"\n", d, x); |
| 204 | #elif defined(_MSC_VER) /* e.g. 1800 */ |
| 205 | d = (_MSC_VER / 100); /* major */ |
| 206 | x = (_MSC_VER % 100); /* minor */ |
| 207 | printf("#define COMPILER_VERSION \"%d.%02d\"\n", d, x); |
| 208 | #endif |
| 209 | return 0; |
| 210 | } |
| 211 |
| --- tools/mkversion.c | |
| +++ tools/mkversion.c | |
| @@ -88,11 +88,11 @@ | |
| 88 | FILE *m,*u,*v; |
| 89 | char *z; |
| 90 | #if defined(__DMC__) /* e.g. 0x857 */ |
| 91 | int i = 0; |
| 92 | #endif |
| 93 | int j = 0, x = 0, d = 0, p = 0; |
| 94 | size_t n; |
| 95 | int vn[3]; |
| 96 | char b[1000]; |
| 97 | char vx[1000]; |
| 98 | if( argc!=4 ){ |
| @@ -200,11 +200,13 @@ | |
| 200 | #elif defined(__POCC__) /* e.g. 700 */ |
| 201 | d = (__POCC__ / 100); /* major */ |
| 202 | x = (__POCC__ % 100); /* minor */ |
| 203 | printf("#define COMPILER_VERSION \"%d.%02d\"\n", d, x); |
| 204 | #elif defined(_MSC_VER) /* e.g. 1800 */ |
| 205 | /* _MSC_FULL_VER also defined, e.g. 193030709 */ |
| 206 | d = (_MSC_VER / 100); /* major */ |
| 207 | x = (_MSC_VER % 100); /* minor */ |
| 208 | p = (_MSC_FULL_VER % 100000); /* build (patch) */ |
| 209 | printf("#define COMPILER_VERSION \"%d.%02d.%05d\"\n", d, x, p); |
| 210 | #endif |
| 211 | return 0; |
| 212 | } |
| 213 |