From ab4dfdc722f4f7627154a7fd4502132e1bf06f0c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 00:19:30 -0600 Subject: [PATCH 01/14] Updated changelog, added license headers. --- core-legacy/gamedll_bridge.cpp | 27 +++++++++++++++++++++++++++ core-legacy/vsp_bridge.cpp | 27 +++++++++++++++++++++++++++ core/gamedll_bridge.cpp | 27 +++++++++++++++++++++++++++ core/vsp_bridge.cpp | 27 +++++++++++++++++++++++++++ loader/gamedll.cpp | 27 +++++++++++++++++++++++++++ loader/gamedll.h | 27 +++++++++++++++++++++++++++ loader/loader.cpp | 27 +++++++++++++++++++++++++++ loader/loader.h | 27 +++++++++++++++++++++++++++ loader/loader_bridge.h | 27 +++++++++++++++++++++++++++ loader/serverplugin.cpp | 27 +++++++++++++++++++++++++++ loader/serverplugin.h | 27 +++++++++++++++++++++++++++ loader/utility.cpp | 27 +++++++++++++++++++++++++++ loader/utility.h | 27 +++++++++++++++++++++++++++ support/changelog.txt | 13 +++++++------ 14 files changed, 358 insertions(+), 6 deletions(-) diff --git a/core-legacy/gamedll_bridge.cpp b/core-legacy/gamedll_bridge.cpp index 7c38efd..bcbc509 100644 --- a/core-legacy/gamedll_bridge.cpp +++ b/core-legacy/gamedll_bridge.cpp @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #include #include "sourcemm.h" #include "CPlugin.h" diff --git a/core-legacy/vsp_bridge.cpp b/core-legacy/vsp_bridge.cpp index b64828f..df7b760 100644 --- a/core-legacy/vsp_bridge.cpp +++ b/core-legacy/vsp_bridge.cpp @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #include #include "sourcemm.h" #include "concommands.h" diff --git a/core/gamedll_bridge.cpp b/core/gamedll_bridge.cpp index 00a73ac..0e61d27 100644 --- a/core/gamedll_bridge.cpp +++ b/core/gamedll_bridge.cpp @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #include #include "metamod.h" #include "metamod_plugins.h" diff --git a/core/vsp_bridge.cpp b/core/vsp_bridge.cpp index 9919633..a6b389b 100644 --- a/core/vsp_bridge.cpp +++ b/core/vsp_bridge.cpp @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #include "metamod.h" #include "metamod_util.h" #include diff --git a/loader/gamedll.cpp b/loader/gamedll.cpp index f975edc..db21050 100644 --- a/loader/gamedll.cpp +++ b/loader/gamedll.cpp @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #include #include #include diff --git a/loader/gamedll.h b/loader/gamedll.h index ad8bd67..06f1189 100644 --- a/loader/gamedll.h +++ b/loader/gamedll.h @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #ifndef _INCLUDE_METAMOD_SOURCE_GAMEDLLS_H_ #define _INCLUDE_METAMOD_SOURCE_GAMEDLLS_H_ diff --git a/loader/loader.cpp b/loader/loader.cpp index 2c39849..9c6802a 100644 --- a/loader/loader.cpp +++ b/loader/loader.cpp @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #include #include #include diff --git a/loader/loader.h b/loader/loader.h index ea64543..8d4bc83 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #ifndef _INCLUDE_METAMOD_SOURCE_LOADER_H_ #define _INCLUDE_METAMOD_SOURCE_LOADER_H_ diff --git a/loader/loader_bridge.h b/loader/loader_bridge.h index 6dc2dd6..fb4f539 100644 --- a/loader/loader_bridge.h +++ b/loader/loader_bridge.h @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #ifndef _INCLUDE_METAMOD_SOURCE_LOADER_BRIDGE_H_ #define _INCLUDE_METAMOD_SOURCE_LOADER_BRIDGE_H_ diff --git a/loader/serverplugin.cpp b/loader/serverplugin.cpp index e52d0f1..e4d8ff7 100644 --- a/loader/serverplugin.cpp +++ b/loader/serverplugin.cpp @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #include #include #include diff --git a/loader/serverplugin.h b/loader/serverplugin.h index 45801dd..12a68d2 100644 --- a/loader/serverplugin.h +++ b/loader/serverplugin.h @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #ifndef _INCLUDE_METAMOD_SOURCE_SERVERPLUGINS_H_ #define _INCLUDE_METAMOD_SOURCE_SERVERPLUGINS_H_ diff --git a/loader/utility.cpp b/loader/utility.cpp index 0d875df..f551031 100644 --- a/loader/utility.cpp +++ b/loader/utility.cpp @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #include #include #include diff --git a/loader/utility.h b/loader/utility.h index e358cdf..ca9f2e0 100644 --- a/loader/utility.h +++ b/loader/utility.h @@ -1,3 +1,30 @@ +/** + * vim: set ts=4 : + * ====================================================== + * Metamod:Source + * Copyright (C) 2004-2008 AlliedModders LLC and authors. + * All rights reserved. + * ====================================================== + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software in a + * product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * Version: $Id$ + */ + #ifndef _INCLUDE_METAMOD_SOURCE_LOADER_UTILITY_H_ #define _INCLUDE_METAMOD_SOURCE_LOADER_UTILITY_H_ diff --git a/support/changelog.txt b/support/changelog.txt index 5d41aac..d6c76e1 100644 --- a/support/changelog.txt +++ b/support/changelog.txt @@ -1,10 +1,11 @@ -2008/??/?? 1.7.0: - - Metamod:Source now uses a unified package that runs on all Source Engine - versions to date. (TODO: Need to expand upon this.) - - Added support for Source Engine version that runs Left 4 Dead. +2008/11/26 1.7.0: + - Metamod:Source now uses a unified package that will run on all supported + Source engines. This means you do not have to download a version based on + which Source engine or game you use. + - Added support for the Source Engine version that runs Left 4 Dead. - The 'meta refresh' command now handles plugins loaded from VDF files. - - Fixed amb1952: Crash when first plugin listed in metaplugins.ini had an alias - and was not on the first line of the file. + - Fixed amb1952: Crash when the first plugin listed in metaplugins.ini had an + alias and was not on the first line of the file. 2008/07/26 1.6.2: - Fixed a bug where VDF files were opened by MM:S even if the .vdf extension From 1404583a009c12e7af716444df1a5fff5eb85cf9 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 00:27:45 -0600 Subject: [PATCH 02/14] Remove dev part of bootstrap, for release builds. --- support/buildbot/bootstrap.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/buildbot/bootstrap.pl b/support/buildbot/bootstrap.pl index 0bf7eff..2f0047d 100755 --- a/support/buildbot/bootstrap.pl +++ b/support/buildbot/bootstrap.pl @@ -20,5 +20,5 @@ if ($^O eq "linux") Build::Command("flip -u support/versionchanger.pl"); Build::Command("chmod +x support/versionchanger.pl"); } -Build::Command(Build::PathFormat('support/versionchanger.pl') . ' --buildstring="-dev"'); +#Build::Command(Build::PathFormat('support/versionchanger.pl') . ' --buildstring="-dev"'); From 2c969fdaf3c8c2120c58c1aa5096df24331e1041 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 00:30:49 -0600 Subject: [PATCH 03/14] Bumped versions. --- core-legacy/version.h | 4 ++-- core/version.h | 4 ++-- loader/version.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core-legacy/version.h b/core-legacy/version.h index e0da05a..0155dfa 100644 --- a/core-legacy/version.h +++ b/core-legacy/version.h @@ -3,8 +3,8 @@ #ifndef _INCLUDE_MMS_VERSION_H_ #define _INCLUDE_MMS_VERSION_H_ -#define MMS_BUILD_STRING "-dev" -#define MMS_BUILD_UNIQUEID "598:54ab41264c82" MMS_BUILD_STRING +#define MMS_BUILD_STRING "" +#define MMS_BUILD_UNIQUEID "608:e1ab9b3f50c8" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 diff --git a/core/version.h b/core/version.h index e0da05a..0155dfa 100644 --- a/core/version.h +++ b/core/version.h @@ -3,8 +3,8 @@ #ifndef _INCLUDE_MMS_VERSION_H_ #define _INCLUDE_MMS_VERSION_H_ -#define MMS_BUILD_STRING "-dev" -#define MMS_BUILD_UNIQUEID "598:54ab41264c82" MMS_BUILD_STRING +#define MMS_BUILD_STRING "" +#define MMS_BUILD_UNIQUEID "608:e1ab9b3f50c8" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 diff --git a/loader/version.h b/loader/version.h index e0da05a..0155dfa 100644 --- a/loader/version.h +++ b/loader/version.h @@ -3,8 +3,8 @@ #ifndef _INCLUDE_MMS_VERSION_H_ #define _INCLUDE_MMS_VERSION_H_ -#define MMS_BUILD_STRING "-dev" -#define MMS_BUILD_UNIQUEID "598:54ab41264c82" MMS_BUILD_STRING +#define MMS_BUILD_STRING "" +#define MMS_BUILD_UNIQUEID "608:e1ab9b3f50c8" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 From b87c9c9afbc1400d6f4c10415f4c443195a5f6d6 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 00:32:09 -0600 Subject: [PATCH 04/14] Added tag sourcemm-1.7.0 for changeset 4ae12ef5b184 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0a940a6..1081053 100644 --- a/.hgtags +++ b/.hgtags @@ -15,3 +15,4 @@ a50090ca6e6a5f01122a9fbabc1ad6775cba5057 mmsource-1.3d 099d37d50e0413c0e0332a6fdf4611bad6b302fd mmsource-1.6.0 2b10484499c0e9fc131b4b296879a6d9b2f280d2 mmsource-1.6.1 3bce7260f26a48e37b0e849332d61ff1fde6b8b2 mmsource-1.6.2 +4ae12ef5b184cc47b9ae21a8900d68c4efbcb088 sourcemm-1.7.0 From d8fa2493c49d7f850ef0115ef115cb7bd9f208af Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 26 Nov 2008 01:40:41 -0600 Subject: [PATCH 05/14] Removed tag for 1.7.0 --- .hgtags | 1 - core-legacy/version.h | 4 ++-- core/version.h | 4 ++-- loader/version.h | 4 ++-- support/buildbot/bootstrap.pl | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.hgtags b/.hgtags index 1081053..0a940a6 100644 --- a/.hgtags +++ b/.hgtags @@ -15,4 +15,3 @@ a50090ca6e6a5f01122a9fbabc1ad6775cba5057 mmsource-1.3d 099d37d50e0413c0e0332a6fdf4611bad6b302fd mmsource-1.6.0 2b10484499c0e9fc131b4b296879a6d9b2f280d2 mmsource-1.6.1 3bce7260f26a48e37b0e849332d61ff1fde6b8b2 mmsource-1.6.2 -4ae12ef5b184cc47b9ae21a8900d68c4efbcb088 sourcemm-1.7.0 diff --git a/core-legacy/version.h b/core-legacy/version.h index 0155dfa..6602680 100644 --- a/core-legacy/version.h +++ b/core-legacy/version.h @@ -3,8 +3,8 @@ #ifndef _INCLUDE_MMS_VERSION_H_ #define _INCLUDE_MMS_VERSION_H_ -#define MMS_BUILD_STRING "" -#define MMS_BUILD_UNIQUEID "608:e1ab9b3f50c8" MMS_BUILD_STRING +#define MMS_BUILD_STRING "-dev" +#define MMS_BUILD_UNIQUEID "610:1faa00e69cbb" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 diff --git a/core/version.h b/core/version.h index 0155dfa..6602680 100644 --- a/core/version.h +++ b/core/version.h @@ -3,8 +3,8 @@ #ifndef _INCLUDE_MMS_VERSION_H_ #define _INCLUDE_MMS_VERSION_H_ -#define MMS_BUILD_STRING "" -#define MMS_BUILD_UNIQUEID "608:e1ab9b3f50c8" MMS_BUILD_STRING +#define MMS_BUILD_STRING "-dev" +#define MMS_BUILD_UNIQUEID "610:1faa00e69cbb" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 diff --git a/loader/version.h b/loader/version.h index 0155dfa..6602680 100644 --- a/loader/version.h +++ b/loader/version.h @@ -3,8 +3,8 @@ #ifndef _INCLUDE_MMS_VERSION_H_ #define _INCLUDE_MMS_VERSION_H_ -#define MMS_BUILD_STRING "" -#define MMS_BUILD_UNIQUEID "608:e1ab9b3f50c8" MMS_BUILD_STRING +#define MMS_BUILD_STRING "-dev" +#define MMS_BUILD_UNIQUEID "610:1faa00e69cbb" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 diff --git a/support/buildbot/bootstrap.pl b/support/buildbot/bootstrap.pl index 2f0047d..0bf7eff 100755 --- a/support/buildbot/bootstrap.pl +++ b/support/buildbot/bootstrap.pl @@ -20,5 +20,5 @@ if ($^O eq "linux") Build::Command("flip -u support/versionchanger.pl"); Build::Command("chmod +x support/versionchanger.pl"); } -#Build::Command(Build::PathFormat('support/versionchanger.pl') . ' --buildstring="-dev"'); +Build::Command(Build::PathFormat('support/versionchanger.pl') . ' --buildstring="-dev"'); From 4f8546a70835ee40183c17205d24c398337e7b77 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 26 Nov 2008 01:41:36 -0600 Subject: [PATCH 06/14] Updated stub_mm and sample_mm to use MMSOURCE17 as the environment/Makefile variable. --- sample_mm/Makefile | 9 ++++----- sample_mm/msvc8/sample_mm.vcproj | 12 ++++++------ sample_mm/msvc9/sample_mm.vcproj | 12 ++++++------ stub_mm/Makefile | 9 ++++----- stub_mm/msvc8/stub_mm.vcproj | 12 ++++++------ stub_mm/msvc9/stub_mm.vcproj | 12 ++++++------ 6 files changed, 32 insertions(+), 34 deletions(-) diff --git a/sample_mm/Makefile b/sample_mm/Makefile index 753f7de..eaf78e7 100755 --- a/sample_mm/Makefile +++ b/sample_mm/Makefile @@ -8,8 +8,7 @@ HL2SDK_ORIG = ../../hl2sdk HL2SDK_OB = ../../hl2sdk-ob HL2SDK_L4D = ../../hl2sdk-l4d -SOURCEMM14 = ../core-legacy -SOURCEMM16 = ../core +MMSOURCE17 = ../mmsource-1.7 SRCDS_BASE = ~/srcds ##################################### @@ -34,7 +33,7 @@ ifeq "$(ENGINE)" "original" HL2PUB = $(HL2SDK)/public HL2LIB = $(HL2SDK)/linux_sdk CFLAGS += -DSOURCE_ENGINE=2 - METAMOD = $(SOURCEMM14) + METAMOD = $(MMSOURCE17)/core-legacy INCLUDE += -I$(HL2SDK)/public/dlls SRCDS = $(SRCDS_BASE) override ENGSET = true @@ -44,7 +43,7 @@ ifeq "$(ENGINE)" "orangebox" HL2PUB = $(HL2SDK)/public HL2LIB = $(HL2SDK)/lib/linux CFLAGS += -DSOURCE_ENGINE=3 - METAMOD = $(SOURCEMM16) + METAMOD = $(MMSOURCE17)/core INCLUDE += -I$(HL2SDK)/public/game/server SRCDS = $(SRCDS_BASE)/orangebox override ENGSET = true @@ -54,7 +53,7 @@ ifeq "$(ENGINE)" "left4dead" HL2PUB = $(HL2SDK)/public HL2LIB = $(HL2SDK)/lib/linux CFLAGS += -DSOURCE_ENGINE=4 - METAMOD = $(SOURCEMM16) + METAMOD = $(MMSOURCE17)/core INCLUDE += -I$(HL2SDK)/public/game/server SRCDS = $(SRCDS_BASE)/l4d override ENGSET = true diff --git a/sample_mm/msvc8/sample_mm.vcproj b/sample_mm/msvc8/sample_mm.vcproj index f73e71c..b56a8f1 100644 --- a/sample_mm/msvc8/sample_mm.vcproj +++ b/sample_mm/msvc8/sample_mm.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4" Optimization="0" - AdditionalIncludeDirectories=""$(SOURCEMM14)";"$(SOURCEMM14)\sourcemm";"$(SOURCEMM14)\sourcehook";"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(HL2SDK)\public\vstdlib"" + AdditionalIncludeDirectories=""$(MMSOURCE17)\core-legacy";"$(MMSOURCE17)\core-legacy\sourcehook";"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(HL2SDK)\public\vstdlib"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SAMPLE_MM_EXPORTS;SOURCE_ENGINE=2" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -121,7 +121,7 @@ Date: Wed, 26 Nov 2008 01:49:17 -0600 Subject: [PATCH 07/14] Bumped build IDs again. --- core-legacy/version.h | 4 ++-- core/version.h | 4 ++-- loader/version.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core-legacy/version.h b/core-legacy/version.h index 6602680..37860d3 100644 --- a/core-legacy/version.h +++ b/core-legacy/version.h @@ -3,8 +3,8 @@ #ifndef _INCLUDE_MMS_VERSION_H_ #define _INCLUDE_MMS_VERSION_H_ -#define MMS_BUILD_STRING "-dev" -#define MMS_BUILD_UNIQUEID "610:1faa00e69cbb" MMS_BUILD_STRING +#define MMS_BUILD_STRING "" +#define MMS_BUILD_UNIQUEID "612:c0a3e4d8e000" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 diff --git a/core/version.h b/core/version.h index 6602680..37860d3 100644 --- a/core/version.h +++ b/core/version.h @@ -3,8 +3,8 @@ #ifndef _INCLUDE_MMS_VERSION_H_ #define _INCLUDE_MMS_VERSION_H_ -#define MMS_BUILD_STRING "-dev" -#define MMS_BUILD_UNIQUEID "610:1faa00e69cbb" MMS_BUILD_STRING +#define MMS_BUILD_STRING "" +#define MMS_BUILD_UNIQUEID "612:c0a3e4d8e000" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 diff --git a/loader/version.h b/loader/version.h index 6602680..37860d3 100644 --- a/loader/version.h +++ b/loader/version.h @@ -3,8 +3,8 @@ #ifndef _INCLUDE_MMS_VERSION_H_ #define _INCLUDE_MMS_VERSION_H_ -#define MMS_BUILD_STRING "-dev" -#define MMS_BUILD_UNIQUEID "610:1faa00e69cbb" MMS_BUILD_STRING +#define MMS_BUILD_STRING "" +#define MMS_BUILD_UNIQUEID "612:c0a3e4d8e000" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 From e4bacff3442d486236acd949b8c9d728cfdd359f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 01:49:30 -0600 Subject: [PATCH 08/14] Added tag mmsource-1.7.0 for changeset a272cfab9b41 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0a940a6..50269f4 100644 --- a/.hgtags +++ b/.hgtags @@ -15,3 +15,4 @@ a50090ca6e6a5f01122a9fbabc1ad6775cba5057 mmsource-1.3d 099d37d50e0413c0e0332a6fdf4611bad6b302fd mmsource-1.6.0 2b10484499c0e9fc131b4b296879a6d9b2f280d2 mmsource-1.6.1 3bce7260f26a48e37b0e849332d61ff1fde6b8b2 mmsource-1.6.2 +a272cfab9b41cfe80b8b3c6dd32fce429cebaaca mmsource-1.7.0 From f19eb7bf647a9a9434feac22679976f16a2f2101 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 01:51:01 -0600 Subject: [PATCH 09/14] Removed tag mmsource-1.7.0 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 50269f4..352d97f 100644 --- a/.hgtags +++ b/.hgtags @@ -16,3 +16,4 @@ a50090ca6e6a5f01122a9fbabc1ad6775cba5057 mmsource-1.3d 2b10484499c0e9fc131b4b296879a6d9b2f280d2 mmsource-1.6.1 3bce7260f26a48e37b0e849332d61ff1fde6b8b2 mmsource-1.6.2 a272cfab9b41cfe80b8b3c6dd32fce429cebaaca mmsource-1.7.0 +0000000000000000000000000000000000000000 mmsource-1.7.0 From b30297ea037c02523d772f14981ff0748893e8f0 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 01:51:43 -0600 Subject: [PATCH 10/14] Removed -dev for final builds. --- support/buildbot/bootstrap.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/buildbot/bootstrap.pl b/support/buildbot/bootstrap.pl index 0bf7eff..2f0047d 100755 --- a/support/buildbot/bootstrap.pl +++ b/support/buildbot/bootstrap.pl @@ -20,5 +20,5 @@ if ($^O eq "linux") Build::Command("flip -u support/versionchanger.pl"); Build::Command("chmod +x support/versionchanger.pl"); } -Build::Command(Build::PathFormat('support/versionchanger.pl') . ' --buildstring="-dev"'); +#Build::Command(Build::PathFormat('support/versionchanger.pl') . ' --buildstring="-dev"'); From 6608e4bf4d090e093ff0b11a31ef023347b91c9c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 01:51:57 -0600 Subject: [PATCH 11/14] Bumped build changesets. --- core-legacy/version.h | 2 +- core/version.h | 2 +- loader/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core-legacy/version.h b/core-legacy/version.h index 37860d3..833fc1d 100644 --- a/core-legacy/version.h +++ b/core-legacy/version.h @@ -4,7 +4,7 @@ #define _INCLUDE_MMS_VERSION_H_ #define MMS_BUILD_STRING "" -#define MMS_BUILD_UNIQUEID "612:c0a3e4d8e000" MMS_BUILD_STRING +#define MMS_BUILD_UNIQUEID "616:8453e69f1827" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 diff --git a/core/version.h b/core/version.h index 37860d3..833fc1d 100644 --- a/core/version.h +++ b/core/version.h @@ -4,7 +4,7 @@ #define _INCLUDE_MMS_VERSION_H_ #define MMS_BUILD_STRING "" -#define MMS_BUILD_UNIQUEID "612:c0a3e4d8e000" MMS_BUILD_STRING +#define MMS_BUILD_UNIQUEID "616:8453e69f1827" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 diff --git a/loader/version.h b/loader/version.h index 37860d3..833fc1d 100644 --- a/loader/version.h +++ b/loader/version.h @@ -4,7 +4,7 @@ #define _INCLUDE_MMS_VERSION_H_ #define MMS_BUILD_STRING "" -#define MMS_BUILD_UNIQUEID "612:c0a3e4d8e000" MMS_BUILD_STRING +#define MMS_BUILD_UNIQUEID "616:8453e69f1827" MMS_BUILD_STRING #define MMS_FULL_VERSION "1.7.0" MMS_BUILD_STRING #define MMS_FILE_VERSION 1,7,0,0 From 88ba2929f45f8c9555f4cc8d670cb264a11a3393 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 01:52:07 -0600 Subject: [PATCH 12/14] Added tag mmsource-1.7.0 for changeset c5e10372b1d4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 352d97f..692c2be 100644 --- a/.hgtags +++ b/.hgtags @@ -17,3 +17,4 @@ a50090ca6e6a5f01122a9fbabc1ad6775cba5057 mmsource-1.3d 3bce7260f26a48e37b0e849332d61ff1fde6b8b2 mmsource-1.6.2 a272cfab9b41cfe80b8b3c6dd32fce429cebaaca mmsource-1.7.0 0000000000000000000000000000000000000000 mmsource-1.7.0 +c5e10372b1d4d50950aca7d112e0324000d0e6cd mmsource-1.7.0 From 51b25845f7a29dc29912f108f64a16757b4ff7d4 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 26 Nov 2008 02:11:07 -0600 Subject: [PATCH 13/14] Switched the branch back to development status, bumped version to 1.7.1. --- modules.versions | 2 +- product.version | 2 +- support/buildbot/bootstrap.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.versions b/modules.versions index 328ed18..67ec2c6 100644 --- a/modules.versions +++ b/modules.versions @@ -1,7 +1,7 @@ [PRODUCT] major = 1 minor = 7 -revision = 0 +revision = 1 [core] folder = core diff --git a/product.version b/product.version index bd8bf88..943f9cb 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -1.7.0 +1.7.1 diff --git a/support/buildbot/bootstrap.pl b/support/buildbot/bootstrap.pl index 2f0047d..0bf7eff 100755 --- a/support/buildbot/bootstrap.pl +++ b/support/buildbot/bootstrap.pl @@ -20,5 +20,5 @@ if ($^O eq "linux") Build::Command("flip -u support/versionchanger.pl"); Build::Command("chmod +x support/versionchanger.pl"); } -#Build::Command(Build::PathFormat('support/versionchanger.pl') . ' --buildstring="-dev"'); +Build::Command(Build::PathFormat('support/versionchanger.pl') . ' --buildstring="-dev"'); From 7a8572cddd22fea821b7f0ac41932af7703f362d Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 26 Nov 2008 08:42:12 -0600 Subject: [PATCH 14/14] Cleaned up tags for consistency. --- .hgtags | 2 -- 1 file changed, 2 deletions(-) diff --git a/.hgtags b/.hgtags index 692c2be..5680fa5 100644 --- a/.hgtags +++ b/.hgtags @@ -15,6 +15,4 @@ a50090ca6e6a5f01122a9fbabc1ad6775cba5057 mmsource-1.3d 099d37d50e0413c0e0332a6fdf4611bad6b302fd mmsource-1.6.0 2b10484499c0e9fc131b4b296879a6d9b2f280d2 mmsource-1.6.1 3bce7260f26a48e37b0e849332d61ff1fde6b8b2 mmsource-1.6.2 -a272cfab9b41cfe80b8b3c6dd32fce429cebaaca mmsource-1.7.0 -0000000000000000000000000000000000000000 mmsource-1.7.0 c5e10372b1d4d50950aca7d112e0324000d0e6cd mmsource-1.7.0