From: Jerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 2/2] checkpackagelib/lib_config.py: check packages alphabetical order in {Config.in, Config.in.host}
Date: Tue, 11 Jun 2019 22:49:46 +0200 [thread overview]
Message-ID: <20190611204946.3848-2-jerzy.m.grzegorek@gmail.com> (raw)
In-Reply-To: <20190611204946.3848-1-jerzy.m.grzegorek@gmail.com>
Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
---
Changes v1 -> v2:
- swap patches 1 and 2 (Arnout)
- drop trailing lines (copy/paste side effect)
- rewrap lines to < 80 chars
- add variable to cut lines to < 80 chars
- change alphabetical order of '_" to go before digits (Arnout)
TODO : checking of menu of comments and menu of menus
---
utils/checkpackagelib/lib_config.py | 65 +++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
index 89d44da57e..642634fc44 100644
--- a/utils/checkpackagelib/lib_config.py
+++ b/utils/checkpackagelib/lib_config.py
@@ -60,6 +60,71 @@ class AttributesOrder(_CheckFunction):
text]
+class CommentsMenusPackagesOrder(_CheckFunction):
+ level = {"": 0,
+ "-menu": 1, "-menu-menu": 2,
+ "-menu-menu-comment": 3, "-menu-menu-if": 3, "-menu-menu-menu": 3,
+ "-menu-menu-comment-if": 4, "-menu-menu-if-if": 4,
+ "-menu-menu-menu-if": 4, "-menu-menu-if-menu": 4,
+ "-menu-menu-comment-if-comment": 5, "-menu-menu-if-if-comment": 5,
+ "-menu-menu-if-if-menu": 5, "-menu-menu-menu-if-comment": 5,
+ "-menu-menu-menu-if-menu": 5}
+
+ print_package_warning = [True, True, True, True, True, True]
+ menu_of_packages = ["", "", "", "", "", ""]
+ package = ["", "", "", "", "", ""]
+ new_package = ["", "", "", "", "", ""]
+
+ def before(self):
+ self.state = ""
+
+ def check_line(self, lineno, text):
+ if text.startswith("comment") or text.startswith("if") or \
+ text.startswith("menu"):
+
+ if text.startswith("comment"):
+ if not self.state.endswith("-comment"):
+ self.state += "-comment"
+
+ elif text.startswith("if") or text.startswith("menu"):
+ if text.startswith("if"):
+ self.state += "-if"
+
+ elif text.startswith("menu"):
+ self.state += "-menu"
+
+ level = self.level[self.state]
+ self.package[level] = ""
+ self.print_package_warning[level] = True
+ self.menu_of_packages[level] = text[:-1]
+
+ elif text.startswith("endif") or text.startswith("endmenu"):
+ if self.state.endswith("comment"):
+ self.state = self.state[:-8]
+
+ if text.startswith("endif"):
+ self.state = self.state[:-3]
+
+ elif text.startswith("endmenu"):
+ self.state = self.state[:-5]
+
+ elif text.startswith('\tsource "package/'):
+ level = self.level[self.state]
+ self.new_package[level] = text[17: -(len(self.filename)-5):]
+
+ if self.package[level] != "" and \
+ self.print_package_warning[level] and \
+ self.new_package[level].replace('_', '.') < self.package[level].replace('_', '.'):
+ self.print_package_warning[level] = False
+ return ["{}:{}: Packages in: {},\n are not "
+ "alphabetically ordered;\n correct "
+ "order: '-', '_', digits, capitals, lowercase"
+ .format(self.filename, lineno, self.menu_of_packages[level]),
+ text]
+
+ self.package[level] = self.new_package[level]
+
+
class HelpText(_CheckFunction):
HELP_TEXT_FORMAT = re.compile("^\t .{,62}$")
URL_ONLY = re.compile("^(http|https|git)://\S*$")
--
2.17.1
next prev parent reply other threads:[~2019-06-11 20:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 20:49 [Buildroot] [PATCH v2 1/2] package/Config.in: fix alphabetical order Jerzy Grzegorek
2019-06-11 20:49 ` Jerzy Grzegorek [this message]
2019-07-13 22:27 ` [Buildroot] [PATCH v2 2/2] checkpackagelib/lib_config.py: check packages alphabetical order in {Config.in, Config.in.host} Arnout Vandecappelle
2019-07-14 10:04 ` Yann E. MORIN
2019-07-14 20:12 ` Jerzy Grzegorek
2019-07-14 12:34 ` [Buildroot] [PATCH v2 1/2] package/Config.in: fix alphabetical order Yann E. MORIN
2019-07-14 19:05 ` Arnout Vandecappelle
2019-07-15 7:25 ` Jerzy Grzegorek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190611204946.3848-2-jerzy.m.grzegorek@gmail.com \
--to=jerzy.m.grzegorek@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.