[asterisk-commits] dvossel: branch dvossel/sip_nonblocking_tcp_client r225444 - in /team/dvossel...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Oct 22 14:49:04 2009
New Revision: 225444

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=225444
Log:
svnmerge merge to update branch

Added:
    team/dvossel/sip_nonblocking_tcp_client/utils/utils.xml
      - copied unchanged from r225440, trunk/utils/utils.xml
Modified:
    team/dvossel/sip_nonblocking_tcp_client/   (props changed)
    team/dvossel/sip_nonblocking_tcp_client/Makefile
    team/dvossel/sip_nonblocking_tcp_client/doc/janitor-projects.txt
    team/dvossel/sip_nonblocking_tcp_client/utils/Makefile

Propchange: team/dvossel/sip_nonblocking_tcp_client/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 22 14:49:04 2009
@@ -1,1 +1,1 @@
-/trunk:1-225409
+/trunk:1-225443

Modified: team/dvossel/sip_nonblocking_tcp_client/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/sip_nonblocking_tcp_client/Makefile?view=diff&rev=225444&r1=225443&r2=225444
==============================================================================
--- team/dvossel/sip_nonblocking_tcp_client/Makefile (original)
+++ team/dvossel/sip_nonblocking_tcp_client/Makefile Thu Oct 22 14:49:04 2009
@@ -940,7 +940,7 @@
 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 @@
 	@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>" >> $@

Modified: team/dvossel/sip_nonblocking_tcp_client/doc/janitor-projects.txt
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/sip_nonblocking_tcp_client/doc/janitor-projects.txt?view=diff&rev=225444&r1=225443&r2=225444
==============================================================================
--- team/dvossel/sip_nonblocking_tcp_client/doc/janitor-projects.txt (original)
+++ team/dvossel/sip_nonblocking_tcp_client/doc/janitor-projects.txt Thu Oct 22 14:49:04 2009
@@ -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.

Modified: team/dvossel/sip_nonblocking_tcp_client/utils/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/sip_nonblocking_tcp_client/utils/Makefile?view=diff&rev=225444&r1=225443&r2=225444
==============================================================================
--- team/dvossel/sip_nonblocking_tcp_client/utils/Makefile (original)
+++ team/dvossel/sip_nonblocking_tcp_client/utils/Makefile Thu Oct 22 14:49:04 2009
@@ -27,7 +27,7 @@
 #     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