Various build fixes (bug 5997 part 14, r=ds).

tools/buildbot/PackageScript

@@ -51,6 +51,11 @@ for cxx_task in SM.extensions:
   builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions'])
 builder.AddCopy(SM.spcomp.binary, folder_map['addons/sourcemod/scripting'])
 
+# Copy version_auto.inc.
+for header in SM.generated_headers:
+  if 'version_auto.inc' in header.path:
+    builder.AddCopy(header, folder_map['addons/sourcemod/scripting/include'])
+
 # Export PDB files. We write to a file in the build folder which is pretty
 # verboten, but it's okay if it's in the root since AMBuild will never try
 # to rmdir the root.

tools/buildbot/generate_headers.py

@@ -33,7 +33,7 @@ def get_hg_version():
   return m.groups()
 
 def output_version_headers():
-  cset, rev = get_hg_version()
+  rev, cset = get_hg_version()
 
   with open(os.path.join(SourceFolder, 'product.version')) as fp:
     contents = fp.read()