From 117d3fd910c0ddda73d5f782bfbac235a9c44a46 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@malleable.com>
Date: Thu, 22 Oct 2009 19:33:32 +0000
Subject: [PATCH] Add the programs in utils/ to menuselect.
Nothing in utils/ is now built by default except for astcanary.
Review: https://reviewboard.asterisk.org/r/353/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
Makefile | 3 ++-
doc/janitor-projects.txt | 2 --
utils/Makefile | 2 +-
utils/utils.xml | 41 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 44 insertions(+), 4 deletions(-)
create mode 100644 utils/utils.xml
diff --git a/Makefile b/Makefile
index 58d4cbf2dc..f586e7ab37 100644
--- a/Makefile
+++ b/Makefile
@@ -940,7 +940,7 @@ menuselect/nmenuselect: menuselect/makeopts
menuselect/makeopts: makeopts
+$(MAKE_MENUSELECT) makeopts
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml configure
@echo "Generating input for menuselect ..."
@echo "<?xml version=\"1.0\"?>" > $@
@echo >> $@
@@ -951,6 +951,7 @@ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(di
@if [ "${AST_DEVMODE}" = "yes" ]; then \
cat build_tools/cflags-devmode.xml >> $@; \
fi
+ @cat utils/utils.xml >> $@
@cat build_tools/embed_modules.xml >> $@
@cat sounds/sounds.xml >> $@
@echo "</menu>" >> $@
diff --git a/doc/janitor-projects.txt b/doc/janitor-projects.txt
index debd462f69..30fe3b1851 100644
--- a/doc/janitor-projects.txt
+++ b/doc/janitor-projects.txt
@@ -23,6 +23,4 @@
-- Convert all usage of the signal(2) system API to the more portable sigaction(2) system API.
- -- Make the applications in utils/ selectable in menuselect and turn off muted by default. Probably others too.
-
-- Find options and arguments in Asterisk which specify a time period in seconds or milliseconds and convert them to use the new ast_app_parse_timelen() function.
diff --git a/utils/Makefile b/utils/Makefile
index ed7eebe566..8c8ae5d0d9 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -27,7 +27,7 @@ ASTTOPDIR?=..
# changes are made to ast_expr2.y or ast_expr2.fl (or the corresponding .c files),
# as a regression test. Others (mere mortals?) need not bother, but they are
# more than welcome to play! The regression test itself is in expr2.testinput.
-ALL_UTILS:=astman smsq stereorize streamplayer muted hashtest2 hashtest astcanary refcounter aelparse conf2ael
+ALL_UTILS:=$(MENUSELECT_UTILS)
UTILS:=$(ALL_UTILS)
LIBS += $(BKTR_LIB) # astobj2 with devmode uses backtrace
diff --git a/utils/utils.xml b/utils/utils.xml
new file mode 100644
index 0000000000..135cbd7c3c
--- /dev/null
+++ b/utils/utils.xml
@@ -0,0 +1,41 @@
+<category name="MENUSELECT_UTILS" displayname="Utilities" positive_output="yes">
+ <member name="aelparse">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="astcanary">
+ <defaultenabled>yes</defaultenabled>
+ </member>
+ <member name="astman">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="check_expr">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="check_expr2">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="conf2ael">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="hashtest">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="hashtest2">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="muted">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="refcounter">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="smsq">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="stereorize">
+ <defaultenabled>no</defaultenabled>
+ </member>
+ <member name="streamplayer">
+ <defaultenabled>no</defaultenabled>
+ </member>
+</category>
--
GitLab