Commit Graph

70 Commits

Author SHA1 Message Date
Jonathan G Rennison
7f80884047 Merge branch 'cpp-11' into save_ext
# Conflicts:
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
2019-04-09 18:54:02 +01:00
frosch
39cda89e85 Add: Detect stable tags automatically, and set the 'stable' flag in '_openttd_newgrf_version' accordingly. (#7317) 2019-03-03 20:08:28 +01:00
Jonathan G Rennison
1db19208ba Merge branch 'cpp-11' into save_ext
# Conflicts:
#	src/saveload/saveload.h
2019-02-13 18:51:53 +00:00
Niels Martin Hansen
46d97239c4 Codechange: Include flag for whether a build is of a tagged revision 2019-02-12 21:32:43 +00:00
Jonathan G Rennison
46b5b0155c Merge branch 'cpp-11' into save_ext
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
2019-02-04 18:24:38 +00:00
Niels Martin Hansen
67c6f945fb Change: Include the full raw git revision hash in rev.cpp 2019-02-03 18:00:16 +01:00
Jonathan G Rennison
4a162c5502 Merge branch 'cpp-11' into save_ext 2019-01-13 23:30:52 +00:00
Patric Stout
750927372f Add: [AzurePipeline] introducing a release pipeline
This release pipeline creates all the official release binaries,
and publishes them as artifacts. Currently it can only produce
nightlies and custom builds; stable/testing release binaries are
untested.

This commit also splits up the pipeline in small bits, to both
improve readability, and to share code with the CI pipeline where
possible.
2019-01-13 11:31:04 +00:00
Jonathan G Rennison
4bcd05a620 Merge branch 'cpp-11' into save_ext
# Conflicts:
#	findversion.sh
2018-04-27 01:33:39 +01:00
frosch
34cc1f8b7c Fix 192770e6da: Version name in master branch contained a duplicate dash. 2018-04-14 17:59:35 +02:00
frosch
192770e6da Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'. 2018-04-12 22:26:45 +02: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
24fec6da12 (svn r27079) -Fix: Compilation with freetype2 version 2.5.4 and newer (AMDmi3) 2014-12-11 12:25:53 +00: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
bc371a2d9e (svn r27059) -Change: [Makefile] Make sure to use plain mercurial output unaltered by personal presets 2014-11-09 16:37:07 +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
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 2013-03-18 06:18:06 +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
28067c21d5 (svn r22435) -Fix: Git revision detection would return too much when tags are involved. 2011-05-07 15:13:52 +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
10a7678beb (svn r21857) -Add: Revision detection for hgsubversion repositories. 2011-01-19 17:10:57 +00:00
michi_cc
33d7f15a1e (svn r21857) -Add: Revision detection for hgsubversion repositories. 2011-01-19 17:10:57 +00:00
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. 2011-01-19 17:10:52 +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
5f28591610 (svn r21840) -Change: Support tags created by hgsubversion for the revision detection. 2011-01-18 21:27:35 +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
73da045f50 (svn r21839) -Change: Support tags created by git-svn for the revision detection. 2011-01-18 21:27:30 +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
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 2010-11-29 12:49:27 +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
50f24a2762 (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
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
508fe537ff (svn r20309) -Fix [FS#3953]: Mercurial (trunk) revision detection fails when different heads are used 2010-08-02 17:16:56 +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
e8dc701cc4 (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
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
848aa4472f (svn r20050) -Add: git revision detection for custom git-svn clones. 2010-07-02 16:34:15 +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
e84785a6b9 (svn r19898) -Fix [FS#3853]: hg version detection fails for uncommited merges (planetmaker) 2010-05-26 23:01:10 +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
3e7fc229ab (svn r19895) -Fix [FS#3836]: Git version detection would sometimes mistakenly identify a checkout as modified. 2010-05-26 03:31:05 +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
7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
1448160e1e (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
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
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.
2009-05-16 12:36:33 +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
0a357c0ac1 (svn r15062) -Fix: further forgotten svn properties and headers 2009-01-13 16:30:24 +00:00
smatz
638411c087 (svn r15062) -Fix: further forgotten svn properties and headers 2009-01-13 16:30:24 +00:00