Commit Graph

33 Commits

Author SHA1 Message Date
Jonathan G Rennison
6a780ffde2 Version detection: re-order SVN and Hg after git and .ottdrev-vc 2015-12-09 23:54:58 +00:00
Jonathan G Rennison
9287fa6554 Merge branch 'version_utils' into jgrpp 2015-08-31 01:51:52 +01:00
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.
2015-08-31 01:51:01 +01:00
Jonathan G Rennison
01482ba6b4 Fix findversion.sh using descendant instead of ancestor tags for the version string. 2015-08-16 14:25:53 +01:00
planetmaker
84e2d4dd9e (svn r27079) -Fix: Compilation with freetype2 version 2.5.4 and newer (AMDmi3) 2014-12-11 12:25:53 +00:00
planetmaker
2d3ad05aa7 (svn r27059) -Change: [Makefile] Make sure to use plain mercurial output unaltered by personal presets 2014-11-09 16:37:07 +00:00
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 2013-03-18 06:18:06 +00:00
michi_cc
29357ef65c (svn r22435) -Fix: Git revision detection would return too much when tags are involved. 2011-05-07 15:13:52 +00:00
michi_cc
33d7f15a1e (svn r21857) -Add: Revision detection for hgsubversion repositories. 2011-01-19 17:10:57 +00:00
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. 2011-01-19 17:10:52 +00:00
michi_cc
2f98ad38ba (svn r21840) -Change: Support tags created by hgsubversion for the revision detection. 2011-01-18 21:27:35 +00:00
michi_cc
b0a592a649 (svn r21839) -Change: Support tags created by git-svn for the revision detection. 2011-01-18 21:27:30 +00:00
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 2010-11-29 12:49:27 +00:00
rubidium
489179e925 (svn r20313) -Fix (r20309): Mercurial version detection picked up a bit more than it should've picked up. 2010-08-02 18:37:37 +00:00
rubidium
e408c2567b (svn r20309) -Fix [FS#3953]: Mercurial (trunk) revision detection fails when different heads are used 2010-08-02 17:16:56 +00:00
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. 2010-08-02 16:38:26 +00:00
michi_cc
1a060b9ae4 (svn r20050) -Add: git revision detection for custom git-svn clones. 2010-07-02 16:34:15 +00:00
rubidium
8108d3107e (svn r19898) -Fix [FS#3853]: hg version detection fails for uncommited merges (planetmaker) 2010-05-26 23:01:10 +00:00
michi_cc
0974562d4e (svn r19895) -Fix [FS#3836]: Git version detection would sometimes mistakenly identify a checkout as modified. 2010-05-26 03:31:05 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
b3ce805206 (svn r16462) -Change [FS#2930]: use a safer way to detect the hash of a mercurial repository (planetmaker) 2009-05-29 21:24:51 +00:00
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.
2009-05-16 12:36:33 +00:00
smatz
638411c087 (svn r15062) -Fix: further forgotten svn properties and headers 2009-01-13 16:30:24 +00:00
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) 2008-10-22 22:07:43 +00:00
smatz
ab00ea7393 (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell 2008-10-14 19:47:28 +00:00
skidd13
91665fd7e4 (svn r14443) -Change: Unify the delimiters used in config* and make* 2008-10-06 17:05:44 +00:00
glx
083014b868 (svn r14355) -Fix: latest svn revision detection from hg log always gave the latest relative to tip revision, not to the current working revision 2008-09-17 16:06:05 +00:00
peter1138
53161f3c4c (svn r14353) -Fix: hg revision detection always gave the tip revision, not the current working revision. 2008-09-17 08:32:26 +00:00
matthijs
eb20aa5f19 (svn r14278) -Cleanup [Makefile]: Rename $TAGS to $TAG. 2008-09-09 10:58:23 +00:00
matthijs
fee42cd627 (svn r14277) -Change [Makefile]: Use [ -n ... ] instead of using return values from grep and read in findversion.sh. 2008-09-09 10:48:04 +00:00
rubidium
f75ee75661 (svn r14273) -Change: make findversion.sh aware of release tags and make it output the REV without the branch name so the CF can use that. 2008-09-08 10:08:55 +00:00
smatz
947f4bf213 (svn r14264) -Fix (r14261): 'echo -e' is not recognized on many systems 2008-09-07 17:40:14 +00:00
matthijs
8f69465314 (svn r14261) -Change [Makefile]: Move the revision detection code from Makefile.src.in to a
new bash script findversion.sh. This commit should have no functional changes.
2008-09-07 13:24:49 +00:00