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
This commit is contained in:
+8
-3
@@ -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/");
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -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_
|
||||
|
||||
+1
-1
@@ -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_
|
||||
|
||||
@@ -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<IPlugin *> m_FailList;
|
||||
CPlugin *pl;
|
||||
SourceHook::List<CPlugin *>::iterator iter;
|
||||
SourceHook::List<CPlugin *> 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<IPlugin *>::iterator _iter;
|
||||
SourceHook::List<CPlugin *>::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
|
||||
{
|
||||
|
||||
@@ -287,6 +287,8 @@ private:
|
||||
bool m_LibraryMissing;
|
||||
CVector<AutoConfig *> m_configs;
|
||||
bool m_bGotAllLoaded;
|
||||
int m_FileVersion;
|
||||
char m_DateTime[256];
|
||||
};
|
||||
|
||||
class CPluginManager :
|
||||
|
||||
Reference in New Issue
Block a user