allow menuselect to display dependencies and conflicts for modules

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31443 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c
index 51f31b6385b8875a12539cffdfac66ac58725e1c..ca23caf112c1885faa8f63f8c2b3226fecbf9e2b 100644 (file)
--- a/build_tools/menuselect.c
+++ b/build_tools/menuselect.c
@@ -40,20 +40,6 @@
 
 #undef MENUSELECT_DEBUG
 
-struct depend {
-       /*! the name of the dependency */
-       const char *name;
-       /*! for linking */
-       AST_LIST_ENTRY(depend) list;
-};
-
-struct conflict {
-       /*! the name of the conflict */
-       const char *name;
-       /*! for linking */
-       AST_LIST_ENTRY(conflict) list;
-};
-
 /*! The list of categories */
 struct categories categories = AST_LIST_HEAD_NOLOCK_INIT_VALUE;
 

diff --git a/build_tools/menuselect.h b/build_tools/menuselect.h
index 5fc34d04943a3562eae4ef5b650261725715f112..fbb76333b8d29f9d54bd31d07a3a8d567192e00d 100644 (file)
--- a/build_tools/menuselect.h
+++ b/build_tools/menuselect.h
@@ -31,8 +31,19 @@
 #define OUTPUT_MAKEOPTS_DEFAULT "menuselect.makeopts"
 #define MENUSELECT_DEPS         "build_tools/menuselect-deps"
 
-struct depend;
-struct conflict;
+struct depend {
+       /*! the name of the dependency */
+       const char *name;
+       /*! for linking */
+       AST_LIST_ENTRY(depend) list;
+};
+
+struct conflict {
+       /*! the name of the conflict */
+       const char *name;
+       /*! for linking */
+       AST_LIST_ENTRY(conflict) list;
+};
 
 struct member {
        /*! What will be sent to the makeopts file */

diff --git a/build_tools/menuselect_curses.c b/build_tools/menuselect_curses.c
index bdb6cf93f9a0a747deb5170e0f37f1ba3b671262..7c684bd49d24bf3913b2f39cae1a4265cd80229a 100644 (file)
--- a/build_tools/menuselect_curses.c
+++ b/build_tools/menuselect_curses.c
@@ -126,7 +126,9 @@ void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end,
 {
        int i = 0;
        int j = 0;
-       struct member *mem;
+       struct member *mem, *curmem = NULL;
+       struct depend *dep;
+       struct conflict *con;
        char buf[64];
        const char *desc = NULL;
 
@@ -146,15 +148,35 @@ void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end,
                waddstr(menu, buf);
                
                if (curopt + 1 == i)
-                       desc = mem->displayname;
+                       curmem = mem;
 
                if (i == end)
                        break;
        }
 
-       if (desc) {
+       if (curmem->displayname) {
                wmove(menu, end - start + 2, max_x / 2 - 16);
-               waddstr(menu, desc);
+               waddstr(menu, curmem->displayname);
+       }
+       if (!AST_LIST_EMPTY(&curmem->deps)) {
+               wmove(menu, end - start + 3, max_x / 2 - 16);
+               snprintf(buf, sizeof(buf), "Depends on: ");
+               AST_LIST_TRAVERSE(&curmem->deps, dep, list) {
+                       strncat(buf, dep->name, sizeof(buf) - strlen(buf) - 1);
+                       if (AST_LIST_NEXT(dep, list))
+                               strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
+               }
+               waddstr(menu, buf);
+       }
+       if (!AST_LIST_EMPTY(&curmem->conflicts)) {
+               wmove(menu, end - start + 4, max_x / 2 - 16);
+               snprintf(buf, sizeof(buf), "Conflicts with: ");
+               AST_LIST_TRAVERSE(&curmem->conflicts, con, list) {
+                       strncat(buf, con->name, sizeof(buf) - strlen(buf) - 1);
+                       if (AST_LIST_NEXT(con, list))
+                               strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
+               }
+               waddstr(menu, buf);
        }
        wmove(menu, curopt - start, max_x / 2 - 9);