kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

use module names, not file names, in menuselect

Browse Source 
work around XML parsing bug in menuselect for default sounds package


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-06-05 20:46:27 +00:00
parent 8a95a1ddc1
commit e856010714
13 changed files with 67 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/Makefile
View File

@@ -11,7 +11,7 @@
# the GNU General Public License # the GNU General Public License
# #
MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c))) SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
# If you have UnixODBC you can use ODBC voicemail # If you have UnixODBC you can use ODBC voicemail
# storage # storage
@@ -22,6 +22,8 @@ MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c)))
#CFLAGS+=-DEXTENDED_ODBC_STORAGE #CFLAGS+=-DEXTENDED_ODBC_STORAGE
# See doc/README.odbcstorage for more information # See doc/README.odbcstorage for more information
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: $(MODS) all: $(MODS)
clean-depend: clean-depend:

2
build_tools/prep_moduledeps
View File

@@ -38,7 +38,7 @@ process_dir() {
fname=${file##${dir}/} fname=${file##${dir}/}
get_description ${file} get_description ${file}
desc=${TDESC} desc=${TDESC}
echo -e "\t\t<member name=\"${fname%%.c}.so\" displayname=\"${desc}\">" echo -e "\t\t<member name=\"${fname%%.c}\" displayname=\"${desc}\">"
awk -f build_tools/get_moduledeps ${file} awk -f build_tools/get_moduledeps ${file}
echo -e "\t\t</member>" echo -e "\t\t</member>"
done done

42
build_tools/sounds.xml
View File

@@ -1,19 +1,33 @@
<category name="MENUSELECT_SOUNDS" displayname="Sound Packages" positive_output="yes"> <category name="MENUSELECT_SOUNDS" displayname="Sound Packages" positive_output="yes">
<member name="CORE_SOUNDS_EN_WAV" displayname="Core Sounds - English, WAV format" /> <member name="CORE_SOUNDS_EN_WAV" displayname="Core Sounds - English, WAV format">
<member name="CORE_SOUNDS_EN_ULAW" displayname="Core Sounds - English, mu-Law format" /> </member>
<member name="CORE_SOUNDS_EN_ALAW" displayname="Core Sounds - English, a-Law format" /> <member name="CORE_SOUNDS_EN_ULAW" displayname="Core Sounds - English, mu-Law format">
</member>
<member name="CORE_SOUNDS_EN_ALAW" displayname="Core Sounds - English, a-Law format">
</member>
<member name="CORE_SOUNDS_EN_GSM" displayname="Core Sounds - English, GSM format" > <member name="CORE_SOUNDS_EN_GSM" displayname="Core Sounds - English, GSM format" >
<defaultenabled>yes</defaultenabled> <defaultenabled>yes</defaultenabled>
</member> </member>
<member name="CORE_SOUNDS_EN_G729" displayname="Core Sounds - English, G.729 format" /> <member name="CORE_SOUNDS_EN_G729" displayname="Core Sounds - English, G.729 format">
<member name="CORE_SOUNDS_ES_WAV" displayname="Core Sounds - Spanish, WAV format" /> </member>
<member name="CORE_SOUNDS_ES_ULAW" displayname="Core Sounds - Spanish, mu-Law format" /> <member name="CORE_SOUNDS_ES_WAV" displayname="Core Sounds - Spanish, WAV format">
<member name="CORE_SOUNDS_ES_ALAW" displayname="Core Sounds - Spanish, a-Law format" /> </member>
<member name="CORE_SOUNDS_ES_GSM" displayname="Core Sounds - Spanish, GSM format" /> <member name="CORE_SOUNDS_ES_ULAW" displayname="Core Sounds - Spanish, mu-Law format">
<member name="CORE_SOUNDS_ES_G729" displayname="Core Sounds - Spanish, G.729 format" /> </member>
<member name="CORE_SOUNDS_FR_WAV" displayname="Core Sounds - French, WAV format" /> <member name="CORE_SOUNDS_ES_ALAW" displayname="Core Sounds - Spanish, a-Law format">
<member name="CORE_SOUNDS_FR_ULAW" displayname="Core Sounds - French, mu-Law format" /> </member>
<member name="CORE_SOUNDS_FR_ALAW" displayname="Core Sounds - French, a-Law format" /> <member name="CORE_SOUNDS_ES_GSM" displayname="Core Sounds - Spanish, GSM format">
<member name="CORE_SOUNDS_FR_GSM" displayname="Core Sounds - French, GSM format" /> </member>
<member name="CORE_SOUNDS_FR_G729" displayname="Core Sounds - French, G.729 format" /> <member name="CORE_SOUNDS_ES_G729" displayname="Core Sounds - Spanish, G.729 format">
</member>
<member name="CORE_SOUNDS_FR_WAV" displayname="Core Sounds - French, WAV format">
</member>
<member name="CORE_SOUNDS_FR_ULAW" displayname="Core Sounds - French, mu-Law format">
</member>
<member name="CORE_SOUNDS_FR_ALAW" displayname="Core Sounds - French, a-Law format">
</member>
<member name="CORE_SOUNDS_FR_GSM" displayname="Core Sounds - French, GSM format">
</member>
<member name="CORE_SOUNDS_FR_G729" displayname="Core Sounds - French, G.729 format">
</member>
</category> </category>

4
cdr/Makefile
View File

@@ -11,7 +11,7 @@
# the GNU General Public License # the GNU General Public License
# #
MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%.so,$(wildcard cdr_*.c))) SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))
#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
#This works for even old (2.96) versions of gcc and provides a small boost either way. #This works for even old (2.96) versions of gcc and provides a small boost either way.
@@ -35,6 +35,8 @@ ifneq ($(TDS_LIB),)
endif endif
endif endif
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS) all: depend $(MODS)
install: all install: all

8
channels/Makefile
View File

@@ -11,7 +11,7 @@
# the GNU General Public License # the GNU General Public License
# #
MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%.so,$(wildcard chan_*.c))) SELECTED_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))
ifeq ($(OSARCH),OpenBSD) ifeq ($(OSARCH),OpenBSD)
PTLIB=-lpt_OpenBSD_x86_r PTLIB=-lpt_OpenBSD_x86_r
@@ -45,11 +45,11 @@ ifeq ($(OSARCH),SunOS)
endif endif
ifeq ($(wildcard h323/libchanh323.a),) ifeq ($(wildcard h323/libchanh323.a),)
MODS:=$(filter-out chan_h323.so,$(MODS)) SELECTED_MODS:=$(filter-out chan_h323,$(SELECTED_MODS))
endif endif
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),) ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
MODS:=$(filter-out chan_misdn.so,$(MODS)) SELECTED_MODS:=$(filter-out chan_misdn,$(SELECTED_MODS))
else else
CFLAGS+=-Imisdn CFLAGS+=-Imisdn
endif endif
@@ -62,6 +62,8 @@ ifndef PWLIBDIR
PWLIBDIR=$(HOME)/pwlib PWLIBDIR=$(HOME)/pwlib
endif endif
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS) all: depend $(MODS)
clean-depend: clean-depend:

17
codecs/Makefile
View File

@@ -11,27 +11,18 @@
# the GNU General Public License # the GNU General Public License
# #
MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%.so,$(wildcard codec_*.c))) SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))
ifeq ($(wildcard g723.1/coder.c),)
MODS:=$(filter-out codec_g723_1.so,$(MODS))
else
LIBG723=g723.1/libg723.a
endif
ifneq ($(wildcard g723.1b/coder2.c),)
MODS+=codec_g723_1b.so
LIBG723B=g723.1b/libg723b.a
endif
ifeq ($(wildcard ilbc/iLBC_decode.h),) ifeq ($(wildcard ilbc/iLBC_decode.h),)
MODS:=$(filter-out codec_ilbc.so,$(MODS)) MODS:=$(filter-out codec_ilbc,$(MODS))
else else
LIBILBC=ilbc/libilbc.a LIBILBC=ilbc/libilbc.a
endif endif
LIBLPC10=lpc10/liblpc10.a LIBLPC10=lpc10/liblpc10.a
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS) all: depend $(MODS)
clean-depend: clean-depend:

4
codecs/codec_g723_1.c
View File

@@ -27,6 +27,10 @@
* \ingroup codecs * \ingroup codecs
*/ */
/*** MODULEINFO
<defaultenabled>no</defaultenabled>
***/
#define TYPE_HIGH 0x0 #define TYPE_HIGH 0x0
#define TYPE_LOW 0x1 #define TYPE_LOW 0x1
#define TYPE_SILENCE 0x2 #define TYPE_SILENCE 0x2

4
formats/Makefile
View File

@@ -11,10 +11,12 @@
# the GNU General Public License # the GNU General Public License
# #
MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%.so,$(wildcard format_*.c))) SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c)))
GSMLIB=../codecs/gsm/lib/libgsm.a GSMLIB=../codecs/gsm/lib/libgsm.a
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS) all: depend $(MODS)
clean-depend: clean-depend:

8
funcs/Makefile
View File

@@ -11,19 +11,21 @@
# the GNU General Public License # the GNU General Public License
# #
MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%.so,$(wildcard func_*.c))) SELECTED_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c)))
# TODO This check needs to be handled with autoconf # TODO This check needs to be handled with autoconf
ifeq ($(OSARCH),SunOS) ifeq ($(OSARCH),SunOS)
ifeq ($(shell if [ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]; then echo "OK" ; fi),) ifeq ($(shell if [ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]; then echo "OK" ; fi),)
MODS:=$(filter-out func_curl.so,$(MODS)) MODS:=$(filter-out func_curl,$(MODS))
endif endif
else else
ifeq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) ifeq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
MODS:=$(filter-out func_curl.so,$(MODS)) MODS:=$(filter-out func_curl,$(MODS))
endif endif
endif endif
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: $(MODS) all: $(MODS)
clean-depend: clean-depend:

4
pbx/Makefile
View File

@@ -11,7 +11,7 @@
# the GNU General Public License # the GNU General Public License
# #
MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%.so,$(wildcard pbx_*.c))) SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))
MOC=$(QTDIR)/bin/moc MOC=$(QTDIR)/bin/moc
KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include
@@ -19,6 +19,8 @@ KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui
KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS) all: depend $(MODS)
clean-depend: clean-depend:

12
res/Makefile
View File

@@ -11,29 +11,31 @@
# the GNU General Public License # the GNU General Public License
# #
MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%.so,$(wildcard res_*.c))) SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))
ifeq ($(OSARCH),FreeBSD) ifeq ($(OSARCH),FreeBSD)
MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc.so"; fi),$(MODS)) SELECTED_MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc"; fi),$(SELECTED_MODS))
endif endif
# NETsnmp has some difficulties on some platforms (conflict with unload_module) # NETsnmp has some difficulties on some platforms (conflict with unload_module)
# Until we figure out if the collission is version-specific or what to do # Until we figure out if the collission is version-specific or what to do
# we have disabled res_snmp on OS/X and *BSD # we have disabled res_snmp on OS/X and *BSD
ifeq ($(OSARCH),Darwin) ifeq ($(OSARCH),Darwin)
MODS:=$(filter-out res_snmp.so,$(MODS)) SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS))
else else
ifeq ($(findstring BSD,$(OSARCH)),BSD) ifeq ($(findstring BSD,$(OSARCH)),BSD)
MODS:=$(filter-out res_snmp.so,$(MODS)) SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS))
endif endif
endif endif
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),) ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),)
MODS:=$(filter-out res_snmp.so,$(MODS)) SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS))
else else
SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs) SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)
endif endif
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS) all: depend $(MODS)
install: all install: all

10
res/res_snmp.c
View File

@@ -141,13 +141,3 @@ const char *description(void)
{ {
return MODULE_DESCRIPTION; return MODULE_DESCRIPTION;
} }
/*
* Local Variables:
* c-file-style: gnu
* c-basic-offset: 4
* c-file-offsets: ((case-label . 0))
* tab-width: 4
* indent-tabs-mode: t
* End:
*/

2
utils/Makefile
View File

@@ -26,7 +26,7 @@ ifeq ($(NEWT_LIB),)
UTILS:=$(filter-out astman,$(UTILS)) UTILS:=$(filter-out astman,$(UTILS))
endif endif
ifneq ($(filter pbx_ael.so,$(MENUSELECT_PBX)),) ifneq ($(filter pbx_ael,$(MENUSELECT_PBX)),)
UTILS:=$(filter-out aelparse,$(UTILS)) UTILS:=$(filter-out aelparse,$(UTILS))
endif endif