[asterisk-commits] trunk r32886 - in /trunk: ./ build_tools/ sounds/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Jun 7 13:54:31 MST 2006
Author: kpfleming
Date: Wed Jun 7 15:54:30 2006
New Revision: 32886
URL: http://svn.digium.com/view/asterisk?rev=32886&view=rev
Log:
woo-hoo, now it knows how to download the sound packages... doesn't install them yet though
Added:
trunk/sounds/Makefile (with props)
trunk/sounds/sounds.xml
- copied, changed from r32885, trunk/build_tools/sounds.xml
Removed:
trunk/build_tools/sounds.xml
Modified:
trunk/Makefile
trunk/build_tools/prep_moduledeps
trunk/sounds/ (props changed)
Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=32886&r1=32885&r2=32886&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jun 7 15:54:30 2006
@@ -12,6 +12,8 @@
#
.EXPORT_ALL_VARIABLES:
+
+.PHONY: sounds
# Create OPTIONS variable
OPTIONS=
@@ -378,7 +380,7 @@
@echo " + make install +"
@echo " +-------------------------------------------+"
-all: cleantest config.status menuselect.makeopts depend asterisk subdirs
+all: cleantest config.status menuselect.makeopts depend asterisk subdirs sounds
config.status: configure
@CFLAGS="" ./configure
@@ -533,52 +535,6 @@
for x in static-http/*; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
- for x in sounds/digits/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/digits ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/dictate
- for x in sounds/dictate/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/dictate ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/letters
- for x in sounds/letters/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/letters ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/phonetic
- for x in sounds/phonetic/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/phonetic ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
mkdir -p $(DESTDIR)$(ASTDATADIR)/images
for x in images/*.jpg; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
@@ -640,7 +596,6 @@
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
@@ -762,20 +717,6 @@
else \
echo "Skipping asterisk.conf creation"; \
fi
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
- for x in sounds/demo-*; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
- for x in sounds/*.mp3; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
- done
- rm -f $(DESTDIR)$(ASTDATADIR)/mohmp3/sample-hold.mp3
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
@@ -905,6 +846,9 @@
%_env:
$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
+sounds:
+ $(MAKE) -C sounds all
+
env:
env
@@ -924,7 +868,6 @@
rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
rm -rf $(DESTDIR)$(ASTHEADERDIR)
- rm -rf $(DESTDIR)$(ASTDATADIR)/sounds
rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
rm -rf $(DESTDIR)$(ASTMANDIR)/man8
for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
@@ -961,6 +904,6 @@
@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
$(MAKE) -C mxml libmxml.a
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml build_tools/sounds.xml
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
@echo "Generating list of available modules ..."
@build_tools/prep_moduledeps > $@
Modified: trunk/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/prep_moduledeps?rev=32886&r1=32885&r2=32886&view=diff
==============================================================================
--- trunk/build_tools/prep_moduledeps (original)
+++ trunk/build_tools/prep_moduledeps Wed Jun 7 15:54:30 2006
@@ -57,5 +57,5 @@
process_dir pbx pbx PBX "PBX Modules"
process_dir res res RES "Resource Modules"
cat build_tools/cflags.xml
-cat build_tools/sounds.xml
+cat sounds/sounds.xml
echo "</menu>"
Propchange: trunk/sounds/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 7 15:54:30 2006
@@ -1,0 +1,1 @@
+*.tar.gz
Added: trunk/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/sounds/Makefile?rev=32886&view=auto
==============================================================================
--- trunk/sounds/Makefile (added)
+++ trunk/sounds/Makefile Wed Jun 7 15:54:30 2006
@@ -1,0 +1,53 @@
+#
+# Asterisk -- A telephony toolkit for Linux.
+#
+# Makefile for sound files
+#
+# Copyright (C) 2006, Digium, Inc.
+#
+# Kevin P. Fleming <kpfleming at digium.com>
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License
+#
+
+include ../menuselect.makeopts
+
+CORE_SOUNDS_VERSION:=1.4.0
+SOUNDS_URL:="http://cork.digium.internal/apache2-default"
+MENUSELECT_CORE_SOUNDS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
+MENUSELECT_CORE_SOUNDS:=$(subst -FR-,-fr-,$(MENUSELECT_CORE_SOUNDS))
+MENUSELECT_CORE_SOUNDS:=$(subst -ES-,-es-,$(MENUSELECT_CORE_SOUNDS))
+MENUSELECT_CORE_SOUNDS:=$(subst -WAV,-wav,$(MENUSELECT_CORE_SOUNDS))
+MENUSELECT_CORE_SOUNDS:=$(subst -ULAW,-ulaw,$(MENUSELECT_CORE_SOUNDS))
+MENUSELECT_CORE_SOUNDS:=$(subst -ALAW,-alaw,$(MENUSELECT_CORE_SOUNDS))
+MENUSELECT_CORE_SOUNDS:=$(subst -GSM,-gsm,$(MENUSELECT_CORE_SOUNDS))
+MENUSELECT_CORE_SOUNDS:=$(subst -G729,-g729,$(MENUSELECT_CORE_SOUNDS))
+CORE_SOUNDS:=$(MENUSELECT_CORE_SOUNDS:CORE-SOUNDS-%=asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION).tar.gz)
+MENUSELECT_EXTRA_SOUNDS:=$(subst -EN-,-en-,$(MENUSELECT_EXTRA_SOUNDS))
+MENUSELECT_EXTRA_SOUNDS:=$(subst -FR-,-fr-,$(MENUSELECT_EXTRA_SOUNDS))
+MENUSELECT_EXTRA_SOUNDS:=$(subst -ES-,-es-,$(MENUSELECT_EXTRA_SOUNDS))
+MENUSELECT_EXTRA_SOUNDS:=$(subst -WAV,-wav,$(MENUSELECT_EXTRA_SOUNDS))
+MENUSELECT_EXTRA_SOUNDS:=$(subst -ULAW,-ulaw,$(MENUSELECT_EXTRA_SOUNDS))
+MENUSELECT_EXTRA_SOUNDS:=$(subst -ALAW,-alaw,$(MENUSELECT_EXTRA_SOUNDS))
+MENUSELECT_EXTRA_SOUNDS:=$(subst -GSM,-gsm,$(MENUSELECT_EXTRA_SOUNDS))
+MENUSELECT_EXTRA_SOUNDS:=$(subst -G729,-g729,$(MENUSELECT_EXTRA_SOUNDS))
+EXTRA_SOUNDS:=$(MENUSELECT_EXTRA_SOUNDS:EXTRA-SOUNDS-%=asterisk-extra-sounds-%.tar.gz)
+MENUSELECT_MOH:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH))
+MENUSELECT_MOH:=$(subst -MP3,-mp3,$(MENUSELECT_MOH))
+MOH:=$(MENUSELECT_MOH:MOH-%=asterisk-moh-%.tar.gz)
+
+%.gz:
+ @wget --no-verbose --continue $(SOUNDS_URL)/$@
+
+all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
+
+clean:
+
+install: all
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
+
+uninstall:
+ rm -rf $(DESTDIR)$(ASTDATADIR)/sounds
+ rm -rf $(DESTDIR)$(ASTDATADIR)/mohmp3
Propchange: trunk/sounds/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/sounds/Makefile
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: trunk/sounds/Makefile
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: trunk/sounds/sounds.xml (from r32885, trunk/build_tools/sounds.xml)
URL: http://svn.digium.com/view/asterisk/trunk/sounds/sounds.xml?p2=trunk/sounds/sounds.xml&p1=trunk/build_tools/sounds.xml&r1=32885&r2=32886&rev=32886&view=diff
==============================================================================
--- trunk/build_tools/sounds.xml (original)
+++ trunk/sounds/sounds.xml Wed Jun 7 15:54:30 2006
@@ -1,45 +1,50 @@
<category name="MENUSELECT_CORE_SOUNDS" displayname="Core Sound Packages" positive_output="yes">
- <member name="CORE_SOUNDS_EN_WAV" displayname="English, WAV format">
+ <member name="CORE-SOUNDS-EN-WAV" displayname="English, WAV format">
</member>
- <member name="CORE_SOUNDS_EN_ULAW" displayname="English, mu-Law format">
+ <member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
</member>
- <member name="CORE_SOUNDS_EN_ALAW" displayname="English, a-Law format">
+ <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
</member>
- <member name="CORE_SOUNDS_EN_GSM" displayname="English, GSM format" >
+ <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
<defaultenabled>yes</defaultenabled>
</member>
- <member name="CORE_SOUNDS_EN_G729" displayname="English, G.729 format">
+ <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
</member>
- <member name="CORE_SOUNDS_ES_WAV" displayname="Spanish, WAV format">
+ <member name="CORE-SOUNDS-ES-WAV" displayname="Spanish, WAV format">
</member>
- <member name="CORE_SOUNDS_ES_ULAW" displayname="Spanish, mu-Law format">
+ <member name="CORE-SOUNDS-ES-ULAW" displayname="Spanish, mu-Law format">
</member>
- <member name="CORE_SOUNDS_ES_ALAW" displayname="Spanish, a-Law format">
+ <member name="CORE-SOUNDS-ES-ALAW" displayname="Spanish, a-Law format">
</member>
- <member name="CORE_SOUNDS_ES_GSM" displayname="Spanish, GSM format">
+ <member name="CORE-SOUNDS-ES-GSM" displayname="Spanish, GSM format">
</member>
- <member name="CORE_SOUNDS_ES_G729" displayname="Spanish, G.729 format">
+ <member name="CORE-SOUNDS-ES-G729" displayname="Spanish, G.729 format">
</member>
- <member name="CORE_SOUNDS_FR_WAV" displayname="French, WAV format">
+ <member name="CORE-SOUNDS-FR-WAV" displayname="French, WAV format">
</member>
- <member name="CORE_SOUNDS_FR_ULAW" displayname="French, mu-Law format">
+ <member name="CORE-SOUNDS-FR-ULAW" displayname="French, mu-Law format">
</member>
- <member name="CORE_SOUNDS_FR_ALAW" displayname="French, a-Law format">
+ <member name="CORE-SOUNDS-FR-ALAW" displayname="French, a-Law format">
</member>
- <member name="CORE_SOUNDS_FR_GSM" displayname="French, GSM format">
+ <member name="CORE-SOUNDS-FR-GSM" displayname="French, GSM format">
</member>
- <member name="CORE_SOUNDS_FR_G729" displayname="French, G.729 format">
+ <member name="CORE-SOUNDS-FR-G729" displayname="French, G.729 format">
+ </member>
+ </category>
+ <category name="MENUSELECT_MOH" displayname="Music On Hold File Package" positive_output="yes">
+ <member name="MOH-FREEPLAY-MP3" displayname="FreePlay Music On Hold Files, MP3 format" >
+ <defaultenabled>yes</defaultenabled>
</member>
</category>
<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
- <member name="EXTRA_SOUNDS_EN_WAV" displayname="English, WAV format">
+ <member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format">
</member>
- <member name="EXTRA_SOUNDS_EN_ULAW" displayname="English, mu-Law format">
+ <member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
</member>
- <member name="EXTRA_SOUNDS_EN_ALAW" displayname="English, a-Law format">
+ <member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format">
</member>
- <member name="EXTRA_SOUNDS_EN_GSM" displayname="English, GSM format" >
+ <member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM format" >
</member>
- <member name="EXTRA_SOUNDS_EN_G729" displayname="English, G.729 format">
+ <member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format">
</member>
</category>
More information about the asterisk-commits
mailing list