From 7c96c30be8601e26c2202e8ca8920a7238983c73 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Mon, 8 Dec 2014 01:41:52 +0100 Subject: [PATCH] Replace old SVN_* defines by the new ones --- amxmodx/amxmodx.cpp | 2 +- amxmodx/amxxlog.cpp | 2 +- amxmodx/meta_api.cpp | 6 +++--- amxmodx/srvcmd.cpp | 7 +++++-- compiler/amxxpc/amxxpc.cpp | 2 +- compiler/amxxpc/amxxpc.h | 2 -- compiler/amxxpc/amxxpc1.rc | 43 +++++++++++++++++++++++++++++++++++--- 7 files changed, 51 insertions(+), 13 deletions(-) diff --git a/amxmodx/amxmodx.cpp b/amxmodx/amxmodx.cpp index 60f5daf5..10c8ab9c 100755 --- a/amxmodx/amxmodx.cpp +++ b/amxmodx/amxmodx.cpp @@ -814,7 +814,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], SVN_VERSION_STRING, params[2]); + return set_amxstring(amx, params[1], AMXX_VERSION, params[2]); } static cell AMX_NATIVE_CALL get_user_frags(AMX *amx, cell *params) /* 1 param */ diff --git a/amxmodx/amxxlog.cpp b/amxmodx/amxxlog.cpp index 193e4685..73554352 100755 --- a/amxmodx/amxxlog.cpp +++ b/amxmodx/amxxlog.cpp @@ -101,7 +101,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\") (version \"%s\")\n", name, SVN_VERSION_STRING); + fprintf(fp, "AMX Mod X log file started (file \"%s\") (version \"%s\")\n", name, AMXX_VERSION); fclose(fp); } } diff --git a/amxmodx/meta_api.cpp b/amxmodx/meta_api.cpp index 3a751018..2fe486fa 100755 --- a/amxmodx/meta_api.cpp +++ b/amxmodx/meta_api.cpp @@ -36,7 +36,7 @@ plugin_info_t Plugin_info = { META_INTERFACE_VERSION, // ifvers "AMX Mod X", // name - SVN_VERSION_STRING, // version + AMXX_VERSION, // version __DATE__, // date "AMX Mod X Dev Team", // author "http://www.amxmodx.org", // url @@ -450,7 +450,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, SVN_VERSION_STRING); + CVAR_SET_STRING(init_amxmodx_version.name, AMXX_VERSION); char buffer[32]; sprintf(buffer, "%d", loaded); CVAR_SET_STRING(init_amxmodx_modules.name, buffer); @@ -1458,7 +1458,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-2014 AMX Mod X Development Team \n" - " AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", SVN_VERSION_STRING); + " AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMXX_VERSION); print_srvconsole(" This is free software and you are welcome to redistribute it under \n" " certain conditions; type 'amxx gpl' for details.\n \n"); diff --git a/amxmodx/srvcmd.cpp b/amxmodx/srvcmd.cpp index ab3b8e76..91e264ef 100755 --- a/amxmodx/srvcmd.cpp +++ b/amxmodx/srvcmd.cpp @@ -180,8 +180,11 @@ void amx_command() print_srvconsole("\tFelix \"SniperBeamer\" Geyer, Jonny \"Got His Gun\" Bergstrom\n"); print_srvconsole("\tLukasz \"SidLuke\" Wlasinski, Christian \"Basic-Master\" Hammacher\n"); print_srvconsole("\tBorja \"faluco\" Ferrer, Scott \"DS\" Ehlert\n"); - print_srvconsole("Compiled: %s\n", __DATE__ ", " __TIME__); - print_srvconsole("Build ID: %s\n", SVN_BUILD_ID); + print_srvconsole("Compiled: %s\n", AMXX_BUILD_TIME); +#if defined(AMXX_GENERATED_BUILD) + print_srvconsole("Built from: https://github.com/alliedmodders/amxmodx/commit/%s", AMXX_SHA); + print_srvconsole("Build ID: %s:%s", AMXX_LOCAL_REV, AMXX_SHA); +#endif #if defined JIT && !defined ASM32 print_srvconsole("Core mode: JIT Only\n"); #elif !defined JIT && defined ASM32 diff --git a/compiler/amxxpc/amxxpc.cpp b/compiler/amxxpc/amxxpc.cpp index 8b6b59b2..3c6833de 100755 --- a/compiler/amxxpc/amxxpc.cpp +++ b/compiler/amxxpc/amxxpc.cpp @@ -82,7 +82,7 @@ int main(int argc, char **argv) exit(0); } - pc_printf("AMX Mod X Compiler %s\n", SVN_VERSION); + pc_printf("AMX Mod X Compiler %s\n", AMXX_VERSION); pc_printf("Copyright (c) 1997-2006 ITB CompuPhase\n"); pc_printf("Copyright (c) 2004-2013 AMX Mod X Team\n\n"); diff --git a/compiler/amxxpc/amxxpc.h b/compiler/amxxpc/amxxpc.h index 38488ea6..9ed2d982 100755 --- a/compiler/amxxpc/amxxpc.h +++ b/compiler/amxxpc/amxxpc.h @@ -10,9 +10,7 @@ #ifndef _AMXXSC_INCLUDE_H #define _AMXXSC_INCLUDE_H -#ifndef SVN_VERSION #include -#endif #define MAGIC_HEADER2 0x414D5858 #define MAGIC_VERSION 0x0300 diff --git a/compiler/amxxpc/amxxpc1.rc b/compiler/amxxpc/amxxpc1.rc index 11ea11c3..99606b60 100755 --- a/compiler/amxxpc/amxxpc1.rc +++ b/compiler/amxxpc/amxxpc1.rc @@ -1,13 +1,12 @@ // Microsoft Visual C++ generated resource script. // -#include "resource1.h" - #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "windows.h" +#include +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -21,6 +20,44 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "Comments", "AMXXPC" + VALUE "FileDescription", "AMXXPC" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", "amxxpc" + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", "amxxpc.exe" + VALUE "ProductName", "AMXXPC" + VALUE "ProductVersion", AMXX_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// //