Updated version histories in preparation for release 5.4.0.
Change-Id: I4b47d7e0e267d727687ebd8acba5274ec492b2df
diff --git a/linter.py b/linter.py
index 2873116..bb03ee3 100644
--- a/linter.py
+++ b/linter.py
@@ -94,15 +94,16 @@
return self._revhistory_(file, skip)
def introduction_txt(self, file, component = None):
- if not component:
- return None
-
table = self._cmtable_(file)
- if table is not None:
+ if table is None:
+ return None
+
+ if component:
m = re.search(re.escape(component)+"\s+[Vv]?(\d+.\d+(.\d+)?)", table[1][1].text, re.MULTILINE)
if m:
return SemanticVersion(m.group(1))
- return None
+ else:
+ return SemanticVersion(table[1][0].text)
def dap_txt(self, file, skip = 0):
return self._revhistory_(file, skip)
@@ -158,6 +159,7 @@
v = self.pack_version()
self.verify_version("README.md", v)
self.verify_version("CMSIS/DoxyGen/General/general.dxy", v)
+ self.verify_version("CMSIS/DoxyGen/General/src/introduction.txt", v)
def check_corem(self):
"""CMSIS-Core(M) version"""
@@ -245,9 +247,9 @@
if not hv:
self.verify_version(f.location(), cv)
if hv:
- self.verify_version(f.location(), hv)
+ self.verify_version(f.location(), SemanticVersion(hv))
- def check_doc(self, pattern="./gen_pack/CMSIS/Documentation/**/*.html"):
+ def check_doc(self, pattern="./CMSIS/Documentation/**/*.html"):
"""Documentation"""
self.debug("Using pattern '%s'", pattern)
for html in iglob(pattern, recursive=True):