Overhauled versioning information (bug 5453, r=dvander).

core/CoreConfig.cpp

@@ -395,7 +395,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 			FILE *fp = fopen(file, "wt");
 			if (fp)
 			{
-				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SM_FULL_VERSION);
+				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SM_VERSION_STRING);
 				fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
 				fprintf(fp, "\n\n");
 

core/Logger.cpp

@@ -149,7 +149,7 @@ void Logger::_NewMapFile()
 	} else {
 		char date[32];
 		strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-		fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SM_FULL_VERSION);
+		fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SM_VERSION_STRING);
 		fclose(fp);
 	}
 }
@@ -362,7 +362,7 @@ void Logger::LogMessage(const char *vafmt, ...)
 			char date[32];
 			m_DailyPrintHdr = false;
 			strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-			fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SM_FULL_VERSION);
+			fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SM_VERSION_STRING);
 	 	}
 		va_list ap;
 		va_start(ap, vafmt);

core/PlayerManager.cpp

@@ -793,7 +793,7 @@ void PlayerManager::OnClientCommand(edict_t *pEntity)
 		}
 
 		ClientConsolePrint(pEntity,
-			"SourceMod %s, by AlliedModders LLC", SM_FULL_VERSION);
+			"SourceMod %s, by AlliedModders LLC", SM_VERSION_STRING);
 		ClientConsolePrint(pEntity,
 			"To see running plugins, type \"sm plugins\"");
 		ClientConsolePrint(pEntity,

core/logic/version.rc

@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SM_FILE_VERSION
- PRODUCTVERSION SM_FILE_VERSION
+ FILEVERSION  SM_VERSION_FILE
+ PRODUCTVERSION SM_VERSION_FILE
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "SourceMod"
             VALUE "FileDescription", "SourceMod Core Logic"
-            VALUE "FileVersion", SM_FULL_VERSION
+            VALUE "FileVersion", SM_VERSION_STRING
             VALUE "InternalName", "sourcemod"
             VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
             VALUE "OriginalFilename", "sourcemod.logic.dll"
             VALUE "ProductName", "SourceMod"
-            VALUE "ProductVersion", SM_FULL_VERSION
+            VALUE "ProductVersion", SM_VERSION_STRING
         END
     END
     BLOCK "VarFileInfo"

core/sm_srvcmds.cpp

@@ -39,7 +39,7 @@
 
 RootConsoleMenu g_RootMenu;
 
-ConVar sourcemod_version("sourcemod_version", SM_FULL_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
+ConVar sourcemod_version("sourcemod_version", SM_VERSION_STRING, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
 
 RootConsoleMenu::RootConsoleMenu()
 {
@@ -339,7 +339,7 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand &
 	else if (strcmp(cmdname, "version") == 0)
 	{
 		ConsolePrint(" SourceMod Version Information:");
-		ConsolePrint("    SourceMod Version: %s", SM_FULL_VERSION);
+		ConsolePrint("    SourceMod Version: %s", SM_VERSION_STRING);
 		ConsolePrint("    SourcePawn Engine: %s (build %s)", g_pSourcePawn2->GetEngineName(), g_pSourcePawn2->GetVersionString());
 		ConsolePrint("    SourcePawn API: v1 = %d, v2 = %d", g_pSourcePawn->GetEngineAPIVersion(), g_pSourcePawn2->GetAPIVersion());
 		ConsolePrint("    Compiled on: %s %s", __DATE__, __TIME__);

core/sourcemm_api.cpp

@@ -145,7 +145,7 @@ const char *SourceMod_Core::GetLicense()
 
 const char *SourceMod_Core::GetVersion()
 {
-	return SM_FULL_VERSION;
+	return SM_VERSION_STRING;
 }
 
 const char *SourceMod_Core::GetDate()

core/version.rc

@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SM_FILE_VERSION
- PRODUCTVERSION SM_FILE_VERSION
+ FILEVERSION  SM_VERSION_FILE
+ PRODUCTVERSION SM_VERSION_FILE
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "SourceMod"
             VALUE "FileDescription", "SourceMod Core"
-            VALUE "FileVersion", SM_FULL_VERSION
+            VALUE "FileVersion", SM_VERSION_STRING
             VALUE "InternalName", "sourcemod"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod"
-            VALUE "ProductVersion", SM_FULL_VERSION
+            VALUE "ProductVersion", SM_VERSION_STRING
         END
     END
     BLOCK "VarFileInfo"