Merge AMBuild2 upgrade from sourcemod-1.6 to sourcemod-1.5.

extensions/updater/AMBuilder

@@ -1,19 +1,18 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultExtCompiler('extensions/updater')
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+binary = SM.ExtLibrary(builder, 'updater.ext')
+binary.compiler.cxxincludes += [
+  os.path.join(SM.mms_root, 'core', 'sourcehook'),
+]
 
-extension = AMBuild.AddJob('updater.ext')
-binary = Cpp.LibraryBuilder('updater.ext', AMBuild, extension, compiler)
-binary.AddSourceFiles('extensions/updater', [
-	'extension.cpp',
-	'MemoryDownloader.cpp',
-	'Updater.cpp',
-	'md5.cpp',
-	'sdk/smsdk_ext.cpp'
-	])
-SM.AutoVersion('extensions/updater', binary)
-SM.ExtractDebugInfo(extension, binary)
-binary.SendToJob()
+binary.sources += [
+  'extension.cpp',
+  'MemoryDownloader.cpp',
+  'Updater.cpp',
+  'md5.cpp',
+  'sdk/smsdk_ext.cpp'
+]
+
+SM.extensions += [builder.Add(binary)]
 

extensions/updater/Updater.cpp

@@ -356,7 +356,7 @@ void UpdateReader::PerformUpdate(const char *url)
 	xfer = webternet->CreateSession();
 	xfer->SetFailOnHTTPError(true);
 
-	form->AddString("version", SM_VERSION_STRING);
+	form->AddString("version", SOURCEMOD_VERSION);
 
 	unsigned int num_files = 0;
 	add_folders(form, "gamedata", num_files);

extensions/updater/extension.cpp

@@ -249,11 +249,11 @@ void AddUpdateError(const char *fmt, ...)
 
 const char *SmUpdater::GetExtensionVerString()
 {
-	return SM_VERSION_STRING;
+	return SOURCEMOD_VERSION;
 }
 
 const char *SmUpdater::GetExtensionDateString()
 {
-	return SM_BUILD_TIMESTAMP;
+	return SOURCEMOD_BUILD_TIME;
 }