Merge.
1.1 --- a/plugins/include/version.inc Tue Sep 11 18:26:48 2012 -0400
1.2 +++ b/plugins/include/version.inc Tue Sep 11 18:27:50 2012 -0400
1.3 @@ -35,9 +35,9 @@
1.4 #endif
1.5 #define _version_included
1.6
1.7 -#if defined SM_GENERATED_BUILD
1.8 -#include <version_auto>
1.9 -#else
1.10 +#tryinclude <version_auto>
1.11 +
1.12 +#if !defined _auto_version_included
1.13 #define SOURCEMOD_V_TAG "manual"
1.14 #define SOURCEMOD_V_REV 0
1.15 #define SOURCEMOD_V_CSET "0"
1.16 @@ -45,5 +45,5 @@
1.17 #define SOURCEMOD_V_MINOR 5 /**< SourceMod Minor version */
1.18 #define SOURCEMOD_V_RELEASE 0 /**< SourceMod Release version */
1.19
1.20 -#define SOURCEMOD_VERSION "1.5.0-manual" /**< SourceMod version string (major.minor.release.build) */
1.21 +#define SOURCEMOD_VERSION "1.5.0-manual" /**< SourceMod version string (major.minor.release-tag) */
1.22 #endif
2.1 --- a/sourcepawn/jit/BaseRuntime.cpp Tue Sep 11 18:26:48 2012 -0400
2.2 +++ b/sourcepawn/jit/BaseRuntime.cpp Tue Sep 11 18:27:50 2012 -0400
2.3 @@ -219,7 +219,11 @@
2.4 return SP_ERROR_FILE_FORMAT;
2.5 }
2.6
2.7 - if ((plugin->flags & SP_FLAG_DEBUG) && (!(plugin->debug.files) || !(plugin->debug.lines) || !(plugin->debug.symbols)))
2.8 + if ((plugin->flags & SP_FLAG_DEBUG) && (
2.9 + !(plugin->debug.files) ||
2.10 + !(plugin->debug.lines) ||
2.11 + !(plugin->debug.symbols) ||
2.12 + !(plugin->debug.stringbase) ))
2.13 {
2.14 return SP_ERROR_FILE_FORMAT;
2.15 }
3.1 --- a/tools/buildbot/PackageScript Tue Sep 11 18:26:48 2012 -0400
3.2 +++ b/tools/buildbot/PackageScript Tue Sep 11 18:27:50 2012 -0400
3.3 @@ -184,6 +184,9 @@
3.4 os.path.join('addons', 'sourcemod', 'plugins', 'disabled')))
3.5 job.AddCommandGroup(commands)
3.6
3.7 +job.AddCommand(CopyFile(os.path.join('..', 'includes', 'version_auto.inc'),
3.8 + os.path.join('addons', 'sourcemod', 'scripting', 'include')))
3.9 +
3.10 bincopies = []
3.11
3.12 def AddNormalLibrary(name, dest):
