From 0274498ee0059410962ef96194074b0fe3a77f0d Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 12 Jan 2013 21:36:40 +0100 Subject: [PATCH] Use TGIT_VERDATE instead of __DATE__ in CrashReport.h Signed-off-by: Sven Strickroth --- src/TGitCache/TGITCache.cpp | 2 +- src/TortoiseGitBlame/TortoiseGitBlame.cpp | 2 +- src/TortoiseMerge/TortoiseMerge.cpp | 2 +- src/TortoiseProc/TortoiseProc.cpp | 2 +- src/TortoiseShell/ShellExt.cpp | 2 +- src/Utils/CrashReport.h | 5 +++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/TGitCache/TGITCache.cpp b/src/TGitCache/TGITCache.cpp index 7394ad597..66aebb699 100644 --- a/src/TGitCache/TGITCache.cpp +++ b/src/TGitCache/TGITCache.cpp @@ -47,7 +47,7 @@ #pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") -CCrashReportTGit crasher(L"TGitCache " _T(APP_X64_STRING), TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD); +CCrashReportTGit crasher(L"TGitCache " _T(APP_X64_STRING), TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD, TGIT_VERDATE); DWORD WINAPI InstanceThread(LPVOID); DWORD WINAPI PipeThread(LPVOID); diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.cpp b/src/TortoiseGitBlame/TortoiseGitBlame.cpp index f862ecf6b..9c46b3149 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlame.cpp +++ b/src/TortoiseGitBlame/TortoiseGitBlame.cpp @@ -55,7 +55,7 @@ END_MESSAGE_MAP() CTortoiseGitBlameApp::CTortoiseGitBlameApp() { SetDllDirectory(L""); - CCrashReportTGit crasher(L"TortoiseGitBlame " _T(APP_X64_STRING), TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD); + CCrashReportTGit crasher(L"TortoiseGitBlame " _T(APP_X64_STRING), TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD, TGIT_VERDATE); CCrashReport::Instance().AddUserInfoToReport(L"CommandLine", GetCommandLine()); EnableHtmlHelp(); diff --git a/src/TortoiseMerge/TortoiseMerge.cpp b/src/TortoiseMerge/TortoiseMerge.cpp index 46e910eed..1eb2bc5e4 100644 --- a/src/TortoiseMerge/TortoiseMerge.cpp +++ b/src/TortoiseMerge/TortoiseMerge.cpp @@ -74,7 +74,7 @@ CTortoiseMergeApp::CTortoiseMergeApp() // The one and only CTortoiseMergeApp object CTortoiseMergeApp theApp; CString sOrigCWD; -CCrashReportTGit g_crasher(L"TortoiseGitMerge " _T(APP_X64_STRING), TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD); +CCrashReportTGit g_crasher(L"TortoiseGitMerge " _T(APP_X64_STRING), TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD, TGIT_VERDATE); CString g_sGroupingUUID; diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp index 8574fa407..8e2a90615 100644 --- a/src/TortoiseProc/TortoiseProc.cpp +++ b/src/TortoiseProc/TortoiseProc.cpp @@ -96,7 +96,7 @@ BOOL CTortoiseProcApp::CheckMsysGitDir() //map.GetFileStatus(_T("D:\\TortoiseGit"),&path, &status); return g_Git.CheckMsysGitDir(); } -CCrashReportTGit crasher(L"TortoiseGit " _T(APP_X64_STRING), TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD); +CCrashReportTGit crasher(L"TortoiseGit " _T(APP_X64_STRING), TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD, TGIT_VERDATE); // CTortoiseProcApp initialization diff --git a/src/TortoiseShell/ShellExt.cpp b/src/TortoiseShell/ShellExt.cpp index eebcd316c..8151e221c 100644 --- a/src/TortoiseShell/ShellExt.cpp +++ b/src/TortoiseShell/ShellExt.cpp @@ -35,7 +35,7 @@ extern ShellObjects g_shellObjects; // *********************** CShellExt ************************* CShellExt::CShellExt(FileState state) - : m_crasher(L"TortoiseGit", TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD, false) + : m_crasher(L"TortoiseGit", TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD, TGIT_VERDATE, false) { m_State = state; diff --git a/src/Utils/CrashReport.h b/src/Utils/CrashReport.h index 2a4d1f23d..4c4dd6dba 100644 --- a/src/Utils/CrashReport.h +++ b/src/Utils/CrashReport.h @@ -1,5 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control +// Copyright (C) 2013 - TortoiseGit // Copyright (C) 2012 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -248,14 +249,14 @@ class CCrashReportTGit public: //! Installs exception handlers to the caller process - CCrashReportTGit(LPCTSTR appname, USHORT versionMajor, USHORT versionMinor, USHORT versionMicro, USHORT versionBuild, bool bOwnProcess = true) + CCrashReportTGit(LPCTSTR appname, USHORT versionMajor, USHORT versionMinor, USHORT versionMicro, USHORT versionBuild, const char * buildDate, bool bOwnProcess = true) : m_nInstallStatus(0) { char s_month[6]; int month, day, year; struct tm t = {0}; static const char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; - sscanf_s(__DATE__, "%s %d %d", s_month, _countof(s_month)-1, &day, &year); + sscanf_s(buildDate, "%s %d %d", s_month, _countof(s_month) - 1, &day, &year); month = (int)((strstr(month_names, s_month)-month_names))/3; t.tm_mon = month; -- 2.11.4.GIT