+def add_commit_to_version(name, commit, dir, extra_news = None):
+ abbrev_commit = commit[:6]
+
+ # Extract version number.
+ start_step("Extract %s repository version number" % name)
+ fields = backquotes("cd %s && autoconf -t AC_INIT" % dir).split(':')
+ file, line, macro, package, repo_version = fields[:5]
+ rest = fields[5:]
+ set_var("%s_repo_version" % name, repo_version)
+
+ # Is this a "gnits" mode tree?
+ start_step("Checking %s Automake mode" % name)
+
+ am_mode = "gnu"
+ for s in open("%s/Makefile.am" % dir):
+ if "gnits" in s:
+ am_mode = "gnits"
+ break
+ LOG.write("%s Automake mode is %s\n" % (name, am_mode))
+
+ # Generate version number for build.
+ # We want to append -g012345, but if we're in Gnits mode and the
+ # version number already has a hyphen, we have to omit it.
+ start_step("Generate %s build version number" % name)
+ version = repo_version
+ if '-' not in version:
+ version += '-'
+ version += 'g' + abbrev_commit
+ set_var("%s_version" % name, version)
+
+ # Append -g012345 to configure.ac version number.
+ start_step("Updating %s version number in %s" % (name, file))
+ fullname = "%s/%s" % (dir, file)
+ NEWFILE = open("%s.new" % fullname, "w")
+ ln = 1
+ for s in open(fullname):
+ if ln != int(line):
+ NEWFILE.write(s)
+ else:
+ NEWFILE.write("AC_INIT([%s], [%s]" % (package, version))
+ for field in rest:
+ NEWFILE.write(", [%s]" % field)
+ NEWFILE.write(")\n")
+ ln += 1
+ NEWFILE.close()
+ os.rename("%s.new" % fullname, fullname)
+
+ # Add note to beginning of NEWS (otherwise "make dist" fails).
+ start_step("Updating %s NEWS" % name)
+ fullname = "%s/NEWS" % name
+ NEWFILE = open("%s.new" % fullname, "w")
+ found_changes = False
+ for s in open(fullname):
+ if not found_changes and (s.startswith('Changes') or repo_version in s):
+ found_changes = True
+ NEWFILE.write("""\
+Changes from %(repo_version)s to %(version)s:
+
+ * Built from PSPP commit %(revision)s
+ in branch %(branch)s on builder %(builder)s.
+
+"""
+ % {'repo_version': repo_version,
+ 'version': version,
+ 'revision': commit,
+ 'branch': branch,
+ 'builder': builder})
+ if extra_news:
+ NEWFILE.write(extra_news)
+ NEWFILE.write('\n')
+
+ NEWFILE.write(s)
+ NEWFILE.close()
+ os.rename("%s.new" % fullname, fullname)
+
+ return version
+