From 83bf569f144b04be2fa6458a3221cb232c2cf086 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 19 Jan 2020 13:25:16 +0100 Subject: [PATCH] Make it easier to specify additional preview version information in about dialog Signed-off-by: Sven Strickroth --- release.txt | 1 - src/TortoiseProc/AboutDlg.cpp | 6 +++++- src/version.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/release.txt b/release.txt index efbd85cc70..a43df5aee2 100644 --- a/release.txt +++ b/release.txt @@ -4,7 +4,6 @@ This article documents some of the main steps for releasing a new version. * doc/doc.build.include * src/version.h * src/TortoiseGitSetup/VersionNumberInclude.wxi - * For a preview release also make sure to include the yyyymmdd-HASH in src/TortoiseProc/AboutDlg.cpp in "tortoisegitprocpath" * Make sure crash-report is enabled in version.h (but don't commit this change) * For a preview release enable "PREVIEW" in version.h (but don't commit this change) diff --git a/src/TortoiseProc/AboutDlg.cpp b/src/TortoiseProc/AboutDlg.cpp index e2e82a20ca..3e6675d143 100644 --- a/src/TortoiseProc/AboutDlg.cpp +++ b/src/TortoiseProc/AboutDlg.cpp @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2003-2008 - TortoiseSVN -// Copyright (C) 2009-2019 - TortoiseGit +// Copyright (C) 2009-2020 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -98,7 +98,11 @@ BOOL CAboutDlg::OnInitDialog() } CString tortoisegitprocpath; +#if PREVIEW + tortoisegitprocpath.Format(L"(%s; %s)", _T(PREVIEW_INFO), static_cast(CPathUtils::GetAppDirectory().TrimRight(L'\\'))); +#else tortoisegitprocpath.Format(L"(%s)", static_cast(CPathUtils::GetAppDirectory().TrimRight(L'\\'))); +#endif temp.Format(IDS_ABOUTVERSION, TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD, static_cast(tortoisegitprocpath), static_cast(out)); SetDlgItemText(IDC_VERSIONABOUT, Lf2Crlf(temp)); diff --git a/src/version.h b/src/version.h index ccc2e03b1d..e37fb4b454 100644 --- a/src/version.h +++ b/src/version.h @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2019 - TortoiseGit +// Copyright (C) 2008-2020 - TortoiseGit #define FILEVER 2,9,0,0 #define PRODUCTVER FILEVER @@ -20,6 +20,7 @@ #endif #define PREVIEW 0 +#define PREVIEW_INFO "yyyymmdd-hash" /* * TortoiseGit crash handler