From 1fc5be1cc6f292899e1f65d3084ff816f07e274c Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Sun, 11 Sep 2016 12:36:07 +0100 Subject: [PATCH] Include git hash in version info --- extension/extension.cpp | 9 +++++---- extension/version.h | 4 ++-- product.version | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/extension/extension.cpp b/extension/extension.cpp index 7c31051..ea6eb8e 100644 --- a/extension/extension.cpp +++ b/extension/extension.cpp @@ -53,7 +53,6 @@ char crashGamePath[512]; char crashCommandLine[1024]; char crashSourceModPath[512]; char crashGameDirectory[256]; -char crashExtensionVersion[32]; char steamInf[512]; char dumpStoragePath[512]; @@ -124,7 +123,9 @@ static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, sys_write(extra, "\nGameDirectory=", 15); sys_write(extra, crashGameDirectory, my_strlen(crashGameDirectory)); sys_write(extra, "\nExtensionVersion=", 18); - sys_write(extra, crashExtensionVersion, my_strlen(crashExtensionVersion)); + sys_write(extra, SM_VERSION, my_strlen(SM_VERSION)); + sys_write(extra, "\nExtensionBuild=", 16); + sys_write(extra, SM_BUILD_UNIQUEID, my_strlen(SM_BUILD_UNIQUEID)); sys_write(extra, steamInf, my_strlen(steamInf)); sys_write(extra, "\n-------- CONFIG END --------\n", 30); @@ -280,7 +281,8 @@ static bool dumpCallback(const wchar_t* dump_path, fprintf(extra, "\nCommandLine=%s", crashCommandLine); fprintf(extra, "\nSourceModPath=%s", crashSourceModPath); fprintf(extra, "\nGameDirectory=%s", crashGameDirectory); - fprintf(extra, "\nExtensionVersion=%s", crashExtensionVersion); + fprintf(extra, "\nExtensionVersion=%s", SM_VERSION); + fprintf(extra, "\nExtensionBuild=%s", SM_BUILD_UNIQUEID); fprintf(extra, "%s", steamInf); fprintf(extra, "\n-------- CONFIG END --------\n"); @@ -524,7 +526,6 @@ bool Accelerator::SDK_OnLoad(char *error, size_t maxlength, bool late) strncpy(crashCommandLine, GetCmdLine(), sizeof(crashCommandLine) - 1); strncpy(crashSourceModPath, g_pSM->GetSourceModPath(), sizeof(crashSourceModPath) - 1); strncpy(crashGameDirectory, g_pSM->GetGameFolderName(), sizeof(crashGameDirectory) - 1); - strncpy(crashExtensionVersion, SMEXT_CONF_VERSION, sizeof(crashExtensionVersion) - 1); char steamInfPath[512]; g_pSM->BuildPath(Path_Game, steamInfPath, sizeof(steamInfPath), "steam.inf"); diff --git a/extension/version.h b/extension/version.h index 508faff..ac08ee9 100644 --- a/extension/version.h +++ b/extension/version.h @@ -18,9 +18,9 @@ #define SM_BUILD_TAG "-manual" #define SM_BUILD_UNIQUEID "[MANUAL BUILD]" -#define SM_VERSION "2.3.0" +#define SM_VERSION "2.3.1" #define SM_FULL_VERSION SM_VERSION SM_BUILD_TAG -#define SM_FILE_VERSION 2,3,0,0 +#define SM_FILE_VERSION 2,3,1,0 #endif diff --git a/product.version b/product.version index 276cbf9..2bf1c1c 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -2.3.0 +2.3.1