From 562ee5fc49cdafda6f10d7b8c0e8b6fb8e0b9c21 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 26 Mar 2017 17:56:33 +0000
Subject: [PATCH] make, scripts: Add support for release dependencies

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/project.conf    | 1 +
 make/projects-dir.mk | 6 +++++-
 scripts/projects.py  | 5 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/make/project.conf b/make/project.conf
index 263cd92f..79a5c516 100644
--- a/make/project.conf
+++ b/make/project.conf
@@ -23,6 +23,7 @@ build = cvs, make, gcc, automake, autoconf, inkscape
 
 [pkg.required.suse]
 build = glib2-devel, boost-devel
+release = rpmbuild
 
 [pkg.required.debian]
 build = libglib2.0-dev, libboost-dev
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index afee42e5..1bda9d2d 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -67,10 +67,14 @@ clean: done.clean
 clean-dirs:
 	ls */dirs-all.done 2>/dev/null | sed 's%/.*%%' | xargs -r $(BUILD_PY) clean
 
-echo-required-pkg:
+echo-prereq-build:
 	@make pull.done >/dev/null 2>&1
 	@python $(MOD_SCRIPT_DIR)/projects.py $(PROJECTS_PY_EXTRA_ARGS) required-pkg $(BUILD_PROJECTS)
 
+echo-prereq-release:
+	@make pull.done >/dev/null 2>&1
+	@python $(MOD_SCRIPT_DIR)/projects.py $(PROJECTS_PY_EXTRA_ARGS) required-pkg --flavour release $(BUILD_PROJECTS)
+
 doc-project doc-module:
 	$(BROWSER) https://janware.com/wiki/pub/sw:build:
 
diff --git a/scripts/projects.py b/scripts/projects.py
index e77a5015..714ab945 100644
--- a/scripts/projects.py
+++ b/scripts/projects.py
@@ -266,14 +266,15 @@ def cmd_test(args_):
 def cmd_required_pkg(args_):
     parser = argparse.ArgumentParser(description='required-pkg')
     parser.add_argument('module', nargs='*', help='Modules')
+    parser.add_argument('--flavours', help='Dependency flavours', default='build')
     args=parser.parse_args(args_)
-    deps = get_modules_from_project_txt(args.module, 'pkg.required.jw', [ 'build' ],
+    deps = get_modules_from_project_txt(args.module, 'pkg.required.jw', args.flavours.split(),
             scope = 2, add_self=True, names_only=True)
     subsecs = pkg_required_os_cascade()
     debug("subsecs = ", subsecs)
     required = []
     for s in subsecs:
-        vals = collect_values(deps, 'pkg.required.' + s, 'build')
+        vals = collect_values(deps, 'pkg.required.' + s, args.flavours)
         if vals:
             required = required + vals
     # TODO: add all not in build tree as -devel