Commit Graph

67 Commits (793a4460624a9b1226ade546f95b0484b9dc7496)

Author SHA1 Message Date
Jonathan G Rennison 1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 6 years ago
Jonathan G Rennison 1e6b57675b Merge branch 'master' into version_utils 6 years ago
Jonathan G Rennison 4bcd05a620 Merge branch 'cpp-11' into save_ext
# Conflicts:
#	findversion.sh
6 years ago
frosch 34cc1f8b7c Fix 192770e6da: Version name in master branch contained a duplicate dash. 6 years ago
frosch 192770e6da Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'. 6 years ago
Jonathan G Rennison 6a780ffde2 Version detection: re-order SVN and Hg after git and .ottdrev-vc 9 years ago
Jonathan G Rennison 9287fa6554 Merge branch 'version_utils' into jgrpp 9 years ago
Jonathan G Rennison 1b8166b198 Enable embedding versioning info into the repo
Add a script to write a .ottdrev style file: .ottdrev-vc, which also
includes a SHA-256 hash of the source tree.
Modify findversion.sh to use this file if no VCS info can be found,
and use the source tree hash to set the modified status.
Include leading digits of hash in version string if different,
this is to make it easier to distinguish between modified or
non-release versions.
Add function to create release tag and create/commit .ottdrev-vc
in one go.
9 years ago
Jonathan G Rennison 01482ba6b4 Fix findversion.sh using descendant instead of ancestor tags for the version string. 9 years ago
planetmaker 84e2d4dd9e (svn r27079) -Fix: Compilation with freetype2 version 2.5.4 and newer (AMDmi3) 10 years ago
planetmaker 24fec6da12 (svn r27079) -Fix: Compilation with freetype2 version 2.5.4 and newer (AMDmi3) 10 years ago
planetmaker 2d3ad05aa7 (svn r27059) -Change: [Makefile] Make sure to use plain mercurial output unaltered by personal presets 10 years ago
planetmaker bc371a2d9e (svn r27059) -Change: [Makefile] Make sure to use plain mercurial output unaltered by personal presets 10 years ago
rubidium a9af895fbb (svn r25107) -Change: be slightly more lenient with trying to detect a subversion repository in case someone has a sparse tags checkout. In that case the .svn folder misses from the $ROOT_DIR because it is in the $ROOT_DIR/.. (i.e. tags) folder 11 years ago
rubidium 2661b5cfff (svn r25107) -Change: be slightly more lenient with trying to detect a subversion repository in case someone has a sparse tags checkout. In that case the .svn folder misses from the $ROOT_DIR because it is in the $ROOT_DIR/.. (i.e. tags) folder 11 years ago
michi_cc 29357ef65c (svn r22435) -Fix: Git revision detection would return too much when tags are involved. 13 years ago
michi_cc 28067c21d5 (svn r22435) -Fix: Git revision detection would return too much when tags are involved. 13 years ago
michi_cc 33d7f15a1e (svn r21857) -Add: Revision detection for hgsubversion repositories. 14 years ago
michi_cc 10a7678beb (svn r21857) -Add: Revision detection for hgsubversion repositories. 14 years ago
michi_cc 656431d3cb (svn r21856) -Fix (r21840): Don't fail tag detection on hg repositories that use mercurial queues. Add some safety against tags and branches with spaces as well. 14 years ago
michi_cc 22922414eb (svn r21856) -Fix (r21840): Don't fail tag detection on hg repositories that use mercurial queues. Add some safety against tags and branches with spaces as well. 14 years ago
michi_cc 2f98ad38ba (svn r21840) -Change: Support tags created by hgsubversion for the revision detection. 14 years ago
michi_cc 5f28591610 (svn r21840) -Change: Support tags created by hgsubversion for the revision detection. 14 years ago
michi_cc b0a592a649 (svn r21839) -Change: Support tags created by git-svn for the revision detection. 14 years ago
michi_cc 73da045f50 (svn r21839) -Change: Support tags created by git-svn for the revision detection. 14 years ago
rubidium 8b4d080817 (svn r21351) -Change: read some metadata from (official) source tarballs so you'll more likely get the right version/revision out-of-the-box 14 years ago
rubidium 4aa6a24d95 (svn r21351) -Change: read some metadata from (official) source tarballs so you'll more likely get the right version/revision out-of-the-box 14 years ago
rubidium 489179e925 (svn r20313) -Fix (r20309): Mercurial version detection picked up a bit more than it should've picked up. 14 years ago
rubidium 50f24a2762 (svn r20313) -Fix (r20309): Mercurial version detection picked up a bit more than it should've picked up. 14 years ago
rubidium e408c2567b (svn r20309) -Fix [FS#3953]: Mercurial (trunk) revision detection fails when different heads are used 14 years ago
rubidium 508fe537ff (svn r20309) -Fix [FS#3953]: Mercurial (trunk) revision detection fails when different heads are used 14 years ago
rubidium 3658d79b0c (svn r20308) -Change: don't only look at only the src directory for the revision, but at the parent of the src directory. 14 years ago
rubidium e8dc701cc4 (svn r20308) -Change: don't only look at only the src directory for the revision, but at the parent of the src directory. 14 years ago
michi_cc 1a060b9ae4 (svn r20050) -Add: git revision detection for custom git-svn clones. 14 years ago
michi_cc 848aa4472f (svn r20050) -Add: git revision detection for custom git-svn clones. 14 years ago
rubidium 8108d3107e (svn r19898) -Fix [FS#3853]: hg version detection fails for uncommited merges (planetmaker) 14 years ago
rubidium e84785a6b9 (svn r19898) -Fix [FS#3853]: hg version detection fails for uncommited merges (planetmaker) 14 years ago
michi_cc 0974562d4e (svn r19895) -Fix [FS#3836]: Git version detection would sometimes mistakenly identify a checkout as modified. 14 years ago
michi_cc 3e7fc229ab (svn r19895) -Fix [FS#3836]: Git version detection would sometimes mistakenly identify a checkout as modified. 14 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium b3ce805206 (svn r16462) -Change [FS#2930]: use a safer way to detect the hash of a mercurial repository (planetmaker) 15 years ago
rubidium 1448160e1e (svn r16462) -Change [FS#2930]: use a safer way to detect the hash of a mercurial repository (planetmaker) 15 years ago
rubidium 5d2b6f8474 (svn r16318) -Change: use !! instead of @@ in src/*.in too.
-Change: use @ instead of ~ in configure/Makefiles so Debian's build system(s) can also build RC binaries.
15 years ago
rubidium a34d5bb6ab (svn r16318) -Change: use !! instead of @@ in src/*.in too.
-Change: use @ instead of ~ in configure/Makefiles so Debian's build system(s) can also build RC binaries.
15 years ago
smatz 638411c087 (svn r15062) -Fix: further forgotten svn properties and headers 16 years ago
smatz 0a357c0ac1 (svn r15062) -Fix: further forgotten svn properties and headers 16 years ago
rubidium 428de2d302 (svn r14519) -Fix [FS#2376]: do not use the short hash form for getting a specific mercurial/git revision as those can collide quite easily causing reversion detection to fail (PhilSophus) 16 years ago
rubidium a7ff1920f9 (svn r14519) -Fix [FS#2376]: do not use the short hash form for getting a specific mercurial/git revision as those can collide quite easily causing reversion detection to fail (PhilSophus) 16 years ago
smatz ab00ea7393 (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell 16 years ago