From 88be4181c771b399a600dd1ce228389f0d2ebbcc Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Thu, 11 Feb 2016 15:43:19 +0000
Subject: [PATCH] defs.mk, doxygen.mk, projects.py: Add support for
 PROJECT_SUMMARY

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs.mk        | 11 ++++++-----
 make/doxygen.mk     |  1 +
 scripts/projects.py | 22 ++++++++++++++++++----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 1cc92806..b6f9e2c2 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -8,6 +8,10 @@ ifndef YTOOLS_DEF_MK_INCLUDED
 YTOOLS_DEF_MK_INCLUDED = true
 include $(MODDIR)/make/platform.mk
 
+proj_query  = $(shell python $(MOD_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(1))
+proj_dir    = $(call proj_query,proj-dir $(1))
+htdocs_dir  = $(call proj_query,htdocs-dir $(1))
+
 # ----- pre-local.mk
 
 ifneq ($(wildcard $(MODDIR)/make/pre-local.mk),)
@@ -78,7 +82,8 @@ CVSTOPDIR             ?= $(CVS_PROJ_DIR)/..
 PROJECT_DESCR_FILE    ?= $(wildcard $(TOPDIR)/make/project.conf)
 PROJECT_SHORT_NAME    ?= $(PROJECT)
 PROJECT_CAPNAME        = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g')
-PROJECT_DESCR         ?= No description
+PROJECT_DESCR         ?= $(call proj_query, summary $(PROJECT))
+PROJECT_SUMMARY       ?= $(PROJECT_DESCR)
 CUSTOMER              ?= jannet
 
 ifneq ($(PROJECT_DESCR_FILE),)
@@ -731,10 +736,6 @@ define install_links
 		done;
 endef
 
-proj_query  = $(shell python $(MOD_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(1))
-proj_dir    = $(call proj_query,proj-dir $(1))
-htdocs_dir  = $(call proj_query,htdocs-dir $(1))
-
 # ----- local.mk
 
 ifneq ($(wildcard $(MODDIR)/make/local.mk),)
diff --git a/make/doxygen.mk b/make/doxygen.mk
index 4d2cabe3..2b8a73b0 100644
--- a/make/doxygen.mk
+++ b/make/doxygen.mk
@@ -81,6 +81,7 @@ install.doxygen:
 		s/__VERSION__/$(DIST_VERSION)/; \
 		s/__PROJECT__/$(PROJECT)/; \
 		s/__PROJECT_CAPNAME__/$(PROJECT_CAPNAME)/; \
+		s%__PROJECT_SUMMARY__%$(PROJECT_SUMMARY)%; \
 		s/__OUTPUT_DIR__/$(DX_OUTPUT_DIR)/; \
 		s%__PROJECT_TOPDIR__%$(TOPDIR)%; \
 		s%__FILE_PATTERNS__%$(DX_FILE_PATTERNS)%; \
diff --git a/scripts/projects.py b/scripts/projects.py
index cb50b507..3440bc9c 100644
--- a/scripts/projects.py
+++ b/scripts/projects.py
@@ -58,7 +58,7 @@ def read_value(path, section, key):
         file = open(path)
     except:
         return None
-    r = ()
+    r = []
     if not len(section):
         for line in file:
             r = re.findall('^ *' + key + ' *= *(.*)', line)
@@ -74,9 +74,12 @@ def read_value(path, section, key):
             if in_section:
                 if len(line) and line[0] == '[':
                     break
-                r = re.findall('^ *' + key + ' *= *(.*)', line)
-                if (len(r) > 0):
-                    break
+                if key is None:
+                    r.append(line)
+                else:
+                    r = re.findall('^ *' + key + ' *= *(.*)', line)
+                    if (len(r) > 0):
+                        break
     file.close()
 
     if len(r):
@@ -285,6 +288,17 @@ def cmd_htdocs_dir(args_):
         r.append(htdocs_dir(m))
     print(' '.join(r))
 
+def cmd_summary(args_):
+    parser = argparse.ArgumentParser(description='summary')
+    parser.add_argument('module', nargs='*', help='Modules')
+    args=parser.parse_args(args_)
+    r = []
+    for m in args.module:
+        summary = get_value(m, "summary", None)
+        if summary is not None:
+            r.append(summary)
+    print(' '.join(r))
+
 # -------------------------------------------------------------------- here we go
 
 global_args = []