Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'.

2 files changed, 8 insertions, 10 deletions

diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in
index a60c28089..616d8bb3e 100644
--- a/src/os/windows/ottdres.rc.in
+++ b/src/os/windows/ottdres.rc.in
@@ -79,8 +79,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,0,!!REVISION!!
- PRODUCTVERSION 1,9,0,!!REVISION!!
+ FILEVERSION 1,9,0,!!ISODATE!!
+ PRODUCTVERSION 1,9,0,!!ISODATE!!
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index ace9acc1f..6689fe689 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -26,18 +26,16 @@ bool IsReleasedVersion()
 
 /**
  * The text version of OpenTTD's revision.
- * This will be either "<major>.<minor>.<build>[-RC<rc>]",
- * "r<revision number>[M][-<branch>]" or "norev000".
+ * This will be either
+ * - "<tag>", like "<major>.<minor>.<build>[-RC<rc>]",
+ * - "<commitdate>-g<shorthash><modified>" in "master",
+ * - "<commitdate>-<branch>-g<shorthash><modified>" in other branches, or
+ * - "norev000", if the version is unknown.
  *
  * The major, minor and build are the numbers that describe releases of
  * OpenTTD (like 0.5.3). "-RC" is used to flag release candidates.
  *
- * The revision number is fairly straight forward. The M is to show that
- * the binary is made from modified source code. The branch shows the
- * branch the revision is of and will not be there when it is trunk.
- *
- * norev000 is for non-releases that are made on systems without
- * subversion or sources that are not a checkout of subversion.
+ * <modified> shows a "M", if the binary is made from modified source code.
  */
 const char _openttd_revision[] = "!!VERSION!!";