Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update genversion to use GitRev

Browse source
This commit is contained in:
Tim Felgentreff 2015-12-08 10:29:13 +01:00
parent 86bb1e22c2
commit 5345a4cdeb
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/include/version.h
View file

@ -22,8 +22,8 @@
#endif
/// Engine version string
#ifdef StratagusBzrRev
#define VERSION _version_str2 "-bzr" _version_stringify(StratagusBzrRev)
#ifdef StratagusGitRev
#define VERSION _version_str2 "-git" _version_stringify(StratagusGitRev)
#else
#define VERSION _version_str2
#endif

30
tools/genversion.cpp
View file

@ -60,11 +60,29 @@ int main(int argc, char * argv[]) {
fclose(file);
}
file = fopen(".bzr/branch/last-revision", "r");
file = fopen(".git/HEAD", "r");
char *git_rev, *gitrevfile;
if ( file ) {
if ( fscanf(file, "%d", &new_ver[4]) != 1 )
new_ver[4] = -1;
fclose(file);
new_ver[4] = 1;
if (fscanf(file, "ref: %ms", &git_rev) != 1 ) {
if (fscanf(file, "%ms", &git_rev) != 1 ) {
new_ver[4] = -1;
}
fclose(file);
} else {
fclose(file);
gitrevfile = (char*)calloc(sizeof(char), strlen(git_rev) + 6);
sprintf(gitrevfile, ".git/%s", git_rev);
free(git_rev);
file = fopen(gitrevfile, "r");
free(gitrevfile);
if (file) {
if (fscanf(file, "%ms", &git_rev) != 1) {
new_ver[4] = -1;
}
fclose(file);
}
}
}
if ( memcmp(old_ver, new_ver, sizeof(old_ver)) == 0 )
@ -81,8 +99,8 @@ int main(int argc, char * argv[]) {
fprintf(file, "#define StratagusPatchLevel %d\n", new_ver[2]);
fprintf(file, "#define StratagusPatchLevel2 %d\n", new_ver[3]);
if ( new_ver[4] >= 0 )
fprintf(file, "#define StratagusBzrRev %d\n", new_ver[4]);
if ( new_ver[4] )
fprintf(file, "#define StratagusGitRev %s\n", git_rev);
fclose(file);
return 0;