From c968dfa11380d9fd9a0b912f48e96073d4754308 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 19:22:36 -0500 Subject: [PATCH 01/12] Allow for second private chat trigger (bug 3667, r,a11=pred). --- configs/core.cfg | 7 +++++++ core/ChatTriggers.cpp | 19 ++++++++++++++++++- core/ChatTriggers.h | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/configs/core.cfg b/configs/core.cfg index 02889b7c..72872455 100644 --- a/configs/core.cfg +++ b/configs/core.cfg @@ -46,6 +46,13 @@ * String to use as the silent chat trigger. Set an empty string to disable. */ "SilentChatTrigger" "/" + + /** + * Optional, second string to use as the silent chat trigger. Set an empty + * string to disable. This is can be useful on games that steal the primary + * choice (such as TF2 and "/") + */ + "SilentChatTrigger2" "." /** * If a say command is a silent chat trigger, and is used by an admin, diff --git a/core/ChatTriggers.cpp b/core/ChatTriggers.cpp index 0cfc9042..127a616a 100644 --- a/core/ChatTriggers.cpp +++ b/core/ChatTriggers.cpp @@ -63,8 +63,10 @@ ChatTriggers::ChatTriggers() : m_pSayCmd(NULL), m_bWillProcessInPost(false), { m_PubTrigger = sm_strdup("!"); m_PrivTrigger = sm_strdup("/"); + m_PrivTrigger2 = sm_strdup("."); m_PubTriggerSize = 1; m_PrivTriggerSize = 1; + m_PrivTriggerSize2 = 1; m_bIsChatTrigger = false; } @@ -74,6 +76,8 @@ ChatTriggers::~ChatTriggers() m_PubTrigger = NULL; delete [] m_PrivTrigger; m_PrivTrigger = NULL; + delete [] m_PrivTrigger2; + m_PrivTrigger2 = NULL; } ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key, @@ -96,6 +100,13 @@ ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key, m_PrivTriggerSize = strlen(m_PrivTrigger); return ConfigResult_Accept; } + else if (strcmp(key, "SilentChatTrigger2") == 0) + { + delete [] m_PrivTrigger2; + m_PrivTrigger2 = sm_strdup(value); + m_PrivTriggerSize2 = strlen(m_PrivTrigger2); + return ConfigResult_Accept; + } else if (strcmp(key, "SilentFailSuppress") == 0) { g_bSupressSilentFails = strcmp(value, "yes") == 0; @@ -252,12 +263,18 @@ void ChatTriggers::OnSayCommand_Pre() is_trigger = true; args = &args[m_PubTriggerSize]; } - else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) + else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) { is_trigger = true; is_silent = true; args = &args[m_PrivTriggerSize]; } + else if (m_PrivTriggerSize2 && strncmp(args, m_PrivTrigger2, m_PrivTriggerSize2) == 0) + { + is_trigger = true; + is_silent = true; + args = &args[m_PrivTriggerSize2]; + } if (!is_trigger) { diff --git a/core/ChatTriggers.h b/core/ChatTriggers.h index c003f997..4b9c73d0 100644 --- a/core/ChatTriggers.h +++ b/core/ChatTriggers.h @@ -75,7 +75,9 @@ private: char *m_PubTrigger; size_t m_PubTriggerSize; char *m_PrivTrigger; + char *m_PrivTrigger2; size_t m_PrivTriggerSize; + size_t m_PrivTriggerSize2; bool m_bWillProcessInPost; bool m_bTriggerWasSilent; bool m_bIsChatTrigger; From c2b7bd10ec09247dbb0777c407729bf44173871b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 19:38:45 -0500 Subject: [PATCH 02/12] Updated changelog. --- changelog.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/changelog.txt b/changelog.txt index c9a5d245..0a824bcf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,27 @@ SourceMod Changelog ---------------------------- +SourceMod 1.1.1 [2009-02-25] + +URL: http://wiki.alliedmods.net/SourceMod_1.1.1_Release Notes + +Changes: + + - Added second private chat trigger, defaulting to a period ('.') (bug 3667). + - Added Age of Chivalry support (bug 3366, IceMatrix). + - Added Obsidian Conflict support (bug 2699, The DOO). + - Fixed compatibility issues with latest TF2 update. + - Fixed crash when an event handler fired an event of the same name (bug 3468). + - Fixed rare crash in the event manager on post hooks (bug 3548). + - Fixed formatting error with zero precision floats (bug 3447). + - Fixed various Insurgency offsets (bug 3544). + - Fixed admin menu (topmenu) categories being selectable when not usable (bug 3256). + - Fixed sm_sql_addgroup not working (bug 3578). + - Fixed memory leak when events were hooked as EventHookMode_Post. + - Fixed nextmap trigger showing wrong output with end-of-map voting disabled and sm_trigger_show set to zero (bug 3597, mr.e.unk). + +---------------------------- + SourceMod 1.1.0 [2008-12-28] URL: http://wiki.alliedmods.net/SourceMod_1.1.0_Release_Notes From ba28da5fdc7ec15c510503b60c288404f14be1d3 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 20:02:47 -0500 Subject: [PATCH 03/12] Removed -dev tag for release build. --- tools/buildbot/bootstrap.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl index fc15c906..0aaacf58 100755 --- a/tools/buildbot/bootstrap.pl +++ b/tools/buildbot/bootstrap.pl @@ -57,4 +57,4 @@ if ($^O eq "linux") Build::Command("flip -u tools/versionchanger.pl"); Build::Command("chmod +x tools/versionchanger.pl"); } -Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"'); +#Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"'); From 3623ee3ce869eac49b1bba63b2615458ae992841 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 20:07:12 -0500 Subject: [PATCH 04/12] Backed out changeset fa286305bd3f --- configs/core.cfg | 7 ------- core/ChatTriggers.cpp | 19 +------------------ core/ChatTriggers.h | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/configs/core.cfg b/configs/core.cfg index 72872455..02889b7c 100644 --- a/configs/core.cfg +++ b/configs/core.cfg @@ -46,13 +46,6 @@ * String to use as the silent chat trigger. Set an empty string to disable. */ "SilentChatTrigger" "/" - - /** - * Optional, second string to use as the silent chat trigger. Set an empty - * string to disable. This is can be useful on games that steal the primary - * choice (such as TF2 and "/") - */ - "SilentChatTrigger2" "." /** * If a say command is a silent chat trigger, and is used by an admin, diff --git a/core/ChatTriggers.cpp b/core/ChatTriggers.cpp index 127a616a..0cfc9042 100644 --- a/core/ChatTriggers.cpp +++ b/core/ChatTriggers.cpp @@ -63,10 +63,8 @@ ChatTriggers::ChatTriggers() : m_pSayCmd(NULL), m_bWillProcessInPost(false), { m_PubTrigger = sm_strdup("!"); m_PrivTrigger = sm_strdup("/"); - m_PrivTrigger2 = sm_strdup("."); m_PubTriggerSize = 1; m_PrivTriggerSize = 1; - m_PrivTriggerSize2 = 1; m_bIsChatTrigger = false; } @@ -76,8 +74,6 @@ ChatTriggers::~ChatTriggers() m_PubTrigger = NULL; delete [] m_PrivTrigger; m_PrivTrigger = NULL; - delete [] m_PrivTrigger2; - m_PrivTrigger2 = NULL; } ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key, @@ -100,13 +96,6 @@ ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key, m_PrivTriggerSize = strlen(m_PrivTrigger); return ConfigResult_Accept; } - else if (strcmp(key, "SilentChatTrigger2") == 0) - { - delete [] m_PrivTrigger2; - m_PrivTrigger2 = sm_strdup(value); - m_PrivTriggerSize2 = strlen(m_PrivTrigger2); - return ConfigResult_Accept; - } else if (strcmp(key, "SilentFailSuppress") == 0) { g_bSupressSilentFails = strcmp(value, "yes") == 0; @@ -263,18 +252,12 @@ void ChatTriggers::OnSayCommand_Pre() is_trigger = true; args = &args[m_PubTriggerSize]; } - else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) + else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) { is_trigger = true; is_silent = true; args = &args[m_PrivTriggerSize]; } - else if (m_PrivTriggerSize2 && strncmp(args, m_PrivTrigger2, m_PrivTriggerSize2) == 0) - { - is_trigger = true; - is_silent = true; - args = &args[m_PrivTriggerSize2]; - } if (!is_trigger) { diff --git a/core/ChatTriggers.h b/core/ChatTriggers.h index 4b9c73d0..c003f997 100644 --- a/core/ChatTriggers.h +++ b/core/ChatTriggers.h @@ -75,9 +75,7 @@ private: char *m_PubTrigger; size_t m_PubTriggerSize; char *m_PrivTrigger; - char *m_PrivTrigger2; size_t m_PrivTriggerSize; - size_t m_PrivTriggerSize2; bool m_bWillProcessInPost; bool m_bTriggerWasSilent; bool m_bIsChatTrigger; From 6c7a763b76f2ed7a0c036a2421e59987abb6c25c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 20:09:22 -0500 Subject: [PATCH 05/12] Fixed changelog. --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 0a824bcf..2c5911b3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,7 +8,6 @@ URL: http://wiki.alliedmods.net/SourceMod_1.1.1_Release Notes Changes: - - Added second private chat trigger, defaulting to a period ('.') (bug 3667). - Added Age of Chivalry support (bug 3366, IceMatrix). - Added Obsidian Conflict support (bug 2699, The DOO). - Fixed compatibility issues with latest TF2 update. From fef5bd321c96c9e3d4b5b3ff4763ad9dab983247 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 20:10:12 -0500 Subject: [PATCH 06/12] Added tag sourcemod-1.1.1 for changeset ffa740152efd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1d51de40..728f884d 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 54539fa4e51f98d7841c853c1370dff6ccd3cdf2 sourcemod-1.0.0 e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0 +ffa740152efd042ad0461c797d52c5e6eab3d52c sourcemod-1.1.1 From 79ea33beda1fc1e3bd1f0ad16f214072c20a4386 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 20:21:47 -0500 Subject: [PATCH 07/12] Pushing build. --- pushbuild.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pushbuild.txt b/pushbuild.txt index 089db4f9..c9b9ed9a 100644 --- a/pushbuild.txt +++ b/pushbuild.txt @@ -1,2 +1 @@ -a billion and TRILLIONS -timeout dance \ No newline at end of file +release 1.1.1 From d0fda1f919fae1c1a77adbf716a76dc3efa88335 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 20:24:56 -0500 Subject: [PATCH 08/12] Bumped all versions. --- core/sm_version.h | 4 ++-- extensions/bintools/svn_version.h | 4 ++-- extensions/clientprefs/svn_version.h | 6 ++++-- extensions/cstrike/svn_version.h | 4 ++-- extensions/geoip/svn_version.h | 4 ++-- extensions/mysql/svn_version.h | 4 ++-- extensions/regex/svn_version.h | 4 ++-- extensions/sdktools/svn_version.h | 4 ++-- extensions/sqlite/svn_version.h | 4 ++-- extensions/tf2/svn_version.h | 4 ++-- extensions/topmenus/svn_version.h | 4 ++-- loader/svn_version.h | 4 ++-- plugins/include/version.inc | 2 +- sourcepawn/compiler/svn_version.h | 4 ++-- sourcepawn/jit/jit_version.h | 4 ++-- 15 files changed, 31 insertions(+), 29 deletions(-) diff --git a/core/sm_version.h b/core/sm_version.h index 88ed3291..7981e080 100644 --- a/core/sm_version.h +++ b/core/sm_version.h @@ -40,8 +40,8 @@ * @file Contains SourceMod version information. */ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/bintools/svn_version.h b/extensions/bintools/svn_version.h index 1843da41..4b01646c 100644 --- a/extensions/bintools/svn_version.h +++ b/extensions/bintools/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_BINTOOLS_VERSION_H_ #define _INCLUDE_BINTOOLS_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/clientprefs/svn_version.h b/extensions/clientprefs/svn_version.h index 2fb0d028..7eae7a1e 100644 --- a/extensions/clientprefs/svn_version.h +++ b/extensions/clientprefs/svn_version.h @@ -36,7 +36,9 @@ #ifndef _INCLUDE_CLIENTPREFS_VERSION_H_ #define _INCLUDE_CLIENTPREFS_VERSION_H_ -#define SVN_FULL_VERSION "1.1.0-svn" -#define SVN_FILE_VERSION 1,1,0,2230 +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING +#define SVN_FILE_VERSION 1,1,1,0 #endif //_INCLUDE_CLIENTPREFS_VERSION_H_ diff --git a/extensions/cstrike/svn_version.h b/extensions/cstrike/svn_version.h index e845035b..bc5215e7 100644 --- a/extensions/cstrike/svn_version.h +++ b/extensions/cstrike/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/geoip/svn_version.h b/extensions/geoip/svn_version.h index 5057a2fe..c43702e6 100644 --- a/extensions/geoip/svn_version.h +++ b/extensions/geoip/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_GEOIP_VERSION_H_ #define _INCLUDE_GEOIP_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/mysql/svn_version.h b/extensions/mysql/svn_version.h index 9b1068b0..9e145e4a 100644 --- a/extensions/mysql/svn_version.h +++ b/extensions/mysql/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_MYSQLEXT_VERSION_H_ #define _INCLUDE_MYSQLEXT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/regex/svn_version.h b/extensions/regex/svn_version.h index 0e8d5839..a7d8b3c2 100644 --- a/extensions/regex/svn_version.h +++ b/extensions/regex/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_REGEXEXT_VERSION_H_ #define _INCLUDE_REGEXEXT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/sdktools/svn_version.h b/extensions/sdktools/svn_version.h index d8403454..a8869e89 100644 --- a/extensions/sdktools/svn_version.h +++ b/extensions/sdktools/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/sqlite/svn_version.h b/extensions/sqlite/svn_version.h index af99be5c..3e94c114 100644 --- a/extensions/sqlite/svn_version.h +++ b/extensions/sqlite/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/tf2/svn_version.h b/extensions/tf2/svn_version.h index 4646f3f9..6b76721d 100644 --- a/extensions/tf2/svn_version.h +++ b/extensions/tf2/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/topmenus/svn_version.h b/extensions/topmenus/svn_version.h index 8f920db6..6a31e24f 100644 --- a/extensions/topmenus/svn_version.h +++ b/extensions/topmenus/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/loader/svn_version.h b/loader/svn_version.h index 88ed3291..7981e080 100644 --- a/loader/svn_version.h +++ b/loader/svn_version.h @@ -40,8 +40,8 @@ * @file Contains SourceMod version information. */ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/plugins/include/version.inc b/plugins/include/version.inc index 3da3fad4..bacbbd0c 100644 --- a/plugins/include/version.inc +++ b/plugins/include/version.inc @@ -39,4 +39,4 @@ #define SOURCEMOD_V_MINOR 1 /**< SourceMod Minor version */ #define SOURCEMOD_V_RELEASE 1 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.1.1-dev" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.1.1" /**< SourceMod version string (major.minor.release.build) */ diff --git a/sourcepawn/compiler/svn_version.h b/sourcepawn/compiler/svn_version.h index 26cbd28f..5b8f4534 100644 --- a/sourcepawn/compiler/svn_version.h +++ b/sourcepawn/compiler/svn_version.h @@ -19,8 +19,8 @@ * @file Contains SourceMod version information. */ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/sourcepawn/jit/jit_version.h b/sourcepawn/jit/jit_version.h index 7de6a21f..b5e8e8db 100644 --- a/sourcepawn/jit/jit_version.h +++ b/sourcepawn/jit/jit_version.h @@ -32,8 +32,8 @@ #ifndef _INCLUDE_JIT_VERSION_H_ #define _INCLUDE_JIT_VERSION_H_ -#define SM_BUILD_STRING "-dev" -#define SM_BUILD_UNIQUEID "2441:acefe8930c06" SM_BUILD_STRING +#define SM_BUILD_STRING "" +#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 From 449b52e5a479c4b3bd4bcf218d881036a422df7a Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 20:25:20 -0500 Subject: [PATCH 09/12] Removed tag sourcemod-1.1.1 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 728f884d..f9490cf1 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 54539fa4e51f98d7841c853c1370dff6ccd3cdf2 sourcemod-1.0.0 e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0 ffa740152efd042ad0461c797d52c5e6eab3d52c sourcemod-1.1.1 +0000000000000000000000000000000000000000 sourcemod-1.1.1 From 110a0d98faa7ed839337ea3aabfd698394016803 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Feb 2009 20:25:23 -0500 Subject: [PATCH 10/12] Added tag sourcemod-1.1.1 for changeset 46c76edb0875 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f9490cf1..62630488 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0 ffa740152efd042ad0461c797d52c5e6eab3d52c sourcemod-1.1.1 0000000000000000000000000000000000000000 sourcemod-1.1.1 +46c76edb087556066efb1816fb218ad414e49f27 sourcemod-1.1.1 From 8c493576cc4162e17f328b637dab12d2c55daccd Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 25 Feb 2009 23:00:59 -0600 Subject: [PATCH 11/12] Fixed 1.1.1 tag for great justice! --- .hgtags | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.hgtags b/.hgtags index 62630488..27451cff 100644 --- a/.hgtags +++ b/.hgtags @@ -1,5 +1,3 @@ 54539fa4e51f98d7841c853c1370dff6ccd3cdf2 sourcemod-1.0.0 e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0 -ffa740152efd042ad0461c797d52c5e6eab3d52c sourcemod-1.1.1 -0000000000000000000000000000000000000000 sourcemod-1.1.1 -46c76edb087556066efb1816fb218ad414e49f27 sourcemod-1.1.1 +e877885fac80be71822641f7a9122cebc9812521 sourcemod-1.1.1 From a4db34a419e91bdb09ee22c1c90caca3b59f5669 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 25 Feb 2009 23:05:31 -0600 Subject: [PATCH 12/12] Re-added -dev tag. --- core/sm_version.h | 4 ++-- extensions/bintools/svn_version.h | 4 ++-- extensions/clientprefs/svn_version.h | 4 ++-- extensions/cstrike/svn_version.h | 4 ++-- extensions/geoip/svn_version.h | 4 ++-- extensions/mysql/svn_version.h | 4 ++-- extensions/regex/svn_version.h | 4 ++-- extensions/sdktools/svn_version.h | 4 ++-- extensions/sqlite/svn_version.h | 4 ++-- extensions/tf2/svn_version.h | 4 ++-- extensions/topmenus/svn_version.h | 4 ++-- loader/svn_version.h | 4 ++-- plugins/include/version.inc | 2 +- sourcepawn/compiler/svn_version.h | 4 ++-- sourcepawn/jit/jit_version.h | 4 ++-- tools/buildbot/bootstrap.pl | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/core/sm_version.h b/core/sm_version.h index 7981e080..fb06f12f 100644 --- a/core/sm_version.h +++ b/core/sm_version.h @@ -40,8 +40,8 @@ * @file Contains SourceMod version information. */ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/bintools/svn_version.h b/extensions/bintools/svn_version.h index 4b01646c..474fdce7 100644 --- a/extensions/bintools/svn_version.h +++ b/extensions/bintools/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_BINTOOLS_VERSION_H_ #define _INCLUDE_BINTOOLS_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/clientprefs/svn_version.h b/extensions/clientprefs/svn_version.h index 7eae7a1e..9ae5e24d 100644 --- a/extensions/clientprefs/svn_version.h +++ b/extensions/clientprefs/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_CLIENTPREFS_VERSION_H_ #define _INCLUDE_CLIENTPREFS_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/cstrike/svn_version.h b/extensions/cstrike/svn_version.h index bc5215e7..b570352e 100644 --- a/extensions/cstrike/svn_version.h +++ b/extensions/cstrike/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/geoip/svn_version.h b/extensions/geoip/svn_version.h index c43702e6..16d275a5 100644 --- a/extensions/geoip/svn_version.h +++ b/extensions/geoip/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_GEOIP_VERSION_H_ #define _INCLUDE_GEOIP_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/mysql/svn_version.h b/extensions/mysql/svn_version.h index 9e145e4a..2c9de262 100644 --- a/extensions/mysql/svn_version.h +++ b/extensions/mysql/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_MYSQLEXT_VERSION_H_ #define _INCLUDE_MYSQLEXT_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/regex/svn_version.h b/extensions/regex/svn_version.h index a7d8b3c2..be2e2931 100644 --- a/extensions/regex/svn_version.h +++ b/extensions/regex/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_REGEXEXT_VERSION_H_ #define _INCLUDE_REGEXEXT_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/sdktools/svn_version.h b/extensions/sdktools/svn_version.h index a8869e89..1232b34d 100644 --- a/extensions/sdktools/svn_version.h +++ b/extensions/sdktools/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/sqlite/svn_version.h b/extensions/sqlite/svn_version.h index 3e94c114..fe81084d 100644 --- a/extensions/sqlite/svn_version.h +++ b/extensions/sqlite/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/tf2/svn_version.h b/extensions/tf2/svn_version.h index 6b76721d..5f12f0b0 100644 --- a/extensions/tf2/svn_version.h +++ b/extensions/tf2/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/extensions/topmenus/svn_version.h b/extensions/topmenus/svn_version.h index 6a31e24f..cfec0263 100644 --- a/extensions/topmenus/svn_version.h +++ b/extensions/topmenus/svn_version.h @@ -36,8 +36,8 @@ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/loader/svn_version.h b/loader/svn_version.h index 7981e080..fb06f12f 100644 --- a/loader/svn_version.h +++ b/loader/svn_version.h @@ -40,8 +40,8 @@ * @file Contains SourceMod version information. */ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/plugins/include/version.inc b/plugins/include/version.inc index bacbbd0c..3da3fad4 100644 --- a/plugins/include/version.inc +++ b/plugins/include/version.inc @@ -39,4 +39,4 @@ #define SOURCEMOD_V_MINOR 1 /**< SourceMod Minor version */ #define SOURCEMOD_V_RELEASE 1 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.1.1" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.1.1-dev" /**< SourceMod version string (major.minor.release.build) */ diff --git a/sourcepawn/compiler/svn_version.h b/sourcepawn/compiler/svn_version.h index 5b8f4534..b9b16368 100644 --- a/sourcepawn/compiler/svn_version.h +++ b/sourcepawn/compiler/svn_version.h @@ -19,8 +19,8 @@ * @file Contains SourceMod version information. */ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/sourcepawn/jit/jit_version.h b/sourcepawn/jit/jit_version.h index b5e8e8db..13d3d2c9 100644 --- a/sourcepawn/jit/jit_version.h +++ b/sourcepawn/jit/jit_version.h @@ -32,8 +32,8 @@ #ifndef _INCLUDE_JIT_VERSION_H_ #define _INCLUDE_JIT_VERSION_H_ -#define SM_BUILD_STRING "" -#define SM_BUILD_UNIQUEID "2473:49a607a25edc" SM_BUILD_STRING +#define SM_BUILD_STRING "-dev" +#define SM_BUILD_UNIQUEID "2477:651b94271b43" SM_BUILD_STRING #define SVN_FULL_VERSION "1.1.1" SM_BUILD_STRING #define SVN_FILE_VERSION 1,1,1,0 diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl index 0aaacf58..fc15c906 100755 --- a/tools/buildbot/bootstrap.pl +++ b/tools/buildbot/bootstrap.pl @@ -57,4 +57,4 @@ if ($^O eq "linux") Build::Command("flip -u tools/versionchanger.pl"); Build::Command("chmod +x tools/versionchanger.pl"); } -#Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"'); +Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"');