[oe-commits] org.oe.dev base.bbclass: print metadata revision as METADATA_REVISION - code is cleaned so easier to add git/hg (from Poky)

[hrw commit]

base.bbclass: print metadata revision as METADATA_REVISION - code is cleaned so easier to add git/hg (from Poky)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 1036866bbd060e504cca0e79fae6255783f17512
ViewMTN: http://monotone.openembedded.org/revision/info/1036866bbd060e504cca0e79fae6255783f17512
Files:
1
classes/base.bbclass
Diffs:

#
# mt diff -rb47bc0e30f4c53b5084a5a0d17620df682fa41b8 -r1036866bbd060e504cca0e79fae6255783f17512
#
#
#
# patch "classes/base.bbclass"
#  from [1f2aa3e857574c705066c6e22b6697bfafc48da0]
#    to [c242e6f11b981f8ccf61b3c389fc7514c69dd9bc]
#
============================================================
--- classes/base.bbclass	1f2aa3e857574c705066c6e22b6697bfafc48da0
+++ classes/base.bbclass	c242e6f11b981f8ccf61b3c389fc7514c69dd9bc
@@ -701,7 +701,32 @@ python base_do_unpack() {
 			raise bb.build.FuncFailed()
 }
 
+def base_get_scmbasepath(d):
+	import bb
+	path_to_bbfiles = bb.data.getVar( 'BBFILES', d, 1 ).split()
+	return path_to_bbfiles[0][:path_to_bbfiles[0].rindex( "packages" )]
 
+def base_get_metadata_monotone_revision(d):
+	monotone_revision = "<unknown>"
+	try:
+		monotone_revision = file( "%s/_MTN/revision" % base_get_scmbasepath(d) ).read().strip()
+		if monotone_revision.startswith( "format_version" ):
+			monotone_revision_words = monotone_revision.split()
+			monotone_revision = monotone_revision_words[ monotone_revision_words.index( "old_revision" )+1][1:-1]
+	except IOError:
+		pass
+	return monotone_revision
+
+def base_get_metadata_svn_revision(d):
+	revision = "<unknown>"
+	try:
+		revision = file( "%s/.svn/entries" % base_get_scmbasepath(d) ).readlines()[3].strip()
+	except IOError:
+		pass
+	return revision
+
+METADATA_REVISION ?= "${@base_get_metadata_monotone_revision(d)}"
+
 addhandler base_eventhandler
 python base_eventhandler() {
 	from bb import note, error, data
@@ -732,19 +757,8 @@ python base_eventhandler() {
 
 	if name.startswith("BuildStarted"):
 		bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
-		path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
-		path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex( "packages" )]
-		monotone_revision = "<unknown>"
-		try:
-			monotone_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip()
-			if monotone_revision.startswith( "format_version" ):
-				monotone_revision_words = monotone_revision.split()
-				monotone_revision = monotone_revision_words[ monotone_revision_words.index( "old_revision" )+1][1:-1]
-		except IOError:
-			pass
-		bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
-		statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
-		statuslines = ["%-14s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
+		statusvars = ['BB_VERSION', 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
+		statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
 		statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
 		print statusmsg