added dynamic versioning
committed .sln files to a few wayward projects
This commit is contained in:
@ -37,6 +37,7 @@
|
||||
#include "libraries.h"
|
||||
#include "CFlagManager.h"
|
||||
#include "nongpl_matches.h"
|
||||
#include "svn_version.h"
|
||||
|
||||
extern CFlagManager FlagMan;
|
||||
CVector<CAdminData *> DynamicAdmins;
|
||||
@ -593,7 +594,7 @@ static cell AMX_NATIVE_CALL is_user_alive(AMX *amx, cell *params) /* 1 param */
|
||||
|
||||
static cell AMX_NATIVE_CALL get_amxx_verstring(AMX *amx, cell *params) /* 2 params */
|
||||
{
|
||||
return set_amxstring(amx, params[1], AMX_VERSION, params[2]);
|
||||
return set_amxstring(amx, params[1], SVN_VERSION_STRING, params[2]);
|
||||
}
|
||||
|
||||
static cell AMX_NATIVE_CALL get_user_frags(AMX *amx, cell *params) /* 1 param */
|
||||
|
@ -73,7 +73,6 @@
|
||||
|
||||
#define AMXXLOG_Log g_log.Log
|
||||
#define AMXXLOG_Error g_log.LogError
|
||||
#define AMX_VERSION "1.76d"
|
||||
|
||||
extern AMX_NATIVE_INFO core_Natives[];
|
||||
extern AMX_NATIVE_INFO time_Natives[];
|
||||
|
@ -44,6 +44,8 @@
|
||||
#define vsnprintf _vsnprintf
|
||||
#endif
|
||||
|
||||
#include "svn_version.h"
|
||||
|
||||
CLog::CLog()
|
||||
{
|
||||
m_LogType = 0;
|
||||
@ -118,7 +120,7 @@ void CLog::CreateNewFile()
|
||||
ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n");
|
||||
SET_LOCALINFO("amxx_logging", "0");
|
||||
} else {
|
||||
fprintf(fp, "AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")\n", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i, AMX_VERSION);
|
||||
fprintf(fp, "AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")\n", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i, SVN_VERSION_STRING);
|
||||
fclose(fp);
|
||||
}
|
||||
}
|
||||
|
@ -48,13 +48,14 @@
|
||||
#include "amxmod_compat.h"
|
||||
|
||||
#include "CFlagManager.h"
|
||||
#include "svn_version.h"
|
||||
|
||||
|
||||
plugin_info_t Plugin_info =
|
||||
{
|
||||
META_INTERFACE_VERSION, // ifvers
|
||||
"AMX Mod X", // name
|
||||
AMX_VERSION, // version
|
||||
SVN_VERSION_STRING, // version
|
||||
__DATE__, // date
|
||||
"AMX Mod X Dev Team", // author
|
||||
"http://www.amxmodx.org", // url
|
||||
@ -430,7 +431,7 @@ int C_Spawn(edict_t *pent)
|
||||
int loaded = countModules(CountModules_Running); // Call after attachModules so all modules don't have pending stat
|
||||
|
||||
// Set some info about amx version and modules
|
||||
CVAR_SET_STRING(init_amxmodx_version.name, AMX_VERSION);
|
||||
CVAR_SET_STRING(init_amxmodx_version.name, SVN_VERSION_STRING);
|
||||
char buffer[32];
|
||||
sprintf(buffer, "%d", loaded);
|
||||
CVAR_SET_STRING(init_amxmodx_modules.name, buffer);
|
||||
@ -1421,7 +1422,7 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
|
||||
|
||||
// ###### Print short GPL
|
||||
print_srvconsole("\n AMX Mod X version %s Copyright (c) 2004-2006 AMX Mod X Development Team \n"
|
||||
" AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMX_VERSION);
|
||||
" AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", SVN_VERSION_STRING);
|
||||
print_srvconsole(" This is free software and you are welcome to redistribute it under \n"
|
||||
" certain conditions; type 'amxx gpl' for details.\n \n");
|
||||
|
||||
|
@ -608,6 +608,9 @@
|
||||
<File
|
||||
RelativePath="..\sh_tinyhash.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\svn_version.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\zlib\zconf.h">
|
||||
</File>
|
||||
@ -618,6 +621,9 @@
|
||||
<Filter
|
||||
Name="Resource Files"
|
||||
Filter="rc">
|
||||
<File
|
||||
RelativePath="..\svn_version.tpl">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\version.rc">
|
||||
</File>
|
||||
|
@ -4,6 +4,7 @@
|
||||
NONGPL_PLUGIN_T NONGPL_PLUGIN_LIST[] =
|
||||
{
|
||||
{"Live", "CZ Gun Game", "czgungame.amxx"},
|
||||
{"Live", "AMXX Gun Game", "czgungame.amxx"},
|
||||
{NULL, NULL, NULL},
|
||||
};
|
||||
|
||||
|
8
amxmodx/svn_version.h
Normal file
8
amxmodx/svn_version.h
Normal file
@ -0,0 +1,8 @@
|
||||
#ifndef _INCLUDE_SVN_VERSION_H_
|
||||
#define _INCLUDE_SVN_VERSION_H_
|
||||
|
||||
#define SVN_VERSION_STRING "1.8.0.3398"
|
||||
#define SVN_VERSION_DWORD 1,8,0,3398
|
||||
#define SVN_VERSION_PRODUCT "1.8.0"
|
||||
|
||||
#endif //_INCLUDE_SVN_VERSION_H_
|
@ -8,6 +8,7 @@
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#include "winres.h"
|
||||
#include "svn_version.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
@ -27,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,7,6,3387
|
||||
PRODUCTVERSION 1,7,6,3387
|
||||
FILEVERSION SVN_VERSION_DWORD
|
||||
PRODUCTVERSION SVN_VERSION_DWORD
|
||||
FILEFLAGSMASK 0x17L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@ -45,12 +46,12 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "Comments", "AMX Mod X"
|
||||
VALUE "FileDescription", "AMX Mod X"
|
||||
VALUE "FileVersion", "1.76d"
|
||||
VALUE "FileVersion", SVN_VERSION_STRING
|
||||
VALUE "InternalName", "amxmodx"
|
||||
VALUE "LegalCopyright", "Copyright (c) 2004-2006, AMX Mod X Dev Team"
|
||||
VALUE "LegalCopyright", "Copyright (c) 2004-2007, AMX Mod X Dev Team"
|
||||
VALUE "OriginalFilename", "amxmodx_mm.dll"
|
||||
VALUE "ProductName", "AMX Mod X"
|
||||
VALUE "ProductVersion", "1.76d"
|
||||
VALUE "ProductVersion", SVN_VERSION_PRODUCT
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
Reference in New Issue
Block a user