All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/Config.in: fix menu alphabetical order
@ 2014-12-13  8:18 Jerzy Grzegorek
  2014-12-13  8:18 ` [Buildroot] [PATCH 2/2] package/Config.in: fix " Jerzy Grzegorek
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Jerzy Grzegorek @ 2014-12-13  8:18 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
---
 package/Config.in |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 48be2df..7300443 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -961,6 +961,17 @@ endmenu
 
 endmenu
 
+menu "Mail"
+	source "package/dovecot/Config.in"
+	source "package/exim/Config.in"
+	source "package/fetchmail/Config.in"
+	source "package/heirloom-mailx/Config.in"
+	source "package/libesmtp/Config.in"
+	source "package/msmtp/Config.in"
+	source "package/mutt/Config.in"
+	source "package/sylpheed/Config.in"
+endmenu
+
 menu "Miscellaneous"
 	source "package/aespipe/Config.in"
 	source "package/bc/Config.in"
@@ -978,17 +989,6 @@ menu "Miscellaneous"
 	source "package/sound-theme-freedesktop/Config.in"
 endmenu
 
-menu "Mail"
-	source "package/dovecot/Config.in"
-	source "package/exim/Config.in"
-	source "package/fetchmail/Config.in"
-	source "package/heirloom-mailx/Config.in"
-	source "package/libesmtp/Config.in"
-	source "package/msmtp/Config.in"
-	source "package/mutt/Config.in"
-	source "package/sylpheed/Config.in"
-endmenu
-
 menu "Networking applications"
 	source "package/aiccu/Config.in"
 	source "package/aircrack-ng/Config.in"
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/Config.in: correct capitalization of menu items
@ 2015-10-10  7:39 Jerzy Grzegorek
  2015-10-10  7:39 ` [Buildroot] [PATCH 2/2] package/Config.in: fix alphabetical order Jerzy Grzegorek
  0 siblings, 1 reply; 9+ messages in thread
From: Jerzy Grzegorek @ 2015-10-10  7:39 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
---
 package/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 3794f44..8672ec4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -588,7 +588,7 @@ endif
 	source "package/python/Config.in"
 	source "package/python3/Config.in"
 if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
-menu "external python modules"
+menu "External python modules"
 	source "package/python-alsaaudio/Config.in"
 	source "package/python-bottle/Config.in"
 	source "package/python-can/Config.in"
@@ -680,7 +680,7 @@ endif
 	source "package/ruby/Config.in"
 	source "package/tcl/Config.in"
 if BR2_PACKAGE_TCL
-menu "tcl libraries/modules"
+menu "Tcl libraries/modules"
 	source "package/expect/Config.in"
 	source "package/tcllib/Config.in"
 endmenu
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] checkpackagelib/lib_config.py: check packages alphabetical order in {Config.in, Config.in.host}
@ 2019-05-29 15:05 Jerzy Grzegorek
  2019-05-29 15:05 ` [Buildroot] [PATCH 2/2] package/Config.in: fix alphabetical order Jerzy Grzegorek
  0 siblings, 1 reply; 9+ messages in thread
From: Jerzy Grzegorek @ 2019-05-29 15:05 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
---
TODO - checking of menu of comments and menu of menus

 utils/checkpackagelib/lib_config.py | 64 +++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
index 89d44da57e..1b3a66f6e1 100644
--- a/utils/checkpackagelib/lib_config.py
+++ b/utils/checkpackagelib/lib_config.py
@@ -60,6 +60,67 @@ 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"
+
+            self.package[self.level[self.state]] = ""
+            self.print_package_warning[self.level[self.state]] = True
+            self.menu_of_packages[self.level[self.state]] = 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]
+
+            else:
+                self.state = self.state[:-5]
+
+        elif text.startswith('\tsource "package/'):
+            self.new_package[self.level[self.state]] = text[17: -(len(self.filename)-5):]
+
+            if self.package[self.level[self.state]] != "" and \
+               self.print_package_warning[self.level[self.state]] and \
+               self.new_package[self.level[self.state]] < self.package[self.level[self.state]]:
+                self.print_package_warning[self.level[self.state]] = False
+                return ["{}:{}: Packages in: {}, are not alphabetically ordered\n"
+                        "                  correct order: '-', digits, capitals, '_', lowercase"
+                        .format(self.filename, lineno, self.menu_of_packages[self.level[self.state]]),
+                        text]
+
+            self.package[self.level[self.state]] = self.new_package[self.level[self.state]]
+
+
 class HelpText(_CheckFunction):
     HELP_TEXT_FORMAT = re.compile("^\t  .{,62}$")
     URL_ONLY = re.compile("^(http|https|git)://\S*$")
@@ -141,3 +202,6 @@ class Indent(_CheckFunction):
                 return ["{}:{}: should not be indented"
                         .format(self.filename, lineno),
                         text]
+
+
+
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-05-30  6:37 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-13  8:18 [Buildroot] [PATCH 1/2] package/Config.in: fix menu alphabetical order Jerzy Grzegorek
2014-12-13  8:18 ` [Buildroot] [PATCH 2/2] package/Config.in: fix " Jerzy Grzegorek
2014-12-16 17:46   ` Yann E. MORIN
2014-12-16 17:45 ` [Buildroot] [PATCH 1/2] package/Config.in: fix menu " Yann E. MORIN
2014-12-16 22:46 ` Peter Korsgaard
2015-10-10  7:39 [Buildroot] [PATCH 1/2] package/Config.in: correct capitalization of menu items Jerzy Grzegorek
2015-10-10  7:39 ` [Buildroot] [PATCH 2/2] package/Config.in: fix alphabetical order Jerzy Grzegorek
2019-05-29 15:05 [Buildroot] [PATCH 1/2] checkpackagelib/lib_config.py: check packages alphabetical order in {Config.in, Config.in.host} Jerzy Grzegorek
2019-05-29 15:05 ` [Buildroot] [PATCH 2/2] package/Config.in: fix alphabetical order Jerzy Grzegorek
2019-05-29 21:42   ` Arnout Vandecappelle
2019-05-30  6:37     ` Jerzy Grzegorek

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.