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

Change version display.

Browse Source
This commit is contained in:
David Anderson 2014-05-25 03:18:05 -07:00
parent ed9ca9e943
commit 3c7a08afc2
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/sm_srvcmds.cpp
View File

@ -340,7 +340,8 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand &
ConsolePrint(" SourcePawn Engine: %s (build %s NO JIT)", g_pSourcePawn2->GetEngineName(), g_pSourcePawn2->GetVersionString()); ConsolePrint(" SourcePawn Engine: %s (build %s NO JIT)", g_pSourcePawn2->GetEngineName(), g_pSourcePawn2->GetVersionString());
ConsolePrint(" SourcePawn API: v1 = %d, v2 = %d", g_pSourcePawn->GetEngineAPIVersion(), g_pSourcePawn2->GetAPIVersion()); ConsolePrint(" SourcePawn API: v1 = %d, v2 = %d", g_pSourcePawn->GetEngineAPIVersion(), g_pSourcePawn2->GetAPIVersion());
ConsolePrint(" Compiled on: %s %s", __DATE__, __TIME__); ConsolePrint(" Compiled on: %s %s", __DATE__, __TIME__);
ConsolePrint(" Build ID: %s", SOURCEMOD_BUILD_ID); ConsolePrint(" Built from: https://github.com/alliedmodders/sourcemod/commit/%s", SOURCEMOD_SHA);
ConsolePrint(" Build ID: %d:%s", SOURCEMOD_LOCAL_REV, SOURCEMOD_SHA);
ConsolePrint(" http://www.sourcemod.net/"); ConsolePrint(" http://www.sourcemod.net/");
} }
} }

4
public/sourcemod_version.h
View File

@ -49,13 +49,13 @@
# endif # endif
#else #else
#define SM_BUILD_TAG "manual" #define SM_BUILD_TAG "manual"
#define SM_BUILD_REV "0" #define SM_BUILD_LOCAL_REV "0"
#define SM_BUILD_CSET "0" #define SM_BUILD_CSET "0"
#define SM_BUILD_MAJOR "1" #define SM_BUILD_MAJOR "1"
#define SM_BUILD_MINOR "6" #define SM_BUILD_MINOR "6"
#define SM_BUILD_RELEASE "0" #define SM_BUILD_RELEASE "0"
#define SM_BUILD_UNIQUEID SM_BUILD_REV ":" SM_BUILD_CSET #define SM_BUILD_UNIQUEID SM_BUILD_LOCAL_REV ":" SM_BUILD_CSET
#define SM_VERSION_STRING SM_BUILD_MAJOR "." SM_BUILD_MINOR "." SM_BUILD_RELEASE "-" SM_BUILD_TAG #define SM_VERSION_STRING SM_BUILD_MAJOR "." SM_BUILD_MINOR "." SM_BUILD_RELEASE "-" SM_BUILD_TAG
#define SM_VERSION_FILE 1,6,0,0 #define SM_VERSION_FILE 1,6,0,0

4
tools/buildbot/generate_headers.py
View File

@ -72,6 +72,7 @@ def output_version_headers():
#define SM_BUILD_MAJOR \"{2}\" #define SM_BUILD_MAJOR \"{2}\"
#define SM_BUILD_MINOR \"{3}\" #define SM_BUILD_MINOR \"{3}\"
#define SM_BUILD_RELEASE \"{4}\" #define SM_BUILD_RELEASE \"{4}\"
#define SM_BUILD_LOCAL_REV \"{9}\"
#define SM_BUILD_UNIQUEID "{9}:" SM_BUILD_CSET #define SM_BUILD_UNIQUEID "{9}:" SM_BUILD_CSET
@ -93,8 +94,9 @@ def output_version_headers():
#define SOURCEMOD_V_MAJOR {2} #define SOURCEMOD_V_MAJOR {2}
#define SOURCEMOD_V_MINOR {3} #define SOURCEMOD_V_MINOR {3}
#define SOURCEMOD_V_RELEASE {4} #define SOURCEMOD_V_RELEASE {4}
#define SOURCEMOD_V_REV {6}
#define SOURCEMOD_VERSION \"{5}\" #define SOURCEMOD_VERSION \"{5}\"
""".format(tag, shorthash, major, minor, release, fullstring)) """.format(tag, shorthash, major, minor, release, fullstring, count))
output_version_headers() output_version_headers()

3
versionlib/versionlib.cpp
View File

@ -29,6 +29,7 @@
#include <sourcemod_version.h> #include <sourcemod_version.h>
#include <versionlib.h> #include <versionlib.h>
const char *SOURCEMOD_BUILD_ID = SM_BUILD_UNIQUEID; const char *SOURCEMOD_LOCAL_REV = SM_BUILD_LOCAL_REV;
const char *SOURCEMOD_SHA = SM_BUILD_CSET;
const char *SOURCEMOD_VERSION = SM_VERSION_STRING; const char *SOURCEMOD_VERSION = SM_VERSION_STRING;
const char *SOURCEMOD_BUILD_TIME = __DATE__ " " __TIME__; const char *SOURCEMOD_BUILD_TIME = __DATE__ " " __TIME__;

6
versionlib/versionlib.h
View File

@ -32,7 +32,8 @@
#if !defined(SM_USE_VERSIONLIB) #if !defined(SM_USE_VERSIONLIB)
// These get defined in sourcemod_version.h since // These get defined in sourcemod_version.h since
// versionlib does not use versionlib. // versionlib does not use versionlib.
# undef SOURCEMOD_BUILD_ID # undef SOURCEMOD_LOCAL_REV
# undef SOURCEMOD_CSET
# undef SOURCEMOD_VERSION # undef SOURCEMOD_VERSION
# undef SOURCEMOD_BUILD_TIME # undef SOURCEMOD_BUILD_TIME
#endif #endif
@ -42,7 +43,8 @@
#else #else
# define EXTERN_C extern # define EXTERN_C extern
#endif #endif
EXTERN_C const char *SOURCEMOD_BUILD_ID; EXTERN_C const char *SOURCEMOD_LOCAL_REV;
EXTERN_C const char *SOURCEMOD_SHA;
EXTERN_C const char *SOURCEMOD_VERSION; EXTERN_C const char *SOURCEMOD_VERSION;
EXTERN_C const char *SOURCEMOD_BUILD_TIME; EXTERN_C const char *SOURCEMOD_BUILD_TIME;