UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Asher Baker 2012-08-26 01:33:54 +01:00
parent a62aeb36d8
commit bf76be5dfa
42 changed files with 157 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/CoreConfig.cpp
View File

@ -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");

4
core/Logger.cpp
View File

@ -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);

2
core/PlayerManager.cpp
View File

@ -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,

8
core/logic/version.rc
View File

@ -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"

4
core/sm_srvcmds.cpp
View File

@ -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__);

2
core/sourcemm_api.cpp
View File

@ -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()

8
core/version.rc
View File

@ -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"

2
extensions/bintools/extension.cpp
View File

@ -61,7 +61,7 @@ bool BinTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
const char *BinTools::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *BinTools::GetExtensionDateString()

8
extensions/bintools/version.rc
View File

@ -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", "BinTools Extension"
VALUE "FileDescription", "SourceMod BinTools Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod BinTools Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod BinTools Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/clientprefs/extension.cpp
View File

@ -485,7 +485,7 @@ IdentityToken_t *ClientPrefs::GetIdentity() const
const char *ClientPrefs::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *ClientPrefs::GetExtensionDateString()

8
extensions/clientprefs/version.rc
View File

@ -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", "Client Preferences Extension"
VALUE "FileDescription", "SourceMod Client Preferences Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod Client Preferences Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod Client Preferences Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/cstrike/extension.cpp
View File

@ -283,7 +283,7 @@ bool CStrike::ProcessCommandTarget(cmd_target_info_t *info)
const char *CStrike::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *CStrike::GetExtensionDateString()

8
extensions/cstrike/version.rc
View File

@ -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 CS:S Extension"
VALUE "FileDescription", "SourceMod CS:S Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod CS:S Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod CS:S Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/curl/extension.cpp
View File

@ -78,7 +78,7 @@ void CurlExt::SDK_OnUnload()
const char *CurlExt::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *CurlExt::GetExtensionDateString()

8
extensions/curl/version.rc
View File

@ -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", "Webternet Extension"
VALUE "FileDescription", "SourceMod Webternet Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod Webternet Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod Webternet Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/geoip/extension.cpp
View File

@ -70,7 +70,7 @@ void GeoIP_Extension::SDK_OnUnload()
const char *GeoIP_Extension::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *GeoIP_Extension::GetExtensionDateString()

8
extensions/geoip/version.rc
View File

@ -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", "GeoIP Extension"
VALUE "FileDescription", "SourceMod GeoIP Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod GeoIP Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod GeoIP Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/mysql/extension.cpp
View File

@ -62,7 +62,7 @@ void DBI_MySQL::SDK_OnUnload()
const char *DBI_MySQL::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *DBI_MySQL::GetExtensionDateString()

8
extensions/mysql/version.rc
View File

@ -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", "MySQL Extension"
VALUE "FileDescription", "SourceMod MySQL Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod MySQL Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod MySQL Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/regex/extension.cpp
View File

@ -65,7 +65,7 @@ void RegexExtension::SDK_OnUnload()
const char *RegexExtension::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *RegexExtension::GetExtensionDateString()

8
extensions/regex/version.rc
View File

@ -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 Regular Expression Extension"
VALUE "FileDescription", "SourceMod Regular Expression Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod Regular Expression Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod Regular Expression Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/sdktools/extension.cpp
View File

@ -428,7 +428,7 @@ bool SDKTools::ProcessCommandTarget(cmd_target_info_t *info)
const char *SDKTools::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *SDKTools::GetExtensionDateString()

8
extensions/sdktools/version.rc
View File

@ -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", "SDKTools Extension"
VALUE "FileDescription", "SourceMod SDKTools Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod SDKTools Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod SDKTools Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/sqlite/extension.cpp
View File

@ -74,7 +74,7 @@ size_t UTIL_Format(char *buffer, size_t maxlength, const char *fmt, ...)
const char *SqliteExt::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *SqliteExt::GetExtensionDateString()

8
extensions/sqlite/version.rc
View File

@ -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", "SQLite Extension"
VALUE "FileDescription", "SourceMod SQLite Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod SQLite Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod SQLite Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/tf2/extension.cpp
View File

@ -133,7 +133,7 @@ bool TF2Tools::SDK_OnLoad(char *error, size_t maxlength, bool late)
const char *TF2Tools::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *TF2Tools::GetExtensionDateString()

8
extensions/tf2/version.rc
View File

@ -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 TF2 Extension"
VALUE "FileDescription", "SourceMod TF2 Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod TF2 Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod TF2 Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

2
extensions/topmenus/extension.cpp
View File

@ -67,7 +67,7 @@ void TopMenuExtension::SDK_OnUnload()
const char *TopMenuExtension::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *TopMenuExtension::GetExtensionDateString()

8
extensions/topmenus/version.rc
View File

@ -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", "TopMenus Extension"
VALUE "FileDescription", "SourceMod TopMenus Extension"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "SourceMod TopMenus Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod TopMenus Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

3
extensions/updater/Updater.cpp
View File

@ -356,8 +356,7 @@ void UpdateReader::PerformUpdate(const char *url)
xfer = webternet->CreateSession();
xfer->SetFailOnHTTPError(true);
form->AddString("version", SM_FULL_VERSION);
form->AddString("build", SM_BUILD_UNIQUEID);
form->AddString("version", SM_VERSION_STRING);
unsigned int num_files = 0;
add_folders(form, "gamedata", num_files);

2
extensions/updater/extension.cpp
View File

@ -249,7 +249,7 @@ void AddUpdateError(const char *fmt, ...)
const char *SmUpdater::GetExtensionVerString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
const char *SmUpdater::GetExtensionDateString()

8
extensions/updater/version.rc
View File

@ -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", "Automatic Updater"
VALUE "FileDescription", "SourceMod Automatic Updater"
VALUE "FileVersion", SM_FILE_VERSION
VALUE "FileVersion", SM_VERSION_FILE
VALUE "InternalName", "SourceMod Updater Extension"
VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
VALUE "OriginalFilename", BINARY_NAME
VALUE "ProductName", "SourceMod Updater Extension"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

8
loader/version.rc
View File

@ -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 Loader"
VALUE "FileDescription", "SourceMod Loader"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "sourcemod"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", "sourcemod_mm.dll"
VALUE "ProductName", "SourceMod Loader"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

7
plugins/AMBuilder
View File

@ -36,15 +36,18 @@ spcomp = os.path.join(AMBuild.outputFolder, 'spcomp', 'spcomp')
includes = os.path.relpath(os.path.join(AMBuild.sourceFolder, 'plugins', 'include'),
os.path.join(AMBuild.outputFolder, 'plugins'))
versioninc = os.path.relpath(os.path.join(AMBuild.outputFolder, 'includes'),
os.path.join(AMBuild.outputFolder, 'plugins'))
#This one has to be special
sp = os.path.join(AMBuild.sourceFolder, 'plugins', 'admin-flatfile', 'admin-flatfile.sp')
args = [spcomp, '-i' + includes, sp]
args = [spcomp, 'SM_GENERATED_BUILD=', '-i' + versioninc, '-i' + includes, sp]
plugins.AddCommand(command.DirectCommand(args))
#Do the normal ones
for file in files:
sp = os.path.join(AMBuild.sourceFolder, 'plugins', file)
args = [spcomp, '-i' + includes, sp]
args = [spcomp, 'SM_GENERATED_BUILD=', '-i' + versioninc, '-i' + includes, sp]
plugins.AddCommand(command.DirectCommand(args))

9
plugins/include/version.inc
View File

@ -35,8 +35,15 @@
#endif
#define _version_included
#if defined SM_GENERATED_BUILD
#include <version_auto>
#else
#define SOURCEMOD_V_TAG "manual"
#define SOURCEMOD_V_REV 0
#define SOURCEMOD_V_CSET "0"
#define SOURCEMOD_V_MAJOR 1 /**< SourceMod Major version */
#define SOURCEMOD_V_MINOR 5 /**< SourceMod Minor version */
#define SOURCEMOD_V_RELEASE 0 /**< SourceMod Release version */
#define SOURCEMOD_VERSION "1.5.0-dev" /**< SourceMod version string (major.minor.release.build) */
#define SOURCEMOD_VERSION "1.5.0-manual" /**< SourceMod version string (major.minor.release.build) */
#endif

15
public/sourcemod_version.h
View File

@ -41,10 +41,17 @@
#if defined SM_GENERATED_BUILD
#include <sourcemod_version_auto.h>
#else
#define SM_BUILD_STRING "-pdev"
#define SM_BUILD_UNIQUEID "2650:5d34bc3edbfa" SM_BUILD_STRING
#define SM_FULL_VERSION "1.3.0" SM_BUILD_STRING
#define SM_FILE_VERSION 1,3,0,0
#define SM_BUILD_TAG "manual"
#define SM_BUILD_REV "0"
#define SM_BUILD_CSET "0"
#define SM_BUILD_MAJOR "1"
#define SM_BUILD_MINOR "5"
#define SM_BUILD_RELEASE "0"
#define SM_BUILD_UNIQUEID SM_BUILD_REV ":" SM_BUILD_CSET
#define SM_VERSION_STRING SM_BUILD_MAJOR "." SM_BUILD_MINOR "." SM_BUILD_RELEASE "-" SM_BUILD_TAG
#define SM_VERSION_FILE 1,5,0,0
#endif
#define SM_BUILD_TIMESTAMP __DATE__ " " __TIME__

5
sourcepawn/compiler/AMBuilder
View File

@ -61,8 +61,11 @@ if AMBuild.target['platform'] == 'linux':
binary.AddSourceFiles('sourcepawn/compiler', files)
if AMBuild.target['platform'] == 'windows':
env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"']}
env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'SM_GENERATED_BUILD']}
binary.AddResourceFile('sourcepawn/compiler/libpawnc.rc', env)
elif AMBuild.target['platform'] == 'darwin' and isinstance(binary, Cpp.LibraryBuilder):
binary.compiler['POSTLINKFLAGS'].extend(['-compatibility_version', '1.0.0'])
binary.compiler['POSTLINKFLAGS'].extend(['-current_version', AMBuild.cache['version']])
binary.SendToJob()

8
sourcepawn/compiler/libpawnc.rc
View File

@ -19,8 +19,8 @@ AppIcon ICON "pawn.ico"
#define VERSIONPRODUCTNAME "smcomp\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION SM_FILE_VERSION
PRODUCTVERSION SM_FILE_VERSION
FILEVERSION SM_VERSION_FILE
PRODUCTVERSION SM_VERSION_FILE
FILEFLAGSMASK 0x0000003FL
FILEFLAGS 0
#if defined(WIN32)
@ -36,12 +36,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
VALUE "FileDescription", VERSIONDESCRIPTION
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", VERSIONNAME
VALUE "LegalCopyright", "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
VALUE "OriginalFilename", VERSIONNAME
VALUE "ProductName", VERSIONPRODUCTNAME
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END

2
sourcepawn/compiler/sc1.c
View File

@ -1233,7 +1233,7 @@ static void setconfig(char *root)
static void setcaption(void)
{
pc_printf("SourcePawn Compiler " SM_FULL_VERSION "\n");
pc_printf("SourcePawn Compiler " SM_VERSION_STRING "\n");
pc_printf("Copyright (c) 1997-2006, ITB CompuPhase, (C)2004-2008 AlliedModders, LLC\n\n");
}

2
sourcepawn/jit/engine2.cpp
View File

@ -149,7 +149,7 @@ const char *SourcePawnEngine2::GetEngineName()
const char *SourcePawnEngine2::GetVersionString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
IProfiler *SourcePawnEngine2::GetProfiler()

8
sourcepawn/jit/version.rc
View File

@ -28,8 +28,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
@ -46,12 +46,12 @@ BEGIN
BEGIN
VALUE "Comments", "SourcePawn JIT"
VALUE "FileDescription", "SourcePawn JIT/Virtual Machine"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "sourcemod"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", "sourcepawn.jit.x86.dll"
VALUE "ProductName", "SourcePawn JIT"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"

46
tools/buildbot/Versioning
View File

@ -27,11 +27,17 @@ def PerformReversioning():
productFile = open(os.path.join(AMBuild.sourceFolder, 'product.version'), 'r')
productContents = productFile.read()
productFile.close()
m = re.match('(\d+)\.(\d+)\.(\d+)(.*)', productContents)
m = re.match('(\d+)\.(\d+)\.(\d+)-?(.*)', productContents)
if m == None:
raise Exception('Could not detremine product version')
major, minor, release, tag = m.groups()
fullstring = "{0}.{1}.{2}".format(major, minor, release)
if tag != "":
fullstring += "-{0}".format(tag)
if tag == "dev":
fullstring += "+{0}".format(rev)
incFolder = os.path.join(AMBuild.outputFolder, 'includes')
if not os.path.isdir(incFolder):
os.makedirs(incFolder)
@ -40,14 +46,40 @@ def PerformReversioning():
#ifndef _SOURCEMOD_AUTO_VERSION_INFORMATION_H_
#define _SOURCEMOD_AUTO_VERSION_INFORMATION_H_
#define SM_BUILD_STRING \"{0}\"
#define SM_BUILD_UNIQUEID \"{1}:{2}\" SM_BUILD_STRING
#define SM_FULL_VERSION \"{3}.{4}.{5}\" SM_BUILD_STRING
#define SM_FILE_VERSION {6},{7},{8},0
#define SM_BUILD_TAG \"{0}\"
#define SM_BUILD_REV \"{1}\"
#define SM_BUILD_CSET \"{2}\"
#define SM_BUILD_MAJOR \"{3}\"
#define SM_BUILD_MINOR \"{4}\"
#define SM_BUILD_RELEASE \"{5}\"
#define SM_BUILD_UNIQUEID SM_BUILD_REV \":\" SM_BUILD_CSET
#define SM_VERSION_STRING \"{6}\"
#define SM_VERSION_FILE {7},{8},{9},0
#endif /* _SOURCEMOD_AUTO_VERSION_INFORMATION_H_ */
""".format(tag, rev, cset, major, minor, release, major, minor, release))
""".format(tag, rev, cset, major, minor, release, fullstring, major, minor, release))
incFile.close()
incFile = open(os.path.join(incFolder, 'version_auto.inc'), 'w')
incFile.write("""
#if defined _auto_version_included
#endinput
#endif
#define _auto_version_included
#define SOURCEMOD_V_TAG \"{0}\"
#define SOURCEMOD_V_REV {1}
#define SOURCEMOD_V_CSET \"{2}\"
#define SOURCEMOD_V_MAJOR {3}
#define SOURCEMOD_V_MINOR {4}
#define SOURCEMOD_V_RELEASE {5}
#define SOURCEMOD_VERSION \"{6}\"
""".format(tag, rev, cset, major, minor, release, fullstring))
incFile.close()
cache.WriteCache()