From 2c94b1268a5017bac227e4200c8259c088d7be88 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 2 Jun 2008 05:03:27 +0000 Subject: [PATCH] phase0, new versioning. we don't use build numbers anymore except (VS_VERSIONINFO stays until phase 3 is done) --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402242 --- core/sm_srvcmds.cpp | 11 ++-- core/sm_version.h | 4 +- core/sm_version.tpl | 2 +- core/systems/PluginSys.cpp | 64 +++++++++++++++++++---- core/systems/PluginSys.h | 2 + extensions/bintools/sdk/smsdk_config.h | 2 +- extensions/bintools/svn_version.h | 4 +- extensions/bintools/svn_version.tpl | 2 +- extensions/clientprefs/sdk/smsdk_config.h | 2 +- extensions/clientprefs/svn_version.h | 6 +-- extensions/clientprefs/svn_version.tpl | 2 +- extensions/cstrike/sdk/smsdk_config.h | 2 +- extensions/cstrike/svn_version.h | 4 +- extensions/cstrike/svn_version.tpl | 2 +- extensions/geoip/sdk/smsdk_config.h | 2 +- extensions/geoip/svn_version.h | 4 +- extensions/geoip/svn_version.tpl | 2 +- extensions/mysql/sdk/smsdk_config.h | 2 +- extensions/mysql/svn_version.h | 4 +- extensions/mysql/svn_version.tpl | 2 +- extensions/regex/sdk/smsdk_config.h | 2 +- extensions/regex/svn_version.h | 4 +- extensions/regex/svn_version.tpl | 2 +- extensions/sdktools/sdk/smsdk_config.h | 2 +- extensions/sdktools/svn_version.h | 4 +- extensions/sdktools/svn_version.tpl | 2 +- extensions/sqlite/sdk/smsdk_config.h | 2 +- extensions/sqlite/svn_version.h | 4 +- extensions/sqlite/svn_version.tpl | 2 +- extensions/tf2/sdk/smsdk_config.h | 2 +- extensions/tf2/svn_version.h | 4 +- extensions/tf2/svn_version.tpl | 2 +- extensions/topmenus/sdk/smsdk_config.h | 4 +- extensions/topmenus/svn_version.h | 4 +- extensions/topmenus/svn_version.tpl | 2 +- loader/svn_version.h | 4 +- loader/svn_version.tpl | 2 +- plugins/include/core.inc | 8 ++- plugins/include/version.inc | 2 +- plugins/include/version.tpl | 2 +- sourcepawn/compiler/svn_version.h | 4 +- sourcepawn/compiler/svn_version.tpl | 2 +- sourcepawn/jit/x86/jit_version.h | 4 +- sourcepawn/jit/x86/jit_version.tpl | 2 +- 44 files changed, 127 insertions(+), 70 deletions(-) diff --git a/core/sm_srvcmds.cpp b/core/sm_srvcmds.cpp index 957d4ff1..7df5e42e 100644 --- a/core/sm_srvcmds.cpp +++ b/core/sm_srvcmds.cpp @@ -268,17 +268,22 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand & ConsolePrint(" SourceMod was developed by AlliedModders, LLC."); ConsolePrint(" Development would not have been possible without the following people:"); ConsolePrint(" David \"BAILOPAN\" Anderson, lead developer"); - ConsolePrint(" Borja \"faluco\" Ferrer, Core developer"); - ConsolePrint(" Scott \"Damaged Soul\" Ehlert, Core developer"); + ConsolePrint(" Borja \"faluco\" Ferrer, core developer"); + ConsolePrint(" Scott \"Damaged Soul\" Ehlert, core developer"); + ConsolePrint(" Matt \"pRED\" Woodrow, core developer"); + ConsolePrint(" Michael \"ferret\" McKoy, plugin developer"); ConsolePrint(" Pavol \"PM OnoTo\" Marko, SourceHook developer"); ConsolePrint(" Special thanks to Viper of GameConnect"); ConsolePrint(" Special thanks to Mani of Mani-Admin-Plugin"); ConsolePrint(" http://www.sourcemod.net/"); - } else if (strcmp(cmdname, "version") == 0) { + } + else if (strcmp(cmdname, "version") == 0) + { ConsolePrint(" SourceMod Version Information:"); ConsolePrint(" SourceMod Version: %s", SVN_FULL_VERSION); ConsolePrint(" JIT Version: %s, %s", g_pVM->GetVMName(), g_pVM->GetVersionString()); ConsolePrint(" JIT Settings: %s", g_pVM->GetCPUOptimizations()); + ConsolePrint(" Compiled on: %s %s", __DATE__, __TIME__); ConsolePrint(" http://www.sourcemod.net/"); } } diff --git a/core/sm_version.h b/core/sm_version.h index 5e1eaf90..f27adc00 100644 --- a/core/sm_version.h +++ b/core/sm_version.h @@ -40,7 +40,7 @@ * @file Contains SourceMod version information. */ -#define SVN_FULL_VERSION "1.1.0.1995" -#define SVN_FILE_VERSION 1,1,0,1995 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/core/sm_version.tpl b/core/sm_version.tpl index c9d0c6a3..4c92c985 100644 --- a/core/sm_version.tpl +++ b/core/sm_version.tpl @@ -40,7 +40,7 @@ * @file Contains SourceMod version information. */ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/core/systems/PluginSys.cpp b/core/systems/PluginSys.cpp index c6177c3c..5e0f439c 100644 --- a/core/systems/PluginSys.cpp +++ b/core/systems/PluginSys.cpp @@ -373,6 +373,36 @@ void CPlugin::UpdateInfo() m_info.name = m_info.name ? m_info.name : ""; m_info.url = m_info.url ? m_info.url : ""; m_info.version = m_info.version ? m_info.version : ""; + + if ((err = base->FindPubvarByName("__version", &idx)) == SP_ERROR_NONE) + { + struct __version_info + { + cell_t version; + cell_t filevers; + cell_t date; + cell_t time; + }; + __version_info *info; + cell_t local_addr; + const char *pDate, *pTime; + + pDate = ""; + pTime = ""; + + base->GetPubvarAddrs(idx, &local_addr, (cell_t **)&info); + m_FileVersion = info->version; + if (m_FileVersion >= 3) + { + base->LocalToString(info->date, (char **)&pDate); + base->LocalToString(info->time, (char **)&pTime); + UTIL_Format(m_DateTime, sizeof(m_DateTime), "%s %s", pDate, pTime); + } + } + else + { + m_FileVersion = 0; + } } void CPlugin::Call_OnPluginStart() @@ -2034,12 +2064,13 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c g_RootMenu.ConsolePrint("[SM] Listing %d plugin%s:", GetPluginCount(), (plnum > 1) ? "s" : ""); } - SourceHook::List m_FailList; + CPlugin *pl; + SourceHook::List::iterator iter; + SourceHook::List m_FailList; - IPluginIterator *iter = GetPluginIterator(); - for (; iter->MorePlugins(); iter->NextPlugin(), id++) + for (iter = m_plugins.begin(); iter != m_plugins.end(); iter++) { - IPlugin *pl = iter->GetPlugin(); + pl = (*iter); assert(pl->GetStatus() != Plugin_Created); int len = 0; const sm_plugininfo_t *info = pl->GetPublicInfo(); @@ -2069,13 +2100,11 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c g_RootMenu.ConsolePrint("%s", buffer); } - iter->Release(); - if (!m_FailList.empty()) { g_RootMenu.ConsolePrint("Load Errors:"); - SourceHook::List::iterator _iter; + SourceHook::List::iterator _iter; CPlugin *pl; @@ -2272,8 +2301,21 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c } else { - g_RootMenu.ConsolePrint(" Debugging: %s", pl->IsDebugging() ? "Yes" : "No"); - g_RootMenu.ConsolePrint(" Running: %s", pl->GetStatus() == Plugin_Running ? "Yes" : "No"); + if (pl->GetStatus() == Plugin_Running) + { + if (pl->IsDebugging()) + { + g_RootMenu.ConsolePrint(" Status: running, debugging"); + } + else + { + g_RootMenu.ConsolePrint(" Status: running"); + } + } + else + { + g_RootMenu.ConsolePrint(" Status: not running"); + } const char *typestr = ""; switch (pl->GetType()) @@ -2292,6 +2334,10 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c g_RootMenu.ConsolePrint(" Reloads: %s", typestr); } + if (pl->m_FileVersion >= 3) + { + g_RootMenu.ConsolePrint(" Timestamp: %s", pl->m_DateTime); + } } else { diff --git a/core/systems/PluginSys.h b/core/systems/PluginSys.h index ff0bca9d..7e79871a 100644 --- a/core/systems/PluginSys.h +++ b/core/systems/PluginSys.h @@ -287,6 +287,8 @@ private: bool m_LibraryMissing; CVector m_configs; bool m_bGotAllLoaded; + int m_FileVersion; + char m_DateTime[256]; }; class CPluginManager : diff --git a/extensions/bintools/sdk/smsdk_config.h b/extensions/bintools/sdk/smsdk_config.h index f706d6dd..760ef3ef 100644 --- a/extensions/bintools/sdk/smsdk_config.h +++ b/extensions/bintools/sdk/smsdk_config.h @@ -46,7 +46,7 @@ #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "SAMPLE" #define SMEXT_CONF_LICENSE "GPL" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/bintools/svn_version.h b/extensions/bintools/svn_version.h index bbf78ce0..854d4885 100644 --- a/extensions/bintools/svn_version.h +++ b/extensions/bintools/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_BINTOOLS_VERSION_H_ #define _INCLUDE_BINTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1971" -#define SVN_FILE_VERSION 1,1,0,1971 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_BINTOOLS_VERSION_H_ diff --git a/extensions/bintools/svn_version.tpl b/extensions/bintools/svn_version.tpl index 300ade1f..e3c41e25 100644 --- a/extensions/bintools/svn_version.tpl +++ b/extensions/bintools/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_BINTOOLS_VERSION_H_ #define _INCLUDE_BINTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_BINTOOLS_VERSION_H_ diff --git a/extensions/clientprefs/sdk/smsdk_config.h b/extensions/clientprefs/sdk/smsdk_config.h index e46ba2c7..d50fe64a 100644 --- a/extensions/clientprefs/sdk/smsdk_config.h +++ b/extensions/clientprefs/sdk/smsdk_config.h @@ -47,7 +47,7 @@ #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "CLIENTPREFS" #define SMEXT_CONF_LICENSE "GPL" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/clientprefs/svn_version.h b/extensions/clientprefs/svn_version.h index e7ff7336..2fb0d028 100644 --- a/extensions/clientprefs/svn_version.h +++ b/extensions/clientprefs/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_CLIENTPREFS_VERSION_H_ #define _INCLUDE_CLIENTPREFS_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1982" -#define SVN_FILE_VERSION 1,1,0,1982 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 -#endif //_INCLUDE_SDKTOOLS_VERSION_H_ +#endif //_INCLUDE_CLIENTPREFS_VERSION_H_ diff --git a/extensions/clientprefs/svn_version.tpl b/extensions/clientprefs/svn_version.tpl index 5e0b031a..3ceaee29 100644 --- a/extensions/clientprefs/svn_version.tpl +++ b/extensions/clientprefs/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_CLIENTPREFS_VERSION_H_ #define _INCLUDE_CLIENTPREFS_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_CLIENTPREFS_VERSION_H_ diff --git a/extensions/cstrike/sdk/smsdk_config.h b/extensions/cstrike/sdk/smsdk_config.h index c3b6081a..d3860fa2 100644 --- a/extensions/cstrike/sdk/smsdk_config.h +++ b/extensions/cstrike/sdk/smsdk_config.h @@ -47,7 +47,7 @@ #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "CSTRIKE" #define SMEXT_CONF_LICENSE "GPL" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/cstrike/svn_version.h b/extensions/cstrike/svn_version.h index 465e6da5..d6f5a842 100644 --- a/extensions/cstrike/svn_version.h +++ b/extensions/cstrike/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1971" -#define SVN_FILE_VERSION 1,1,0,1971 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/cstrike/svn_version.tpl b/extensions/cstrike/svn_version.tpl index 70dd13de..3377580d 100644 --- a/extensions/cstrike/svn_version.tpl +++ b/extensions/cstrike/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/geoip/sdk/smsdk_config.h b/extensions/geoip/sdk/smsdk_config.h index dbe2ad2c..aeb9b32f 100644 --- a/extensions/geoip/sdk/smsdk_config.h +++ b/extensions/geoip/sdk/smsdk_config.h @@ -46,7 +46,7 @@ #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "GEOIP" #define SMEXT_CONF_LICENSE "GPL" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/geoip/svn_version.h b/extensions/geoip/svn_version.h index eb58df93..f8f754ad 100644 --- a/extensions/geoip/svn_version.h +++ b/extensions/geoip/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_GEOIP_VERSION_H_ #define _INCLUDE_GEOIP_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1971" -#define SVN_FILE_VERSION 1,1,0,1971 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_GEOIP_VERSION_H_ diff --git a/extensions/geoip/svn_version.tpl b/extensions/geoip/svn_version.tpl index e63e84f9..d2d1d844 100644 --- a/extensions/geoip/svn_version.tpl +++ b/extensions/geoip/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_GEOIP_VERSION_H_ #define _INCLUDE_GEOIP_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_GEOIP_VERSION_H_ diff --git a/extensions/mysql/sdk/smsdk_config.h b/extensions/mysql/sdk/smsdk_config.h index d5bb8c44..48ac2c2a 100644 --- a/extensions/mysql/sdk/smsdk_config.h +++ b/extensions/mysql/sdk/smsdk_config.h @@ -47,7 +47,7 @@ #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "MYSQL" #define SMEXT_CONF_LICENSE "GPL" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/mysql/svn_version.h b/extensions/mysql/svn_version.h index 783b1e6b..bd9797b5 100644 --- a/extensions/mysql/svn_version.h +++ b/extensions/mysql/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_MYSQLEXT_VERSION_H_ #define _INCLUDE_MYSQLEXT_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1971" -#define SVN_FILE_VERSION 1,1,0,1971 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_MYSQLEXT_VERSION_H_ diff --git a/extensions/mysql/svn_version.tpl b/extensions/mysql/svn_version.tpl index c6767e37..71e37adb 100644 --- a/extensions/mysql/svn_version.tpl +++ b/extensions/mysql/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_MYSQLEXT_VERSION_H_ #define _INCLUDE_MYSQLEXT_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_MYSQLEXT_VERSION_H_ diff --git a/extensions/regex/sdk/smsdk_config.h b/extensions/regex/sdk/smsdk_config.h index 294cd992..719ed0c7 100644 --- a/extensions/regex/sdk/smsdk_config.h +++ b/extensions/regex/sdk/smsdk_config.h @@ -47,7 +47,7 @@ #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "REGEX" #define SMEXT_CONF_LICENSE "GPL" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/regex/svn_version.h b/extensions/regex/svn_version.h index e3b80bba..7bd120c9 100644 --- a/extensions/regex/svn_version.h +++ b/extensions/regex/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_REGEXEXT_VERSION_H_ #define _INCLUDE_REGEXEXT_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1994" -#define SVN_FILE_VERSION 1,1,0,1994 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_REGEXEXT_VERSION_H_ diff --git a/extensions/regex/svn_version.tpl b/extensions/regex/svn_version.tpl index 1913ce6b..3cbf9f19 100644 --- a/extensions/regex/svn_version.tpl +++ b/extensions/regex/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_REGEXEXT_VERSION_H_ #define _INCLUDE_REGEXEXT_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_REGEXEXT_VERSION_H_ diff --git a/extensions/sdktools/sdk/smsdk_config.h b/extensions/sdktools/sdk/smsdk_config.h index 3f41c1fe..c4b14539 100644 --- a/extensions/sdktools/sdk/smsdk_config.h +++ b/extensions/sdktools/sdk/smsdk_config.h @@ -47,7 +47,7 @@ #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "SDKTOOLS" #define SMEXT_CONF_LICENSE "GPL" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/sdktools/svn_version.h b/extensions/sdktools/svn_version.h index 9894f582..42146034 100644 --- a/extensions/sdktools/svn_version.h +++ b/extensions/sdktools/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1982" -#define SVN_FILE_VERSION 1,1,0,1982 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/sdktools/svn_version.tpl b/extensions/sdktools/svn_version.tpl index 6f19f7c2..2b1e90f2 100644 --- a/extensions/sdktools/svn_version.tpl +++ b/extensions/sdktools/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/sqlite/sdk/smsdk_config.h b/extensions/sqlite/sdk/smsdk_config.h index a8823b81..8911183b 100644 --- a/extensions/sqlite/sdk/smsdk_config.h +++ b/extensions/sqlite/sdk/smsdk_config.h @@ -47,7 +47,7 @@ #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "SQLITE" #define SMEXT_CONF_LICENSE "GPL" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/sqlite/svn_version.h b/extensions/sqlite/svn_version.h index 6cd85684..0b1f7aab 100644 --- a/extensions/sqlite/svn_version.h +++ b/extensions/sqlite/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1971" -#define SVN_FILE_VERSION 1,1,0,1971 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/extensions/sqlite/svn_version.tpl b/extensions/sqlite/svn_version.tpl index 5d82ae52..6d073779 100644 --- a/extensions/sqlite/svn_version.tpl +++ b/extensions/sqlite/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/extensions/tf2/sdk/smsdk_config.h b/extensions/tf2/sdk/smsdk_config.h index 990d9b05..a9d6638c 100644 --- a/extensions/tf2/sdk/smsdk_config.h +++ b/extensions/tf2/sdk/smsdk_config.h @@ -47,7 +47,7 @@ #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "TF2" #define SMEXT_CONF_LICENSE "GPL" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/tf2/svn_version.h b/extensions/tf2/svn_version.h index b1eff81c..fc92bcd4 100644 --- a/extensions/tf2/svn_version.h +++ b/extensions/tf2/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1993" -#define SVN_FILE_VERSION 1,1,0,1993 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/tf2/svn_version.tpl b/extensions/tf2/svn_version.tpl index 277f9f2b..d8f49c12 100644 --- a/extensions/tf2/svn_version.tpl +++ b/extensions/tf2/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_SDKTOOLS_VERSION_H_ diff --git a/extensions/topmenus/sdk/smsdk_config.h b/extensions/topmenus/sdk/smsdk_config.h index 078aca75..c119c5a7 100644 --- a/extensions/topmenus/sdk/smsdk_config.h +++ b/extensions/topmenus/sdk/smsdk_config.h @@ -45,9 +45,9 @@ #define SMEXT_CONF_VERSION SVN_FULL_VERSION #define SMEXT_CONF_AUTHOR "AlliedModders" #define SMEXT_CONF_URL "http://www.sourcemod.net/" -#define SMEXT_CONF_LOGTAG "MAINMENU" +#define SMEXT_CONF_LOGTAG "TOPMENUS" #define SMEXT_CONF_LICENSE "GPLv3" -#define SMEXT_CONF_DATESTRING __DATE__ +#define SMEXT_CONF_DATESTRING __DATE__ " " __TIME__ /** * @brief Exposes plugin's main interface. diff --git a/extensions/topmenus/svn_version.h b/extensions/topmenus/svn_version.h index cf0fc49d..95d62964 100644 --- a/extensions/topmenus/svn_version.h +++ b/extensions/topmenus/svn_version.h @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1971" -#define SVN_FILE_VERSION 1,1,0,1971 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/extensions/topmenus/svn_version.tpl b/extensions/topmenus/svn_version.tpl index cbde3411..86ee8200 100644 --- a/extensions/topmenus/svn_version.tpl +++ b/extensions/topmenus/svn_version.tpl @@ -36,7 +36,7 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_SQLITEEXT_VERSION_H_ diff --git a/loader/svn_version.h b/loader/svn_version.h index 5e1eaf90..f27adc00 100644 --- a/loader/svn_version.h +++ b/loader/svn_version.h @@ -40,7 +40,7 @@ * @file Contains SourceMod version information. */ -#define SVN_FULL_VERSION "1.1.0.1995" -#define SVN_FILE_VERSION 1,1,0,1995 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2230 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/loader/svn_version.tpl b/loader/svn_version.tpl index c9d0c6a3..4c92c985 100644 --- a/loader/svn_version.tpl +++ b/loader/svn_version.tpl @@ -40,7 +40,7 @@ * @file Contains SourceMod version information. */ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$ #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/plugins/include/core.inc b/plugins/include/core.inc index b64de197..5ad7bcb5 100644 --- a/plugins/include/core.inc +++ b/plugins/include/core.inc @@ -37,11 +37,13 @@ #include -#define SOURCEMOD_PLUGINAPI_VERSION 2 +#define SOURCEMOD_PLUGINAPI_VERSION 3 struct PlVers { version, String:filevers[], + String:date[], + String:time[] }; /** @@ -76,7 +78,9 @@ enum Identity public PlVers:__version = { version = SOURCEMOD_PLUGINAPI_VERSION, - filevers = SOURCEMOD_VERSION + filevers = SOURCEMOD_VERSION, + date = __DATE__, + time = __TIME__ }; /** diff --git a/plugins/include/version.inc b/plugins/include/version.inc index 9874043b..8bfa4e70 100644 --- a/plugins/include/version.inc +++ b/plugins/include/version.inc @@ -39,4 +39,4 @@ #define SOURCEMOD_V_MINOR 1 /**< SourceMod Minor version */ #define SOURCEMOD_V_RELEASE 0 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.1.0.1995" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.1.0-svn" /**< SourceMod version string (major.minor.release.build) */ diff --git a/plugins/include/version.tpl b/plugins/include/version.tpl index 28e8d0e0..f9a7db36 100644 --- a/plugins/include/version.tpl +++ b/plugins/include/version.tpl @@ -39,4 +39,4 @@ #define SOURCEMOD_V_MINOR $PMINOR$ /**< SourceMod Minor version */ #define SOURCEMOD_V_RELEASE $PREVISION$ /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" /**< SourceMod version string (major.minor.release.build) */ diff --git a/sourcepawn/compiler/svn_version.h b/sourcepawn/compiler/svn_version.h index 6246599c..1bb31b24 100644 --- a/sourcepawn/compiler/svn_version.h +++ b/sourcepawn/compiler/svn_version.h @@ -19,7 +19,7 @@ * @file Contains SourceMod version information. */ -#define SVN_FULL_VERSION "1.1.0.1992" -#define SVN_FILE_VERSION 1,1,0,1992 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2139 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/sourcepawn/compiler/svn_version.tpl b/sourcepawn/compiler/svn_version.tpl index fab83d15..c74e8570 100644 --- a/sourcepawn/compiler/svn_version.tpl +++ b/sourcepawn/compiler/svn_version.tpl @@ -19,7 +19,7 @@ * @file Contains SourceMod version information. */ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$LOCAL_BUILD$ #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/sourcepawn/jit/x86/jit_version.h b/sourcepawn/jit/x86/jit_version.h index 8e8b00a5..d4dbade0 100644 --- a/sourcepawn/jit/x86/jit_version.h +++ b/sourcepawn/jit/x86/jit_version.h @@ -16,7 +16,7 @@ #ifndef _INCLUDE_JIT_VERSION_H_ #define _INCLUDE_JIT_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0.1971" -#define SVN_FILE_VERSION 1,1,0,1971 +#define SVN_FULL_VERSION "1.1.0-svn" +#define SVN_FILE_VERSION 1,1,0,2218 #endif //_INCLUDE_JIT_VERSION_H_ diff --git a/sourcepawn/jit/x86/jit_version.tpl b/sourcepawn/jit/x86/jit_version.tpl index ec873f89..a955cd86 100644 --- a/sourcepawn/jit/x86/jit_version.tpl +++ b/sourcepawn/jit/x86/jit_version.tpl @@ -16,7 +16,7 @@ #ifndef _INCLUDE_JIT_VERSION_H_ #define _INCLUDE_JIT_VERSION_H_ -#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$" +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$-svn" #define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$LOCAL_BUILD$ #endif //_INCLUDE_JIT_VERSION_H_