dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,899 Commits 1 Branch 0 Tags
0a6a38886d197fd1d4e631039c3ad0eeac896c15
Commit Graph

83 Commits

Author SHA1 Message Date
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
1f535915d1 Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	config.lib
#	src/core/bitmath_func.hpp
#	src/lang/korean.txt
#	src/main_gui.cpp
#	src/order_gui.cpp
#	src/script/api/script_object.cpp
#	src/station_cmd.cpp
#	src/video/cocoa/wnd_quartz.mm
 2019-09-18 01:18:28 +01:00
George Koehler
c655f89d84 Fix: Allow git worktree in version detection; drop svn, hg. 
If $ROOT_DIR is a linked working tree from git-worktree(1), then
$ROOT_DIR/.git is a regular file instead of a directory.  Allow this
when deciding whether to use git to detect OpenTTD's version.

Drop checks for svn and hg in config.lib, because findversion.sh
hasn't used svn nor hg since 192770e6da.
 2019-08-31 20:11:24 +01:00
Jonathan G Rennison
f8724beb29 findversion.sh: Handle case where tag/stable tag is missing from .ottdrev-vc 2019-03-26 17:39:46 +00:00
Jonathan G Rennison
7ff252c58d Merge branch 'master' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
 2019-03-04 01:18:25 +00: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
2fdcc52321 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/lang/dutch.txt
#	src/lang/korean.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/rail.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle.cpp
 2019-02-13 19:09:06 +00: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
2142452305 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/core/config.h
#	src/network/network.cpp
#	src/network/network_udp.cpp
#	src/rev.h
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
#	src/viewport.cpp
 2019-02-04 18:32:44 +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
e3d167f9f0 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
 2019-01-14 00:01:44 +00: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
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
Jonathan G Rennison
1e6b57675b Merge branch 'master' into version_utils 2018-04-27 01:38:34 +01: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
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
24fec6da12 (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
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
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
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
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
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
33d7f15a1e (svn r21857) -Add: Revision detection for hgsubversion repositories. 2011-01-19 17:10:57 +00:00
michi_cc
10a7678beb (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
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
2f98ad38ba (svn r21840) -Change: Support tags created by hgsubversion for the revision detection. 2011-01-18 21:27:35 +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
b0a592a649 (svn r21839) -Change: Support tags created by git-svn for the revision detection. 2011-01-18 21:27:30 +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
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
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
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
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
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
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
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
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
michi_cc
1a060b9ae4 (svn r20050) -Add: git revision detection for custom git-svn clones. 2010-07-02 16:34:15 +00:00