Fossil SCM
Support setting the binary file/product versions in the Win32 resources.
Commit
6b8ef6a4fd5610f5f0cc648c59511d6e3b78620c
Parent
5c420b169076f5f…
2 files changed
+20
-1
+2
-2
+20
-1
| --- src/mkversion.c | ||
| +++ src/mkversion.c | ||
| @@ -11,13 +11,17 @@ | ||
| 11 | 11 | #include <string.h> |
| 12 | 12 | |
| 13 | 13 | int main(int argc, char *argv[]){ |
| 14 | 14 | FILE *m,*u,*v; |
| 15 | 15 | char *z; |
| 16 | - int i, x; | |
| 16 | + int i, x, d; | |
| 17 | 17 | char b[1000]; |
| 18 | + char b2[1000]; | |
| 18 | 19 | char vx[1000]; |
| 20 | + memset(b,0,sizeof(b)); | |
| 21 | + memset(b2,0,sizeof(b2)); | |
| 22 | + memset(vx,0,sizeof(vx)); | |
| 19 | 23 | u = fopen(argv[1],"r"); |
| 20 | 24 | fgets(b, sizeof(b)-1,u); |
| 21 | 25 | fclose(u); |
| 22 | 26 | for(z=b; z[0] && z[0]!='\r' && z[0]!='\n'; z++){} |
| 23 | 27 | *z = 0; |
| @@ -51,7 +55,22 @@ | ||
| 51 | 55 | } |
| 52 | 56 | z++; |
| 53 | 57 | } |
| 54 | 58 | for(z=vx; z[0]=='0'; z++){} |
| 55 | 59 | printf("#define RELEASE_VERSION_NUMBER %s\n", z); |
| 60 | + strcpy(b2,b); | |
| 61 | + d = 0; | |
| 62 | + for(z=b2; z[0]; z++){ | |
| 63 | + if( z[0]!='.' ) continue; | |
| 64 | + if ( d<3 ){ | |
| 65 | + z[0] = ','; | |
| 66 | + d++; | |
| 67 | + }else{ | |
| 68 | + z[0] = '\0'; | |
| 69 | + break; | |
| 70 | + } | |
| 71 | + } | |
| 72 | + printf("#define RELEASE_RESOURCE_VERSION %s", b2); | |
| 73 | + while( d<3 ){ printf(",0"); d++; } | |
| 74 | + printf("\n"); | |
| 56 | 75 | return 0; |
| 57 | 76 | } |
| 58 | 77 |
| --- src/mkversion.c | |
| +++ src/mkversion.c | |
| @@ -11,13 +11,17 @@ | |
| 11 | #include <string.h> |
| 12 | |
| 13 | int main(int argc, char *argv[]){ |
| 14 | FILE *m,*u,*v; |
| 15 | char *z; |
| 16 | int i, x; |
| 17 | char b[1000]; |
| 18 | char vx[1000]; |
| 19 | u = fopen(argv[1],"r"); |
| 20 | fgets(b, sizeof(b)-1,u); |
| 21 | fclose(u); |
| 22 | for(z=b; z[0] && z[0]!='\r' && z[0]!='\n'; z++){} |
| 23 | *z = 0; |
| @@ -51,7 +55,22 @@ | |
| 51 | } |
| 52 | z++; |
| 53 | } |
| 54 | for(z=vx; z[0]=='0'; z++){} |
| 55 | printf("#define RELEASE_VERSION_NUMBER %s\n", z); |
| 56 | return 0; |
| 57 | } |
| 58 |
| --- src/mkversion.c | |
| +++ src/mkversion.c | |
| @@ -11,13 +11,17 @@ | |
| 11 | #include <string.h> |
| 12 | |
| 13 | int main(int argc, char *argv[]){ |
| 14 | FILE *m,*u,*v; |
| 15 | char *z; |
| 16 | int i, x, d; |
| 17 | char b[1000]; |
| 18 | char b2[1000]; |
| 19 | char vx[1000]; |
| 20 | memset(b,0,sizeof(b)); |
| 21 | memset(b2,0,sizeof(b2)); |
| 22 | memset(vx,0,sizeof(vx)); |
| 23 | u = fopen(argv[1],"r"); |
| 24 | fgets(b, sizeof(b)-1,u); |
| 25 | fclose(u); |
| 26 | for(z=b; z[0] && z[0]!='\r' && z[0]!='\n'; z++){} |
| 27 | *z = 0; |
| @@ -51,7 +55,22 @@ | |
| 55 | } |
| 56 | z++; |
| 57 | } |
| 58 | for(z=vx; z[0]=='0'; z++){} |
| 59 | printf("#define RELEASE_VERSION_NUMBER %s\n", z); |
| 60 | strcpy(b2,b); |
| 61 | d = 0; |
| 62 | for(z=b2; z[0]; z++){ |
| 63 | if( z[0]!='.' ) continue; |
| 64 | if ( d<3 ){ |
| 65 | z[0] = ','; |
| 66 | d++; |
| 67 | }else{ |
| 68 | z[0] = '\0'; |
| 69 | break; |
| 70 | } |
| 71 | } |
| 72 | printf("#define RELEASE_RESOURCE_VERSION %s", b2); |
| 73 | while( d<3 ){ printf(",0"); d++; } |
| 74 | printf("\n"); |
| 75 | return 0; |
| 76 | } |
| 77 |
+2
-2
| --- win/fossil.rc | ||
| +++ win/fossil.rc | ||
| @@ -58,12 +58,12 @@ | ||
| 58 | 58 | /* |
| 59 | 59 | * Version |
| 60 | 60 | */ |
| 61 | 61 | |
| 62 | 62 | VS_VERSION_INFO VERSIONINFO |
| 63 | - FILEVERSION 1,0,0,0 | |
| 64 | - PRODUCTVERSION 1,0,0,0 | |
| 63 | + FILEVERSION RELEASE_RESOURCE_VERSION | |
| 64 | + PRODUCTVERSION RELEASE_RESOURCE_VERSION | |
| 65 | 65 | FILEFLAGSMASK 0x3F |
| 66 | 66 | #if defined(_DEBUG) |
| 67 | 67 | FILEFLAGS 0x1L |
| 68 | 68 | #else |
| 69 | 69 | FILEFLAGS 0x0L |
| 70 | 70 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -58,12 +58,12 @@ | |
| 58 | /* |
| 59 | * Version |
| 60 | */ |
| 61 | |
| 62 | VS_VERSION_INFO VERSIONINFO |
| 63 | FILEVERSION 1,0,0,0 |
| 64 | PRODUCTVERSION 1,0,0,0 |
| 65 | FILEFLAGSMASK 0x3F |
| 66 | #if defined(_DEBUG) |
| 67 | FILEFLAGS 0x1L |
| 68 | #else |
| 69 | FILEFLAGS 0x0L |
| 70 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -58,12 +58,12 @@ | |
| 58 | /* |
| 59 | * Version |
| 60 | */ |
| 61 | |
| 62 | VS_VERSION_INFO VERSIONINFO |
| 63 | FILEVERSION RELEASE_RESOURCE_VERSION |
| 64 | PRODUCTVERSION RELEASE_RESOURCE_VERSION |
| 65 | FILEFLAGSMASK 0x3F |
| 66 | #if defined(_DEBUG) |
| 67 | FILEFLAGS 0x1L |
| 68 | #else |
| 69 | FILEFLAGS 0x0L |
| 70 |