callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add interface age to the version check

Browse Source 
We have a fourth component of the version tuple that can go out of sync,
so we should check it.
This commit is contained in:
Emmanuele Bassi 2020-04-27 18:46:56 +01:00
parent db39ce2b16
commit c348d78e37
1 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
check-version.py
View File

@ -73,6 +73,26 @@ CONFIGURE_MICRO_VERSION_RE = re.compile(
re.UNICODE | re.VERBOSE re.UNICODE | re.VERBOSE
) )
CONFIGURE_INTERFACE_AGE_RE = re.compile(
r'''
^
\s*
m4_define\(
\s*
\[gtk_interface_age\]
\s*
,
\s*
\[
(?P<age>[0-9]+)
\]
\s*
\)
$
''',
re.UNICODE | re.VERBOSE
)
MESON_VERSION_RE = re.compile( MESON_VERSION_RE = re.compile(
r''' r'''
^ ^
@ -95,6 +115,13 @@ MESON_VERSION_RE = re.compile(
re.UNICODE | re.VERBOSE re.UNICODE | re.VERBOSE
) )
MESON_INTERFACE_AGE_RE = re.compile(
r'''
^\s*gtk_interface_age\s*={1}\s*(?P<age>[0-9]+)\s*$
''',
re.UNICODE | re.VERBOSE
)
version = {} version = {}
with open(configure_ac, 'r') as f: with open(configure_ac, 'r') as f:
@ -124,11 +151,19 @@ with open(configure_ac, 'r') as f:
version['micro'] = res.group('version') version['micro'] = res.group('version')
line = f.readline() line = f.readline()
continue continue
if ('major', 'minor', 'micro') in version: res = CONFIGURE_INTERFACE_AGE_RE.match(line)
if res:
if 'age' in version:
print(f'Redefinition of interface age; age is already set to {version["age"]}')
sys.exit(1)
version['age'] = res.group('age')
line = f.readline()
continue
if ('major', 'minor', 'micro', 'age') in version:
break break
line = f.readline() line = f.readline()
print(f'GTK version defined in {configure_ac}: {version["major"]}.{version["minor"]}.{version["micro"]}') print(f'GTK version defined in {configure_ac}: {version["major"]}.{version["minor"]}.{version["micro"]} (age: {version["age"]})')
configure_version = version configure_version = version
version = {} version = {}
@ -139,16 +174,22 @@ with open(meson_build, 'r') as f:
while line: while line:
if line.startswith('project('): if line.startswith('project('):
inside_project = True inside_project = True
elif inside_project: if inside_project:
res = MESON_VERSION_RE.match(line) res = MESON_VERSION_RE.match(line)
if res: if res:
version['major'] = res.group('major') version['major'] = res.group('major')
version['minor'] = res.group('minor') version['minor'] = res.group('minor')
version['micro'] = res.group('micro') version['micro'] = res.group('micro')
if inside_project and line.endswith(')'):
inside_project = False
res = MESON_INTERFACE_AGE_RE.match(line)
if res:
version['age'] = res.group('age')
if ('major', 'minor', 'micro', 'age') in version:
break break
line = f.readline() line = f.readline()
print(f'GTK version defined in {meson_build}: {version["major"]}.{version["minor"]}.{version["micro"]}') print(f'GTK version defined in {meson_build}: {version["major"]}.{version["minor"]}.{version["micro"]} (age: {version["age"]})')
meson_version = version meson_version = version