Update findversion for change version.h format.
version.h doesn't store the version number as string anymore. Update findversion to use the individual values instead. Change-Id: I6bf0fdd4420d41279b44cffd22b42febbfc778ce
This commit is contained in:
parent
47d053735b
commit
2af2a1253c
1 changed files with 6 additions and 7 deletions
|
@ -127,13 +127,12 @@ def findversion(versionfile):
|
|||
h = open(versionfile, "r")
|
||||
c = h.read()
|
||||
h.close()
|
||||
r = re.compile("#define +VERSION +\"(.[0-9\.a-z]+)\"")
|
||||
m = re.search(r, c)
|
||||
s = re.compile("\$Revision: +([0-9]+)")
|
||||
n = re.search(s, c)
|
||||
if n == None:
|
||||
print "WARNING: Revision not found!"
|
||||
return m.group(1)
|
||||
version = dict()
|
||||
for v in ['MAJOR', 'MINOR', 'MICRO']:
|
||||
r = re.compile("#define +VERSION_" + v + " +([0-9a-z]+)")
|
||||
m = re.search(r, c)
|
||||
version[v] = m.group(1)
|
||||
return "%s.%s.%s" % (version['MAJOR'], version['MINOR'], version['MICRO'])
|
||||
|
||||
|
||||
def findqt(cross=""):
|
||||
|
|
Loading…
Reference in a new issue