Final 1.2.4 checkin.

.hgtags

@@ -5,3 +5,4 @@ b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2
 3a73bbf60f34befa9b66be03fa5974b394bb3411 sourcemod-1.2.0
 3c30a59c2296a13284a9f4eb42863b47db645adf sourcemod-1.2.1
 f55c735efeefe68863b96713fcd55a7774d8ceab sourcemod-1.2.2
+236a032c2a4da8f0af24b56b0539b1c574379be8 sourcemod-1.2.3

AMBuildScript

@@ -0,0 +1,288 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python:
+import os
+import sys
+from ambuild.command import SymlinkCommand
+
+class SM:
+	def __init__(self):
+		self.compiler = Cpp.Compiler()
+
+		#Build SDK info
+		self.sdkInfo = { }
+		self.sdkInfo['ep1'] =   {'sdk': 'HL2SDK',        'ext': '1.ep1',   'def': '1',
+		                         'name': 'EPISODEONE'}
+		self.sdkInfo['ep2'] =   {'sdk': 'HL2SDKOB',      'ext': '2.ep2',   'def': '3',
+		                         'name': 'ORANGEBOX'}
+		self.sdkInfo['ep2v'] =  {'sdk': 'HL2SDKOBVALVE', 'ext': '2.ep2v',  'def': '4',
+		                         'name': 'ORANGEBOXVALVE'}
+		self.sdkInfo['l4d'] =   {'sdk': 'HL2SDKL4D',     'ext': '2.l4d',   'def': '5',
+		                         'name': 'LEFT4DEAD'}
+		if AMBuild.target['platform'] == 'windows':
+			self.sdkInfo['darkm'] = {'sdk': 'HL2SDK-DARKM',  'ext': '2.darkm', 'def': '2',
+		                           'name': 'DARKMESSIAH'}
+
+		if AMBuild.mode == 'config':
+			#Detect compilers
+			self.compiler.DetectAll(AMBuild)
+
+			#Detect variables
+			envvars = { 'MMSOURCE17':    'mmsource-1.7',
+									'HL2SDK':        'hl2sdk',
+									'HL2SDKOB':      'hl2sdk-ob',
+									'HL2SDKL4D':     'hl2sdk-l4d',
+									'HL2SDKOBVALVE': 'hl2sdk-ob-valve',
+									'MYSQL5':        'mysql-5.0'
+			}
+
+			#Dark Messiah is Windows-only
+			if AMBuild.target['platform'] == 'windows':
+				envvars['HL2SDK-DARKM'] = 'hl2sdk-darkm'
+
+			#Must have a path for each envvar (file a bug if you don't like this)
+			for i in envvars:
+				if i in os.environ:
+					path = os.environ[i]
+					if not os.path.isdir(path):
+						raise Exception('Path for {0} was not found: {1}'.format(i, path))
+				else:
+					head = os.getcwd()
+					while head != None and head != '/':
+						path = os.path.join(head, envvars[i])
+						if os.path.isdir(path):
+							break
+						head, tail = os.path.split(head)
+					if head == None or head == '/':
+						raise Exception('Could not find a valid path for {0}'.format(i))
+				AMBuild.cache.CacheVariable(i, path)
+
+			#Set up defines
+			cxx = self.compiler.cxx
+			if isinstance(cxx, Cpp.GCC):
+				self.vendor = 'gcc'
+				self.compiler.AddToListVar('CDEFINES', 'stricmp=strcasecmp')
+				self.compiler.AddToListVar('CDEFINES', '_stricmp=strcasecmp')
+				self.compiler.AddToListVar('CDEFINES', '_snprintf=snprintf')
+				self.compiler.AddToListVar('CDEFINES', '_vsnprintf=vsnprintf')
+				self.compiler.AddToListVar('CFLAGS', '-pipe')
+				self.compiler.AddToListVar('CFLAGS', '-fno-strict-aliasing')
+				if cxx.majorVersion >= 4:
+					self.compiler.AddToListVar('CFLAGS', '-fvisibility=hidden')
+					self.compiler.AddToListVar('CXXFLAGS', '-fvisibility-inlines-hidden')
+				self.compiler.AddToListVar('CFLAGS', '-Wall')
+				self.compiler.AddToListVar('CFLAGS', '-Werror')
+				self.compiler.AddToListVar('CFLAGS', '-Wno-uninitialized')
+				self.compiler.AddToListVar('CFLAGS', '-Wno-unused')
+				self.compiler.AddToListVar('CFLAGS', '-Wno-switch')
+				self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse')
+				self.compiler.AddToListVar('CFLAGS', '-msse')
+				self.compiler.AddToListVar('CFLAGS', '-m32')
+				self.compiler.AddToListVar('CFLAGS', '-static-libgcc')
+				self.compiler.AddToListVar('CXXFLAGS', '-fno-exceptions')
+				self.compiler.AddToListVar('CXXFLAGS', '-fno-rtti')
+				self.compiler.AddToListVar('CXXFLAGS', '-fno-threadsafe-statics')
+				self.compiler.AddToListVar('CXXFLAGS', '-Wno-non-virtual-dtor')
+				self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
+			elif isinstance(cxx, Cpp.MSVC):
+				self.vendor = 'msvc'
+				if AMBuild.options.debug == '1':
+					self.compiler.AddToListVar('CFLAGS', '/MTd')
+				else:
+					self.compiler.AddToListVar('CFLAGS', '/MT')
+				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_DEPRECATE')
+				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_WARNINGS')
+				self.compiler.AddToListVar('CDEFINES', '_CRT_NONSTDC_NO_DEPRECATE')
+				self.compiler.AddToListVar('CXXFLAGS', '/EHsc')
+				self.compiler.AddToListVar('CXXFLAGS', '/GR-')
+				self.compiler.AddToListVar('CFLAGS', '/W3')
+				self.compiler.AddToListVar('CFLAGS', '/nologo')
+				self.compiler.AddToListVar('CFLAGS', '/Zi')
+				self.compiler.AddToListVar('CXXFLAGS', '/TP')
+				self.compiler.AddToListVar('POSTLINKFLAGS', '/DEBUG')
+				self.compiler.AddToListVar('POSTLINKFLAGS', '/MACHINE:X86')
+				self.compiler.AddToListVar('POSTLINKFLAGS', '/SUBSYSTEM:WINDOWS')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'kernel32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'user32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'gdi32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'winspool.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'comdlg32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'advapi32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'shell32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'ole32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'oleaut32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'uuid.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'odbc32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'odbccp32.lib')
+
+			#Optimization
+			if AMBuild.options.opt == '1':
+				self.compiler.AddToListVar('CDEFINES', 'NDEBUG')
+				if self.vendor == 'gcc':
+					self.compiler.AddToListVar('CFLAGS', '-O3')
+				elif self.vendor == 'msvc':
+					self.compiler.AddToListVar('CFLAGS', '/Ot')
+					self.compiler.AddToListVar('POSTLINKFLAGS', '/OPT:ICF')
+
+			#Debugging
+			if AMBuild.options.debug == '1':
+				self.compiler.AddToListVar('CDEFINES', 'DEBUG')
+				self.compiler.AddToListVar('CDEFINES', '_DEBUG')
+				if self.vendor == 'gcc':
+					self.compiler.AddToListVar('CFLAGS', '-g3')
+				elif self.vendor == 'msvc':
+					self.compiler.AddToListVar('CFLAGS', '/Od')
+					self.compiler.AddToListVar('CFLAGS', '/RTC1')
+
+			#Platform-specifics
+			if AMBuild.target['platform'] == 'linux':
+				self.compiler.AddToListVar('CDEFINES', '_LINUX')
+			elif AMBuild.target['platform'] == 'windows':
+				self.compiler.AddToListVar('CDEFINES', 'WIN32')
+				self.compiler.AddToListVar('CDEFINES', '_WINDOWS')
+
+			#Finish up
+			self.compiler.AddToListVar('CDEFINES', 'SOURCEMOD_BUILD')
+			self.compiler.AddToListVar('CDEFINES', 'SM_GENERATED_BUILD')
+			self.compiler.AddToListVar('CINCLUDES',
+			                           os.path.join(AMBuild.outputFolder, 'includes'))
+			self.compiler.ToConfig(AMBuild, 'compiler')
+			AMBuild.cache.CacheVariable('vendor', self.vendor)
+			self.targetMap = { }
+			AMBuild.cache.CacheVariable('targetMap', self.targetMap)
+		else:
+			self.compiler.FromConfig(AMBuild, 'compiler')
+			self.targetMap = AMBuild.cache['targetMap']
+
+		if AMBuild.target['platform'] == 'windows':
+			self.compiler.AddToListVar('RCINCLUDES', os.path.join(AMBuild.sourceFolder, 'public'))
+		self.mmsPath = AMBuild.cache['MMSOURCE17']
+
+	def DefaultCompiler(self):
+		return self.compiler.Clone()
+
+	def JobMatters(self, jobname):
+		file = sys._getframe().f_code.co_filename
+		if AMBuild.mode == 'config':
+			self.targetMap[jobname] = file
+			return True
+		if len(AMBuild.args) == 0:
+			return True
+		if not jobname in AMBuild.args:
+			return False
+
+	def DefaultExtCompiler(self, path):
+		compiler = self.DefaultCompiler()
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path, 'sdk'))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public'))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'extensions'))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'sourcepawn'))
+		return compiler
+
+	def AutoVersion(self, folder, binary):
+		if AMBuild.target['platform'] != 'windows':
+			return
+		env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"']}
+		binary.AddResourceFile(os.path.join(folder, 'version.rc' ), env)
+
+	def PreSetupHL2Job(self, job, builder, sdk):
+		info = self.sdkInfo[sdk]
+		sdkPath = AMBuild.cache[info['sdk']]
+		if AMBuild.target['platform'] == 'linux':
+			if sdk == 'ep1':
+				staticLibs = os.path.join(sdkPath, 'linux_sdk')
+			else:
+				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
+			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
+			for i in ['tier1_i486.a', 'mathlib_i486.a', 'vstdlib_i486.so', 'tier0_i486.so']:
+				link = os.path.join(workFolder, i)
+				target = os.path.join(staticLibs, i)
+				try:
+					os.lstat(link)
+				except:
+					job.AddCommand(SymlinkCommand(link, target))
+		elif AMBuild.target['platform'] == 'windows':
+			for lib in ['tier0', 'tier1', 'vstdlib', 'mathlib']:
+				libPath = os.path.join(sdkPath, 'lib', 'public', lib) + '.lib'
+				builder.RebuildIfNewer(libPath)
+				builder['POSTLINKFLAGS'].append(libPath)
+
+	def PostSetupHL2Job(self, job, builder, sdk):
+		if AMBuild.target['platform'] == 'linux':
+			builder.AddObjectFiles(['tier1_i486.a', 'mathlib_i486.a'])
+
+	def DefaultHL2Compiler(self, path, sdk, noLink = False, oldMms = '-legacy'):
+		compiler = self.DefaultExtCompiler(path)
+
+		mms = 'core'
+		if sdk == 'ep1':
+			mms += oldMms
+
+		compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms))
+		compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms, 'sourcehook'))
+
+		info = self.sdkInfo
+		compiler['CDEFINES'].extend(['SE_' + info[i]['name'] + '=' + info[i]['def'] for i in info])
+		compiler['CDEFINES'].append('SE_DARKMESSIAH=2')
+
+		paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'],
+						 ['public', 'tier0'], ['public', 'tier1']]
+		if sdk == 'ep1' or sdk == 'darkm':
+			paths.append(['public', 'dlls'])
+		else:
+			paths.append(['public', 'game', 'server'])
+			paths.append(['common'])
+
+		info = self.sdkInfo[sdk]
+		sdkPath = AMBuild.cache[info['sdk']]
+
+		compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def'])
+
+		if sdk == 'ep1':
+			if AMBuild.target['platform'] == 'linux':
+				staticLibs = os.path.join(sdkPath, 'linux_sdk')
+		else:
+			if AMBuild.target['platform'] == 'linux':
+				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
+
+		for i in paths:
+			compiler['CXXINCLUDES'].append(os.path.join(sdkPath, *i))
+
+		if not noLink:
+			if AMBuild.target['platform'] == 'linux':
+				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
+				compiler['POSTLINKFLAGS'][0:0] = ['tier0_i486.so']
+				compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_i486.so']
+
+		return compiler
+
+sm = SM()
+globals = {
+	'SM': sm
+}
+
+AMBuild.Include(os.path.join('tools', 'buildbot', 'Versioning'), globals)
+
+FileList = [
+		['loader', 'AMBuilder'],
+		['core', 'AMBuilder'],
+		['extensions', 'bintools', 'AMBuilder'],
+		['extensions', 'clientprefs', 'AMBuilder'],
+		['extensions', 'cstrike', 'AMBuilder'],
+		['extensions', 'curl', 'AMBuilder'],
+		['extensions', 'geoip', 'AMBuilder'],
+		['extensions', 'mysql', 'AMBuilder'],
+		['extensions', 'sdktools', 'AMBuilder'],
+		['extensions', 'topmenus', 'AMBuilder'],
+		['extensions', 'updater', 'AMBuilder'],
+		['extensions', 'sqlite', 'AMBuilder'],
+		['extensions', 'regex', 'AMBuilder'],
+		['extensions', 'tf2', 'AMBuilder'],
+		['sourcepawn', 'jit', 'AMBuilder'],
+		['sourcepawn', 'compiler', 'AMBuilder'],
+		['plugins', 'AMBuilder'],
+		['tools', 'buildbot', 'PackageScript']
+	]
+
+for parts in FileList:
+	AMBuild.Include(os.path.join(*parts), globals)
+

changelog.txt

@@ -2,6 +2,21 @@ SourceMod Changelog
 
 ----------------------------
 
+SourceMod 1.2.4 [2009-10-03]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.4_Release_Notes
+
+ - Updated for L4D changes (bugs 4032, 4033, 4035).
+ - Updated GeoLite Country database for GeoIP extension.
+ - Fixed crash when block-loading more than eight plugins (bug 4034).
+ - Fixed rare crash in hudtext code on TF (bug 4016).
+ - Fixed crash when reloading a blocked plugin failed (bug 4038).
+ - Fixed Huntsman not firing critical callback on TF (bug 3927).
+ - Registering the "sm" command no longer has any effect (bug 4013).
+ - Fixed translation bug in extension API (bug 4010).
+
+----------------------------
+
 SourceMod 1.2.3 [2009-08-28]
 
 URL: http://wiki.alliedmods.net/SourceMod_1.2.3_Release_Notes

configure.py

@@ -0,0 +1,10 @@
+# vim: set ts=2 sw=2 tw=99 noet:
+import sys
+import ambuild.runner as runner
+
+run = runner.Runner()
+run.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
+                       help='Enable debugging symbols')
+run.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
+                       help='Enable optimization')
+run.Configure(sys.path[0])

core/AMBuilder

@@ -0,0 +1,108 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+for i in SM.sdkInfo:
+	sdk = SM.sdkInfo[i]
+	name = 'sourcemod.' + sdk['ext']
+
+	compiler = SM.DefaultHL2Compiler('core', i)
+	compiler['CDEFINES'].append('SM_DEFAULT_THREADER')
+	if AMBuild.target['platform'] == 'linux':
+		compiler['POSTLINKFLAGS'].append('-lpthread')
+
+	extension = AMBuild.AddJob(name)
+	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
+	SM.PreSetupHL2Job(extension, binary, i)
+	files = [
+		'AdminCache.cpp',
+		'ExtensionSys.cpp',
+		'MenuStyle_Valve.cpp',
+		'sm_crc32.cpp',
+		'smn_entities.cpp',
+		'smn_maplists.cpp',
+		'sm_stringutil.cpp',
+		'ADTFactory.cpp',
+		'ForwardSys.cpp',
+		'MenuVoting.cpp',
+		'sm_memtable.cpp',
+		'smn_events.cpp',
+		'smn_menus.cpp',
+		'sm_trie.cpp',
+		'CDataPack.cpp',
+		'frame_hooks.cpp',
+		'NativeInvoker.cpp',
+		'smn_admin.cpp',
+		'smn_fakenatives.cpp',
+		'smn_nextmap.cpp',
+		'sourcemm_api.cpp',
+		'ChatTriggers.cpp',
+		'GameConfigs.cpp',
+		'NativeOwner.cpp',
+		'smn_adt_array.cpp',
+		'smn_filesystem.cpp',
+		'smn_player.cpp',
+		'sourcemod.cpp',
+		'concmd_cleaner.cpp',
+		'HalfLife2.cpp',
+		'NextMap.cpp',
+		'smn_adt_stack.cpp',
+		'smn_float.cpp',
+		'smn_profiler.cpp',
+		'TextParsers.cpp',
+		'ConCmdManager.cpp',
+		'HandleSys.cpp',
+		'PhraseCollection.cpp',
+		'smn_adt_trie.cpp',
+		'smn_functions.cpp',
+		'smn_sorting.cpp',
+		'ThreadSupport.cpp',
+		'ConVarManager.cpp',
+		'LibrarySys.cpp',
+		'PlayerManager.cpp',
+		'smn_banning.cpp',
+		'smn_gameconfigs.cpp',
+		'smn_string.cpp',
+		'TimerSys.cpp',
+		'CoreConfig.cpp',
+		'Logger.cpp',
+		'PluginInfoDatabase.cpp',
+		'smn_bitbuffer.cpp',
+		'smn_halflife.cpp',
+		'smn_textparse.cpp',
+		'Translator.cpp',
+		'MemoryUtils.cpp',
+		'PluginSys.cpp',
+		'smn_console.cpp',
+		'smn_handles.cpp',
+		'smn_timers.cpp',
+		'UserMessages.cpp',
+		'Database.cpp',
+		'MenuManager.cpp',
+		'Profiler.cpp',
+		'smn_core.cpp',
+		'smn_hudtext.cpp',
+		'smn_usermsgs.cpp',
+		'DebugReporter.cpp',
+		'MenuStyle_Base.cpp',
+		'ShareSys.cpp',
+		'smn_database.cpp',
+		'smn_keyvalues.cpp',
+		'smn_vector.cpp',
+		'EventManager.cpp',
+		'MenuStyle_Radio.cpp',
+		'sm_autonatives.cpp',
+		'smn_datapacks.cpp',
+		'smn_lang.cpp',
+		'sm_srvcmds.cpp',
+		'thread/ThreadWorker.cpp',
+		'thread/BaseWorker.cpp'
+		]
+	if AMBuild.target['platform'] == 'windows':
+		files.append('thread/WinThreads.cpp')
+	else:
+		files.append('thread/PosixThreads.cpp')
+	binary.AddSourceFiles('core', files)
+	SM.PostSetupHL2Job(extension, binary, i)
+	SM.AutoVersion('core', binary)
+	binary.SendToJob()
+

core/CoreConfig.cpp

@@ -34,7 +34,7 @@
 #include "sourcemod.h"
 #include "sourcemm_api.h"
 #include "sm_srvcmds.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 #include "sm_stringutil.h"
 #include "LibrarySys.h"
 #include "Logger.h"
@@ -381,7 +381,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", SVN_FULL_VERSION);
+				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SM_FULL_VERSION);
 				fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
 				fprintf(fp, "\n\n");
 

core/Logger.cpp

@@ -36,7 +36,7 @@
 #include "Logger.h"
 #include "LibrarySys.h"
 #include "TimerSys.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 
 Logger g_Logger;
 
@@ -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, SVN_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_FULL_VERSION);
 		fclose(fp);
 	}
 }
@@ -356,7 +356,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, SVN_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_FULL_VERSION);
 	 	}
 		va_list ap;
 		va_start(ap, vafmt);

core/PlayerManager.cpp

@@ -47,7 +47,7 @@
 #include <iclient.h>
 #include "GameConfigs.h"
 #include "ExtensionSys.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 
 PlayerManager g_Players;
 bool g_OnMapStarted = false;
@@ -698,7 +698,7 @@ void PlayerManager::OnClientCommand(edict_t *pEntity)
 		}
 
 		ClientConsolePrint(pEntity,
-			"SourceMod %s, by AlliedModders LLC", SVN_FULL_VERSION);
+			"SourceMod %s, by AlliedModders LLC", SM_FULL_VERSION);
 		ClientConsolePrint(pEntity,
 			"To see running plugins, type \"sm plugins\"");
 		ClientConsolePrint(pEntity,

core/PluginInfoDatabase.cpp

@@ -276,7 +276,7 @@ SMCResult CPluginInfoDatabase::ReadSMC_LeavingSection(const SMCStates *states)
 					{
 						m_infodb_size *= 2;
 					}
-					int newidx = memtab->CreateMem(m_infodb_size, (void **)&table);
+					int newidx = memtab->CreateMem(m_infodb_size * sizeof(int), (void **)&table);
 					if (m_infodb != -1)
 					{
 						void *oldtable = (int *)memtab->GetAddress(m_infodb);

core/PluginSys.cpp

@@ -60,7 +60,7 @@ CPlugin::CPlugin(const char *file)
 	m_serial = ++MySerial;
 	m_pRuntime = NULL;
 	m_errormsg[256] = '\0';
-	snprintf(m_filename, sizeof(m_filename), "%s", file);
+	UTIL_Format(m_filename, sizeof(m_filename), "%s", file);
 	m_handle = 0;
 	m_ident = NULL;
 	m_pProps = sm_trie_create();
@@ -164,7 +164,7 @@ CPlugin *CPlugin::CreatePlugin(const char *file, char *error, size_t maxlength)
 	{
 		if (error)
 		{
-			snprintf(error, maxlength, "Unable to open file");
+			UTIL_Format(error, maxlength, "Unable to open file");
 		}
 		pPlugin->m_status = Plugin_BadLoad;
 		return pPlugin;
@@ -210,7 +210,7 @@ void CPlugin::SetErrorState(PluginStatus status, const char *error_fmt, ...)
 
 	va_list ap;
 	va_start(ap, error_fmt);
-	vsnprintf(m_errormsg, sizeof(m_errormsg), error_fmt, ap);
+	UTIL_FormatArgs(m_errormsg, sizeof(m_errormsg), error_fmt, ap);
 	va_end(ap);
 
 	if (m_pRuntime != NULL)
@@ -851,7 +851,7 @@ void CPluginManager::LoadPluginsFromDir(const char *basedir, const char *localpa
 			if (localpath == NULL)
 			{
 				/* If no path yet, don't add a former slash */
-				snprintf(new_local, sizeof(new_local), "%s", dir->GetEntryName());
+				UTIL_Format(new_local, sizeof(new_local), "%s", dir->GetEntryName());
 			} else {
 				g_LibSys.PathFormat(new_local, sizeof(new_local), "%s/%s", localpath, dir->GetEntryName());
 			}
@@ -866,7 +866,7 @@ void CPluginManager::LoadPluginsFromDir(const char *basedir, const char *localpa
 				char plugin[PLATFORM_MAX_PATH];
 				if (localpath == NULL)
 				{
-					snprintf(plugin, sizeof(plugin), "%s", name);
+					UTIL_Format(plugin, sizeof(plugin), "%s", name);
 				} else {
 					g_LibSys.PathFormat(plugin, sizeof(plugin), "%s/%s", localpath, name);
 				}
@@ -965,7 +965,7 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 				{
 					if (error)
 					{
-						snprintf(error, maxlength, "Unable to set JIT option (key \"%s\") (value \"%s\")", key, val);
+						UTIL_Format(error, maxlength, "Unable to set JIT option (key \"%s\") (value \"%s\")", key, val);
 					}
 					co->Abort();
 					co = NULL;
@@ -984,7 +984,7 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 		pPlugin->m_pRuntime = g_pSourcePawn2->LoadPlugin(co, fullpath, &err);
 		if (pPlugin->m_pRuntime == NULL)
 		{
-			snprintf(error, 
+			UTIL_Format(error, 
 				maxlength, 
 				"Unable to load plugin (error %d: %s)", 
 				err, 
@@ -1053,13 +1053,16 @@ IPlugin *CPluginManager::LoadPlugin(const char *path, bool debug, PluginType typ
 
 	if (res == LoadRes_NeverLoad)
 	{
-		if (m_LoadingLocked)
+		if (error)
 		{
-			UTIL_Format(error, maxlength, "There is a global plugin loading lock in effect");
-		}
-		else
-		{
-			UTIL_Format(error, maxlength, "This plugin is blocked from loading (see plugin_settings.cfg)");
+			if (m_LoadingLocked)
+			{
+				UTIL_Format(error, maxlength, "There is a global plugin loading lock in effect");
+			}
+			else
+			{
+				UTIL_Format(error, maxlength, "This plugin is blocked from loading (see plugin_settings.cfg)");
+			}
 		}
 		return NULL;
 	}
@@ -1189,7 +1192,7 @@ bool CPluginManager::FindOrRequirePluginDeps(CPlugin *pPlugin, char *error, size
 					{
 						if (error)
 						{
-							snprintf(error, maxlength, "Fatal error during initializing plugin load");
+							UTIL_Format(error, maxlength, "Fatal error during initializing plugin load");
 						}
 						return false;
 					}
@@ -1222,7 +1225,7 @@ bool CPluginManager::FindOrRequirePluginDeps(CPlugin *pPlugin, char *error, size
 				{
 					if (error)
 					{
-						snprintf(error, maxlength, "Could not find required plugin \"%s\"", name);
+						UTIL_Format(error, maxlength, "Could not find required plugin \"%s\"", name);
 					}
 					return false;
 				}
@@ -1293,7 +1296,7 @@ bool CPluginManager::LoadOrRequireExtensions(CPlugin *pPlugin, unsigned int pass
 					{
 						if (error)
 						{
-							snprintf(error, maxlength, "Required extension \"%s\" file(\"%s\") not running", name, file);
+							UTIL_Format(error, maxlength, "Required extension \"%s\" file(\"%s\") not running", name, file);
 						}
 						return false;
 					}
@@ -1361,7 +1364,7 @@ bool CPluginManager::RunSecondPass(CPlugin *pPlugin, char *error, size_t maxleng
 		{
 			if (error)
 			{
-				snprintf(error, maxlength, "Native \"%s\" was not found", native->name);
+				UTIL_Format(error, maxlength, "Native \"%s\" was not found", native->name);
 			}
 			return false;
 		}

core/sm_srvcmds.cpp

@@ -30,7 +30,7 @@
  */
 
 #include "sm_srvcmds.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 #include "sm_stringutil.h"
 #include "HandleSys.h"
 #include "CoreConfig.h"
@@ -39,7 +39,7 @@
 
 RootConsoleMenu g_RootMenu;
 
-ConVar sourcemod_version("sourcemod_version", SVN_FULL_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
+ConVar sourcemod_version("sourcemod_version", SM_FULL_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
 
 RootConsoleMenu::RootConsoleMenu()
 {
@@ -280,7 +280,7 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand &
 	else if (strcmp(cmdname, "version") == 0)
 	{
 		ConsolePrint(" SourceMod Version Information:");
-		ConsolePrint("    SourceMod Version: %s", SVN_FULL_VERSION);
+		ConsolePrint("    SourceMod Version: %s", SM_FULL_VERSION);
 		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__);

core/sm_stringutil.cpp

@@ -857,7 +857,7 @@ try_again:
 					memcpy(new_params, params, sizeof(void *) * numparams);
 					for (i = 0; i < trans.fmt_count; i++)
 					{
-						new_params[i] = const_cast<void *>(params[curparam + trans.fmt_order[i]]);
+						new_params[curparam + i] = const_cast<void *>(params[curparam + trans.fmt_order[i]]);
 					}
 
 					if (!gnprintf(buf_p,

core/sm_version.tpl

@@ -1,48 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SOURCEMOD_VERSION_H_
-#define _INCLUDE_SOURCEMOD_VERSION_H_
-
-/**
- * @file Contains SourceMod version information.
- */
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_SOURCEMOD_VERSION_H_

core/smn_console.cpp

@@ -665,6 +665,12 @@ static cell_t sm_RegServerCmd(IPluginContext *pContext, const cell_t *params)
 	IPluginFunction *pFunction;
 
 	pContext->LocalToString(params[1], &name);
+
+	if (strcasecmp(name, "sm") == 0)
+	{
+		return 0;
+	}
+
 	pContext->LocalToString(params[3], &help);
 	pFunction = pContext->GetFunctionById(params[2]);
 
@@ -687,6 +693,12 @@ static cell_t sm_RegConsoleCmd(IPluginContext *pContext, const cell_t *params)
 	IPluginFunction *pFunction;
 
 	pContext->LocalToString(params[1], &name);
+
+	if (strcasecmp(name, "sm") == 0)
+	{
+		return 0;
+	}
+
 	pContext->LocalToString(params[3], &help);
 	pFunction = pContext->GetFunctionById(params[2]);
 
@@ -712,6 +724,12 @@ static cell_t sm_RegAdminCmd(IPluginContext *pContext, const cell_t *params)
 	int cmdflags = params[6];
 
 	pContext->LocalToString(params[1], &name);
+
+	if (strcasecmp(name, "sm") == 0)
+	{
+		return 0;
+	}
+
 	pContext->LocalToString(params[4], &help);
 	pContext->LocalToString(params[5], (char **)&group);
 	pFunction = pContext->GetFunctionById(params[2]);

core/smn_hudtext.cpp

@@ -42,7 +42,7 @@ int g_HudMsgNum = -1;
 
 struct hud_syncobj_t
 {
-	int *player_channels;
+	int player_channels[256 + 1];
 };
 
 struct player_chaninfo_t
@@ -116,7 +116,6 @@ public:
 	{
 		hud_syncobj_t *obj = (hud_syncobj_t *)object;
 
-		delete [] obj->player_channels;
 		delete obj;
 	}
 
@@ -138,27 +137,19 @@ public:
 	Handle_t CreateHudSyncObj(IdentityToken_t *pIdent)
 	{
 		Handle_t hndl;
-		int max_clients;
 		HandleError err;
 		hud_syncobj_t *obj;
 		HandleSecurity sec;
 
-		if ((max_clients = g_Players.MaxClients()) == 0)
-		{
-			max_clients = 256+1;
-		}
-
 		obj = new hud_syncobj_t;
-		obj->player_channels = new int[max_clients];
 
-		memset(obj->player_channels, 0, sizeof(int) * max_clients);
+		memset(obj->player_channels, 0, sizeof(obj->player_channels));
 
 		sec = HandleSecurity(pIdent, g_pCoreIdent);
 		
 		if ((hndl = g_HandleSys.CreateHandleEx(m_hHudSyncObj, obj, &sec, NULL, &err))
 			== BAD_HANDLE)
 		{
-			delete [] obj->player_channels;
 			delete obj;
 		}
 

core/smn_profiler.cpp

@@ -34,9 +34,7 @@
 
 //Note: Do not add this to Linux yet, i haven't done the HPET timing research (if even available)
 //nonetheless we need accurate counting
-#if defined PLATFORM_LINUX
-#error "Not supported"
-#endif
+#if !defined PLATFORM_LINUX
 
 struct Profiler
 {
@@ -183,3 +181,5 @@ REGISTER_NATIVES(profilerNatives)
 	{"StopProfiling",			StopProfiling},
 	{NULL,						NULL},
 };
+#endif
+

core/sourcemm_api.cpp

@@ -31,7 +31,7 @@
 
 #include "sourcemod.h"
 #include "sourcemm_api.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 #include "Logger.h"
 #include "ExtensionSys.h"
 #include "concmd_cleaner.h"
@@ -145,7 +145,7 @@ const char *SourceMod_Core::GetLicense()
 
 const char *SourceMod_Core::GetVersion()
 {
-	return SVN_FULL_VERSION;
+	return SM_FULL_VERSION;
 }
 
 const char *SourceMod_Core::GetDate()

core/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "sm_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "SourceMod"
             VALUE "FileDescription", "SourceMod Core"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "sourcemod"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/bintools/AMBuilder

@@ -0,0 +1,30 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+for i in SM.sdkInfo:
+	sdk = SM.sdkInfo[i]
+	name = 'bintools.ext.' + sdk['ext']
+	
+	compiler = SM.DefaultHL2Compiler('extensions/bintools', i, True, '')
+	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit'))
+	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit', 'x86'))
+
+	if i != 'ep1':
+		compiler['CDEFINES'].append('HOOKING_ENABLED')
+
+	extension = AMBuild.AddJob(name)
+	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
+	SM.PreSetupHL2Job(extension, binary, i)
+	binary.AddSourceFiles('extensions/bintools', [
+		'extension.cpp',
+		'CallMaker.cpp',
+		'CallWrapper.cpp',
+		'HookWrapper.cpp',
+		'jit_call.cpp',
+		'jit_hook.cpp',
+		'sdk/smsdk_ext.cpp'
+		])
+	SM.PostSetupHL2Job(extension, binary, i)
+	SM.AutoVersion('extensions/bintools', binary)
+	binary.SendToJob()
+

extensions/bintools/extension.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet:
  * =============================================================================
  * SourceMod BinTools Extension
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "CallMaker.h"
 
@@ -54,3 +55,14 @@ bool BinTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 
 	return true;
 }
+
+const char *BinTools::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *BinTools::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/bintools/extension.h

@@ -81,6 +81,8 @@ public:
 	 * @return			True if working, false otherwise.
 	 */
 	//virtual bool QueryRunning(char *error, size_t maxlength);
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
 public:
 #if defined SMEXT_CONF_METAMOD
 	/**

extensions/bintools/sdk/smsdk_config.h

@@ -31,7 +31,6 @@
 
 #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
-#include "svn_version.h"
 
 /**
  * @file smsdk_config.h
@@ -41,12 +40,12 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"BinTools"
 #define SMEXT_CONF_DESCRIPTION	"Low-level C/C++ Calling API"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"SAMPLE"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/bintools/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod BinTools Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_BINTOOLS_VERSION_H_
-#define _INCLUDE_BINTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_BINTOOLS_VERSION_H_

extensions/bintools/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod BinTools Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_BINTOOLS_VERSION_H_
-#define _INCLUDE_BINTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_BINTOOLS_VERSION_H_

extensions/bintools/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "BinTools Extension"
             VALUE "FileDescription", "SourceMod BinTools Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod BinTools Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod BinTools Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/clientprefs/AMBuilder

@@ -0,0 +1,19 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+compiler = SM.DefaultExtCompiler('extensions/clientprefs')
+compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+
+extension = AMBuild.AddJob('clientprefs.ext')
+binary = Cpp.LibraryBuilder('clientprefs.ext', AMBuild, extension, compiler)
+binary.AddSourceFiles('extensions/clientprefs', [
+	'extension.cpp',
+	'cookie.cpp',
+	'menus.cpp',
+	'natives.cpp',
+	'query.cpp',
+	'sdk/smsdk_ext.cpp'
+	])
+SM.AutoVersion('extensions/clientprefs', binary)
+binary.SendToJob()
+

extensions/clientprefs/cookie.h

@@ -33,6 +33,7 @@
 #define _INCLUDE_SOURCEMOD_CLIENTPREFS_COOKIE_H_
 
 #include "extension.h"
+#include <IPlayerHelpers.h>
 #include "sh_list.h"
 #include "sm_trie_tpl.h"
 

extensions/clientprefs/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 
 /**
@@ -430,5 +431,13 @@ bool Translate(char *buffer,
 	return true;
 }
 
+const char *ClientPrefs::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
 
+const char *ClientPrefs::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
 

extensions/clientprefs/extension.h

@@ -84,6 +84,9 @@ public:
 
 	virtual void NotifyInterfaceDrop(SMInterface *pInterface);
 
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
+
 	void DatabaseConnect();
 
 	bool AddQueryToQueue(TQueryOp *query);

extensions/clientprefs/sdk/smsdk_config.h

@@ -37,17 +37,15 @@
  * @brief Contains macros for configuring basic extension information.
  */
 
-#include "svn_version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"Client Preferences"
 #define SMEXT_CONF_DESCRIPTION	"Saves client preference settings"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"CLIENTPREFS"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/clientprefs/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod SDKTools Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_CLIENTPREFS_VERSION_H_
-#define _INCLUDE_CLIENTPREFS_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_CLIENTPREFS_VERSION_H_

extensions/clientprefs/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod SDKTools Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_CLIENTPREFS_VERSION_H_
-#define _INCLUDE_CLIENTPREFS_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_CLIENTPREFS_VERSION_H_

extensions/clientprefs/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  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", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             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", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/cstrike/AMBuilder

@@ -0,0 +1,21 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+sdk = SM.sdkInfo['ep1']
+compiler = SM.DefaultHL2Compiler('extensions/cstrike', 'ep1')
+
+name = 'game.cstrike.ext.' + sdk['ext']
+extension = AMBuild.AddJob(name)
+binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
+SM.PreSetupHL2Job(extension, binary, 'ep1')
+binary.AddSourceFiles('extensions/cstrike', [
+	'extension.cpp',
+	'natives.cpp',
+	'RegNatives.cpp',
+	'timeleft.cpp',
+	'sdk/smsdk_ext.cpp'
+	])
+SM.PostSetupHL2Job(extension, binary, 'ep1')
+SM.AutoVersion('extensions/cstrike', binary)
+binary.SendToJob()
+

extensions/cstrike/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "RegNatives.h"
 #include "timeleft.h"
@@ -250,3 +251,14 @@ bool CStrike::ProcessCommandTarget(cmd_target_info_t *info)
 
 	return true;
 }
+
+const char *CStrike::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *CStrike::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/cstrike/extension.h

@@ -86,6 +86,9 @@ public:
 
 	void NotifyInterfaceDrop(SMInterface *pInterface);
 	bool QueryInterfaceDrop(SMInterface *pInterface);
+
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
 public:
 	bool ProcessCommandTarget(cmd_target_info_t *info);
 public:

extensions/cstrike/sdk/smsdk_config.h

@@ -37,17 +37,15 @@
  * @brief Contains macros for configuring basic extension information.
  */
 
-#include "svn_version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"CS:S Tools"
 #define SMEXT_CONF_DESCRIPTION	"CS:S extended functionality"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"CSTRIKE"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/cstrike/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Counter-Strike:Source Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
-#define _INCLUDE_SDKTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/cstrike/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Counter-Strike:Source Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
-#define _INCLUDE_SDKTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/cstrike/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  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", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             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", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/curl/AMBuilder

@@ -0,0 +1,67 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python : 
+import os.path
+import ambuild.command as command
+import ambuild.osutil as osutil
+
+def BuildCURL():
+	curl = AMBuild.AddJob('curl')
+	if AMBuild.target['platform'] == 'linux':
+		if not osutil.FileExists(os.path.join(AMBuild.outputFolder, 'curl', 'Makefile')):
+			args = ['/bin/bash',
+							os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'configure'),
+							'--enable-static',
+							'--disable-shared',
+							'--disable-ldap',
+							'--without-ssl',
+							'--without-libidn',
+							'--without-libssh2',
+							'--without-zlib']
+			curl.AddCommand(command.DirectCommand(args))
+			curl.AddCommand(command.DirectCommand(['make']))
+	else:
+		args = ['vcbuild',
+		        os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib',
+		                     'build_libcurl.vcproj'),
+						'LIB Release']
+		curl.AddCommand(command.DirectCommand(args))
+		#die "Unable to find libcurl.lib!\n" unless (-f "LIB-Release\\libcurl.lib");
+
+BuildCURL()
+
+compiler = SM.DefaultExtCompiler('extensions/curl')
+extension = AMBuild.AddJob('webternet.ext')
+binary = Cpp.LibraryBuilder('webternet.ext', AMBuild, extension, compiler)
+
+curlPath = [AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'include']
+compiler['CXXINCLUDES'].append(os.path.join(*curlPath))
+compiler['CDEFINES'].append('CURL_STATICLIB')
+                                          
+binary.AddSourceFiles('extensions/curl', [
+	'extension.cpp',
+	'curlapi.cpp',
+	'sdk/smsdk_ext.cpp',
+	])
+
+if AMBuild.target['platform'] == 'linux':
+	path = os.path.join(AMBuild.outputFolder,
+                      'curl',
+                      'lib',
+                      '.libs',
+                      'libcurl.a')
+	binary['POSTLINKFLAGS'].append('-lrt')
+	binary.AddObjectFiles([path])
+elif AMBuild.target['platform'] == 'windows':
+	path = os.path.join(AMBuild.sourceFolder,
+	                    'extensions',
+	                    'curl',
+	                    'curl-src',
+	                    'lib',
+	                    'LIB-Release',
+	                    'libcurl.lib')
+	if os.path.isfile(path):
+		binary.RelinkIfNewer(path)
+	binary['POSTLINKFLAGS'].extend([path, 'ws2_32.lib'])
+
+SM.AutoVersion('extensions/curl', binary)
+binary.SendToJob()
+

extensions/curl/curl-src/docs/libcurl/curl_version.html

@@ -1,55 +0,0 @@
-<html><head>
-<title>curl_version man page</title>
-<meta name="generator" content="roffit 0.7">
-<STYLE type="text/css">
-P.level0 {
- padding-left: 2em;
-}
-
-P.level1 {
- padding-left: 4em;
-}
-
-P.level2 {
- padding-left: 6em;
-}
-
-span.emphasis {
- font-style: italic;
-}
-
-span.bold {
- font-weight: bold;
-}
-
-span.manpage {
- font-weight: bold;
-}
-
-h2.nroffsh {
- background-color: #e0e0e0;
-}
-
-span.nroffip {
- font-weight: bold;
- font-size: 120%;
- font-family: monospace;
-}
-
-p.roffit {
- text-align: center;
- font-size: 80%;
-}
-</STYLE>
-</head><body>
-
-<p class="level0"><a name="NAME"></a><h2 class="nroffsh">NAME</h2>
-<p class="level0">curl_version - returns the libcurl version string <a name="SYNOPSIS"></a><h2 class="nroffsh">SYNOPSIS</h2>
-<p class="level0"><span Class="bold">#include &lt;curl/curl.h&gt;</span> 
-<p class="level0"><span Class="bold">char *curl_version( );</span> 
-<p class="level0"><a name="DESCRIPTION"></a><h2 class="nroffsh">DESCRIPTION</h2>
-<p class="level0">Returns a human readable string with the version number of libcurl and some of its important components (like OpenSSL version). <a name="RETURN"></a><h2 class="nroffsh">RETURN VALUE</h2>
-<p class="level0">A pointer to a zero terminated string. <a name="SEE"></a><h2 class="nroffsh">SEE ALSO</h2>
-<p class="level0"><a class="manpage" href="./curl_version_info.html">curl_version_info (3)</a> <p class="roffit">
- This HTML page was made with <a href="http://daniel.haxx.se/projects/roffit/">roffit</a>.
-</body></html>

extensions/curl/curl-src/src/version.h

@@ -1,36 +0,0 @@
-#ifndef __VERSION_H
-#define __VERSION_H
-/***************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <[email protected]>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- * 
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id: version.h,v 1.94 2008-01-24 14:15:49 gknauf Exp $
- ***************************************************************************/
-
-#include <curl/curlver.h>
-
-#define CURL_NAME "curl"
-#define CURL_COPYRIGHT LIBCURL_COPYRIGHT
-#define CURL_VERSION "7.19.2"
-#define CURL_VERSION_MAJOR LIBCURL_VERSION_MAJOR
-#define CURL_VERSION_MINOR LIBCURL_VERSION_MINOR
-#define CURL_VERSION_PATCH LIBCURL_VERSION_PATCH
-#define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
-
-#endif

extensions/curl/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include <stdarg.h>
 #include <sm_platform.h>
@@ -74,3 +75,14 @@ void CurlExt::SDK_OnUnload()
 {
 	curl_global_cleanup();
 }
+
+const char *CurlExt::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *CurlExt::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/curl/extension.h

@@ -81,6 +81,8 @@ public:
 	 * @return			True if working, false otherwise.
 	 */
 	//virtual bool QueryRunning(char *error, size_t maxlength);
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
 public:
 #if defined SMEXT_CONF_METAMOD
 	/**

extensions/curl/sdk/smsdk_config.h

@@ -31,7 +31,6 @@
 
 #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
-#include "svn_version.h"
 
 /**
  * @file smsdk_config.h
@@ -41,12 +40,12 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"Webternet"
 #define SMEXT_CONF_DESCRIPTION	"Extension for interacting with URLs"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"WEB"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/curl/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod GeoIP Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_GEOIP_VERSION_H_
-#define _INCLUDE_GEOIP_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_GEOIP_VERSION_H_

extensions/curl/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod GeoIP Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_GEOIP_VERSION_H_
-#define _INCLUDE_GEOIP_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_GEOIP_VERSION_H_

extensions/curl/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Webternet Extension"
             VALUE "FileDescription", "SourceMod Webternet Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod Webternet Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod Webternet Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/geoip/AMBuilder

@@ -0,0 +1,15 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+compiler = SM.DefaultExtCompiler('extensions/geoip')
+
+extension = AMBuild.AddJob('geoip.ext')
+binary = Cpp.LibraryBuilder('geoip.ext', AMBuild, extension, compiler)
+binary.AddSourceFiles('extensions/geoip', [
+	'extension.cpp',
+	'GeoIP.c',
+	'sdk/smsdk_ext.cpp'
+	])
+if AMBuild.target['platform'] == 'windows':
+	binary['POSTLINKFLAGS'].append('wsock32.lib')
+SM.AutoVersion('extensions/geoip', binary)
+binary.SendToJob()
+

extensions/geoip/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "GeoIP.h"
 
@@ -67,6 +68,16 @@ void GeoIP_Extension::SDK_OnUnload()
 	gi = NULL;
 }
 
+const char *GeoIP_Extension::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *GeoIP_Extension::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+
 /*******************************
 *                              *
 * GEOIP NATIVE IMPLEMENTATIONS *
@@ -131,3 +142,4 @@ const sp_nativeinfo_t geoip_natives[] =
 	{"GeoipCountry",		sm_Geoip_Country},
 	{NULL,					NULL},
 };
+

extensions/geoip/extension.h

@@ -62,6 +62,9 @@ public:
 	 */
 	virtual void SDK_OnUnload();
 
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
+
 	/**
 	 * @brief This is called once all known extensions have been loaded.
 	 * Note: It is is a good idea to add natives here, if any are provided.

extensions/geoip/sdk/smsdk_config.h

@@ -31,7 +31,6 @@
 
 #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
-#include "svn_version.h"
 
 /**
  * @file smsdk_config.h
@@ -41,12 +40,12 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"GeoIP"
 #define SMEXT_CONF_DESCRIPTION	"Geographical IP information"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"GEOIP"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/geoip/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod GeoIP Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_GEOIP_VERSION_H_
-#define _INCLUDE_GEOIP_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_GEOIP_VERSION_H_

extensions/geoip/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod GeoIP Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_GEOIP_VERSION_H_
-#define _INCLUDE_GEOIP_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_GEOIP_VERSION_H_

extensions/geoip/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "GeoIP Extension"
             VALUE "FileDescription", "SourceMod GeoIP Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod GeoIP Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod GeoIP Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/mysql/AMBuilder

@@ -0,0 +1,38 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+compiler = SM.DefaultExtCompiler('extensions/mysql')
+compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['MYSQL5'], 'include'))
+compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+
+extension = AMBuild.AddJob('dbi.mysql.ext')
+binary = Cpp.LibraryBuilder('dbi.mysql.ext', AMBuild, extension, compiler)
+
+if AMBuild.target['platform'] == 'linux':
+	lib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'libmysqlclient_r.a')
+	link = [lib,
+          '-lz',
+          '-lpthread',
+          '-lm']
+	binary.RelinkIfNewer(lib)
+	binary['POSTLINKFLAGS'].extend(link)
+elif AMBuild.target['platform'] == 'windows':
+	mylib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'opt', 'mysqlclient.lib')
+	zlib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'opt', 'zlib.lib')
+	binary.RelinkIfNewer(mylib)
+	binary.RelinkIfNewer(zlib)
+	binary['POSTLINKFLAGS'].extend([mylib, zlib, 'wsock32.lib'])
+
+
+binary.AddSourceFiles('extensions/mysql', [
+	'sdk/smsdk_ext.cpp',
+	'mysql/MyBasicResults.cpp',
+	'mysql/MyBoundResults.cpp',
+	'mysql/MyDatabase.cpp',
+	'mysql/MyDriver.cpp',
+	'mysql/MyStatement.cpp',
+	'extension.cpp'
+	])
+SM.AutoVersion('extensions/mysql', binary)
+binary.SendToJob()
+

extensions/mysql/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "mysql/MyDriver.h"
 #include <assert.h>
@@ -58,3 +59,14 @@ void DBI_MySQL::SDK_OnUnload()
 	//:TODO: is this needed?
 	//mysql_library_end();
 }
+
+const char *DBI_MySQL::GetVersion()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *DBI_MySQL::GetDate()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/mysql/extension.h

@@ -81,6 +81,8 @@ public:
 	 * @return			True if working, false otherwise.
 	 */
 	//virtual bool QueryRunning(char *error, size_t maxlength);
+	const char *GetVersion();
+	const char *GetDate();
 public:
 #if defined SMEXT_CONF_METAMOD
 	/**

extensions/mysql/sdk/smsdk_config.h

@@ -37,17 +37,15 @@
  * @brief Contains macros for configuring basic extension information.
  */
 
-#include "svn_version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"MySQL-DBI"
 #define SMEXT_CONF_DESCRIPTION	"MySQL driver implementation for DBI"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"MYSQL"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/mysql/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod MySQL Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_MYSQLEXT_VERSION_H_
-#define _INCLUDE_MYSQLEXT_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_MYSQLEXT_VERSION_H_

extensions/mysql/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod MySQL Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_MYSQLEXT_VERSION_H_
-#define _INCLUDE_MYSQLEXT_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_MYSQLEXT_VERSION_H_

extensions/mysql/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "MySQL Extension"
             VALUE "FileDescription", "SourceMod MySQL Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod MySQL Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod MySQL Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/regex/AMBuilder

@@ -0,0 +1,25 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+compiler = SM.DefaultExtCompiler('extensions/regex')
+compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+
+extension = AMBuild.AddJob('regex.ext')
+binary = Cpp.LibraryBuilder('regex.ext', AMBuild, extension, compiler)
+
+if AMBuild.target['platform'] == 'linux':
+	path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_linux', 'libpcre.a')
+elif AMBuild.target['platform'] == 'windows':
+	path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_win', 'pcre.lib')
+
+binary.RelinkIfNewer(path)
+binary['POSTLINKFLAGS'].append(path)
+
+binary.AddSourceFiles('extensions/regex', [
+	'extension.cpp',
+	'CRegEx.cpp',
+	'sdk/smsdk_ext.cpp',
+	])
+SM.AutoVersion('extensions/regex', binary)
+binary.SendToJob()
+

extensions/regex/extension.cpp

@@ -29,8 +29,8 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
-
 #include <sh_string.h>
 #include "pcre.h"
 #include "CRegEx.h"
@@ -63,6 +63,16 @@ void RegexExtension::SDK_OnUnload()
 
 }
 
+const char *RegexExtension::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *RegexExtension::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+
 static cell_t CompileRegex(IPluginContext *pCtx, const cell_t *params)
 {
 	char *regex;

extensions/regex/extension.h

@@ -62,6 +62,9 @@ public:
 	 */
 	virtual void SDK_OnUnload();
 
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
+
 	/**
 	 * @brief This is called once all known extensions have been loaded.
 	 * Note: It is is a good idea to add natives here, if any are provided.

extensions/regex/sdk/smsdk_config.h

@@ -32,8 +32,6 @@
 #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 
-#include "svn_version.h"
-
 /**
  * @file smsdk_config.h
  * @brief Contains macros for configuring basic extension information.
@@ -42,12 +40,12 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"Regex"
 #define SMEXT_CONF_DESCRIPTION	"Provides regex natives for plugins"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"REGEX"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/regex/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Regular Expressions Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_REGEXEXT_VERSION_H_
-#define _INCLUDE_REGEXEXT_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_REGEXEXT_VERSION_H_

extensions/regex/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Regular Expressions Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_REGEXEXT_VERSION_H_
-#define _INCLUDE_REGEXEXT_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_REGEXEXT_VERSION_H_

extensions/regex/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  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", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             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", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/sdktools/AMBuilder

@@ -0,0 +1,40 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+for i in SM.sdkInfo:
+	compiler = SM.DefaultHL2Compiler('extensions/sdktools', i)
+	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit'))
+	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit', 'x86'))
+
+	if i != 'ep1':
+		compiler['CDEFINES'].append('HOOKING_ENABLED')
+
+	sdk = SM.sdkInfo[i]
+	name = 'sdktools.ext.' + sdk['ext']
+	extension = AMBuild.AddJob(name)
+	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
+	SM.PreSetupHL2Job(extension, binary, i)
+	binary.AddSourceFiles('extensions/sdktools', [
+		'extension.cpp',
+		'inputnatives.cpp',
+		'output.cpp',
+		'outputnatives.cpp',
+		'tempents.cpp',
+		'tenatives.cpp',
+		'teamnatives.cpp',
+		'trnatives.cpp',
+		'vcaller.cpp',
+		'vcallbuilder.cpp',
+		'vdecoder.cpp',
+		'vglobals.cpp',
+		'vhelpers.cpp',
+		'vnatives.cpp',
+		'voice.cpp',
+		'vsound.cpp',
+		'vstringtable.cpp',
+		'sdk/smsdk_ext.cpp'
+		])
+	SM.PostSetupHL2Job(extension, binary, i)
+	SM.AutoVersion('extensions/sdktools', binary)
+	binary.SendToJob()
+

extensions/sdktools/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include <compat_wrappers.h>
 #include "vcallbuilder.h"
@@ -379,6 +380,16 @@ bool SDKTools::ProcessCommandTarget(cmd_target_info_t *info)
 	return true;
 }
 
+const char *SDKTools::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *SDKTools::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+
 class SDKTools_API : public ISDKTools
 {
 public:

extensions/sdktools/extension.h

@@ -73,6 +73,8 @@ public: //public SDKExtension
 	virtual bool QueryInterfaceDrop(SMInterface *pInterface);
 	virtual void NotifyInterfaceDrop(SMInterface *pInterface);
 	virtual void OnCoreMapStart(edict_t *pEdictList, int edictCount, int clientMax);
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
 public:
 #if defined SMEXT_CONF_METAMOD
 	virtual bool SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late);

extensions/sdktools/sdk/smsdk_config.h

@@ -37,17 +37,15 @@
  * @brief Contains macros for configuring basic extension information.
  */
 
-#include "svn_version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"SDK Tools"
 #define SMEXT_CONF_DESCRIPTION	"Source SDK Tools"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"SDKTOOLS"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/sdktools/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod SDKTools Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
-#define _INCLUDE_SDKTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/sdktools/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod SDKTools Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
-#define _INCLUDE_SDKTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/sdktools/vcallbuilder.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <stdio.h>
 #include "vcallbuilder.h"
 #include "extension.h"
 

extensions/sdktools/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "SDKTools Extension"
             VALUE "FileDescription", "SourceMod SDKTools Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod SDKTools Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod SDKTools Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/sqlite/AMBuilder

@@ -0,0 +1,40 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+compiler = SM.DefaultExtCompiler('extensions/sqlite')
+compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+
+compiler['CDEFINES'].extend(['SQLITE_OMIT_LOAD_EXTENSION', 'SQLITE_THREADSAFE'])
+if AMBuild.target['platform'] == 'linux':
+	compiler['POSTLINKFLAGS'].extend(['-ldl', '-lpthread'])
+
+extension = AMBuild.AddJob('dbi.sqlite.ext')
+binary = Cpp.LibraryBuilder('dbi.sqlite.ext', AMBuild, extension, compiler)
+files = [
+	'sdk/smsdk_ext.cpp', 'sdk/sm_memtable.cpp', 'extension.cpp',
+	'driver/SqDatabase.cpp', 'driver/SqDriver.cpp', 'driver/SqQuery.cpp',
+	'driver/SqResults.cpp', 'sqlite-source/alter.c', 'sqlite-source/analyze.c',
+	'sqlite-source/attach.c', 'sqlite-source/auth.c', 'sqlite-source/btree.c',
+  'sqlite-source/build.c', 'sqlite-source/callback.c', 'sqlite-source/complete.c',
+  'sqlite-source/date.c', 'sqlite-source/delete.c', 'sqlite-source/expr.c',
+  'sqlite-source/func.c', 'sqlite-source/hash.c', 'sqlite-source/insert.c',
+  'sqlite-source/legacy.c', 'sqlite-source/main.c', 'sqlite-source/malloc.c',
+  'sqlite-source/opcodes.c', 'sqlite-source/os.c',
+  'sqlite-source/pager.c', 'sqlite-source/parse.c', 'sqlite-source/pragma.c',
+  'sqlite-source/prepare.c', 'sqlite-source/printf.c', 'sqlite-source/random.c',
+  'sqlite-source/select.c', 'sqlite-source/table.c', 'sqlite-source/tokenize.c',
+  'sqlite-source/trigger.c', 'sqlite-source/update.c', 'sqlite-source/utf.c',
+  'sqlite-source/util.c', 'sqlite-source/vacuum.c', 'sqlite-source/vdbe.c',
+  'sqlite-source/vdbeapi.c', 'sqlite-source/vdbeaux.c', 'sqlite-source/vdbeblob.c',
+  'sqlite-source/vdbefifo.c', 'sqlite-source/vdbemem.c', 'sqlite-source/vtab.c',
+  'sqlite-source/where.c', 'sqlite-source/btmutex.c', 'sqlite-source/journal.c',
+  'sqlite-source/mem1.c', 'sqlite-source/mem2.c', 'sqlite-source/mutex.c'
+	]
+if AMBuild.target['platform'] == 'windows':
+  files.extend(['sqlite-source/mutex_w32.c', 'sqlite-source/os_win.c'])
+elif AMBuild.target['platform'] == 'linux':
+  files.extend(['sqlite-source/mutex_unix.c', 'sqlite-source/os_unix.c'])
+binary.AddSourceFiles('extensions/sqlite', files)
+SM.AutoVersion('extensions/sqlite', binary)
+binary.SendToJob()
+

extensions/sqlite/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "driver/SqDriver.h"
 
@@ -70,3 +71,14 @@ size_t UTIL_Format(char *buffer, size_t maxlength, const char *fmt, ...)
 		return len;
 	}
 }
+
+const char *SqliteExt::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *SqliteExt::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/sqlite/extension.h

@@ -62,6 +62,9 @@ public:
 	 */
 	virtual void SDK_OnUnload();
 
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
+
 	/**
 	 * @brief This is called once all known extensions have been loaded.
 	 * Note: It is is a good idea to add natives here, if any are provided.

extensions/sqlite/sdk/smsdk_config.h

@@ -32,8 +32,6 @@
 #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 
-#include "svn_version.h"
-
 /**
  * @file smsdk_config.h
  * @brief Contains macros for configuring basic extension information.
@@ -42,12 +40,12 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"SQLite"
 #define SMEXT_CONF_DESCRIPTION	"SQLite Driver"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"SQLITE"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/sqlite/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod SQLite Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SQLITEEXT_VERSION_H_
-#define _INCLUDE_SQLITEEXT_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_SQLITEEXT_VERSION_H_

extensions/sqlite/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod SQLite Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SQLITEEXT_VERSION_H_
-#define _INCLUDE_SQLITEEXT_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_SQLITEEXT_VERSION_H_

extensions/sqlite/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "SQLite Extension"
             VALUE "FileDescription", "SourceMod SQLite Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod SQLite Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod SQLite Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/tf2/AMBuilder

@@ -0,0 +1,26 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+sdk = SM.sdkInfo['ep2v']
+compiler = SM.DefaultHL2Compiler('extensions/tf2', 'ep2v')
+if compiler.cc.name == 'gcc':
+	compiler['CFLAGS'].append('-Wno-parentheses')
+
+name = 'game.tf2.ext.' + sdk['ext']
+extension = AMBuild.AddJob(name)
+binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
+SM.PreSetupHL2Job(extension, binary, 'ep2v')
+binary.AddSourceFiles('extensions/tf2', [
+	'extension.cpp',
+	'natives.cpp',
+	'RegNatives.cpp',
+	'util.cpp',
+	'criticals.cpp',
+	'CDetour/detours.cpp',
+	'sdk/smsdk_ext.cpp',
+	'asm/asm.c'
+	])
+SM.PostSetupHL2Job(extension, binary, 'ep2v')
+SM.AutoVersion('extensions/tf2', binary)
+binary.SendToJob()
+

extensions/tf2/criticals.cpp

@@ -35,6 +35,7 @@ IServerGameEnts *gameents = NULL;
 
 CDetour *calcIsAttackCriticalDetour = NULL;
 CDetour *calcIsAttackCriticalMeleeDetour = NULL;
+CDetour *calcIsAttackCriticalBowDetour = NULL;
 
 IForward *g_critForward = NULL;
 
@@ -169,10 +170,29 @@ DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelper, bool)
 	}
 }
 
+DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelperBow, bool)
+{
+	DetourResult result = DetourCallback((CBaseEntity *)this);
+
+	if (result == Result_Ignore)
+	{
+		return DETOUR_MEMBER_CALL(CalcIsAttackCriticalHelperBow)();
+	}
+	else if (result == Result_NoCrit)
+	{
+		return 0;
+	}
+	else
+	{
+		return 1;
+	}
+}
+
 void InitialiseDetours()
 {
 	calcIsAttackCriticalDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelper, "CalcCritical");
 	calcIsAttackCriticalMeleeDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelperMelee, "CalcCriticalMelee");
+	calcIsAttackCriticalBowDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelperBow, "CalcCriticalBow");
 
 	bool HookCreated = false;
 
@@ -188,6 +208,12 @@ void InitialiseDetours()
 		HookCreated = true;
 	}
 
+	if (calcIsAttackCriticalBowDetour != NULL)
+	{
+		calcIsAttackCriticalBowDetour->EnableDetour();
+		HookCreated = true;
+	}
+
 	if (!HookCreated)
 	{
 		g_pSM->LogError(myself, "No critical hit forwards could be initialized - Disabled critical hit hooks");
@@ -200,4 +226,5 @@ void RemoveDetours()
 {
 	calcIsAttackCriticalDetour->Destroy();
 	calcIsAttackCriticalMeleeDetour->Destroy();
+	calcIsAttackCriticalBowDetour->Destroy();
 }

extensions/tf2/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "util.h"
 #include "RegNatives.h"
@@ -115,6 +116,16 @@ bool TF2Tools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	return true;
 }
 
+const char *TF2Tools::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *TF2Tools::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+
 bool TF2Tools::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late)
 {
 	GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);

extensions/tf2/extension.h

@@ -86,6 +86,9 @@ public: //SDKExtension
 
 	void NotifyInterfaceDrop(SMInterface *pInterface);
 	bool QueryInterfaceDrop(SMInterface *pInterface);
+
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
 public: //ICommandTargetProcessor
 	bool ProcessCommandTarget(cmd_target_info_t *info);
 public: //IConCommandBaseAccessor

extensions/tf2/sdk/smsdk_config.h

@@ -37,17 +37,15 @@
  * @brief Contains macros for configuring basic extension information.
  */
 
-#include "svn_version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"TF2 Tools"
 #define SMEXT_CONF_DESCRIPTION	"TF2 extended functionality"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"TF2"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/tf2/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Team Fortress 2 Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
-#define _INCLUDE_SDKTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/tf2/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Team Fortress 2 Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
-#define _INCLUDE_SDKTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/tf2/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "SourceMod TF2 Extension"
             VALUE "FileDescription", "SourceMod TF2 Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod TF2 Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod TF2 Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/topmenus/AMBuilder

@@ -0,0 +1,19 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+compiler = SM.DefaultExtCompiler('extensions/topmenus')
+compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+
+extension = AMBuild.AddJob('topmenus.ext')
+binary = Cpp.LibraryBuilder('topmenus.ext', AMBuild, extension, compiler)
+binary.AddSourceFiles('extensions/topmenus', [
+	'extension.cpp',
+	'smn_topmenus.cpp',
+	'TopMenu.cpp',
+	'TopMenuManager.cpp',
+	'sdk/smsdk_ext.cpp',
+	'sdk/sm_memtable.cpp'
+	])
+SM.AutoVersion('extensions/topmenus', binary)
+binary.SendToJob()
+

extensions/topmenus/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "TopMenuManager.h"
 #include "smn_topmenus.h"
@@ -64,3 +65,13 @@ void TopMenuExtension::SDK_OnUnload()
 	plsys->RemovePluginsListener(&g_TopMenus);
 }
 
+const char *TopMenuExtension::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *TopMenuExtension::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/topmenus/extension.h

@@ -61,6 +61,9 @@ public:
 	 * @brief This is called right before the extension is unloaded.
 	 */
 	virtual void SDK_OnUnload();
+
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
 };
 
 #endif // _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_

extensions/topmenus/sdk/smsdk_config.h

@@ -37,17 +37,15 @@
  * @brief Contains macros for configuring basic extension information.
  */
 
-#include "svn_version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"Top Menus"
 #define SMEXT_CONF_DESCRIPTION	"Creates sorted nested menus"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"TOPMENUS"
 #define SMEXT_CONF_LICENSE		"GPLv3"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/topmenus/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod TopMenus Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SQLITEEXT_VERSION_H_
-#define _INCLUDE_SQLITEEXT_VERSION_H_
-
-#define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2755:389949cfb76a" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.3" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,3,0
-
-#endif //_INCLUDE_SQLITEEXT_VERSION_H_

extensions/topmenus/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod TopMenus Extension
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SQLITEEXT_VERSION_H_
-#define _INCLUDE_SQLITEEXT_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_SQLITEEXT_VERSION_H_