[asterisk-commits] kpfleming: trunk r50755 - in /trunk: ./ build_tools/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Sat Jan 13 10:47:01 2007
New Revision: 50755

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50755
Log:
Merged revisions 50754 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50754 | kpfleming | 2007-01-13 10:45:37 -0600 (Sat, 13 Jan 2007) | 2 lines

when building the sample greetings for maibox 1234 at default during 'make samples', build a greeting for each language and file format the user selected to install with menuselect (reported by Brian Capouch on asterisk-dev)

........

Added:
    trunk/build_tools/make_sample_voicemail
      - copied, changed from r50754, branches/1.4/build_tools/make_sample_voicemail
Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=50755&r1=50754&r2=50755
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Jan 13 10:47:01 2007
@@ -534,27 +534,20 @@
 		echo "astrundir => $(ASTVARRUNDIR)" ; \
 		echo "astlogdir => $(ASTLOGDIR)" ; \
 		echo "" ; \
+		echo ";[options]" ; \
+		echo ";internal_timing = yes" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \
 		echo ";astctlpermissions = 0660" ; \
 		echo ";astctlowner = root" ; \
 		echo ";astctlgroup = apache" ; \
 		echo ";astctl = asterisk.ctl" ; \
-		echo ";[options]" ; \
-		echo ";internal_timing = yes" ; \
 		) > $(DESTDIR)$(ASTCONFPATH) ; \
 	else \
 		echo "Skipping asterisk.conf creation"; \
 	fi
 	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 \
-		cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-	done
-	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
-	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
-		cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
-	done
+	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
 
 webvmail:
 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )

Copied: trunk/build_tools/make_sample_voicemail (from r50754, branches/1.4/build_tools/make_sample_voicemail)
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_sample_voicemail?view=diff&rev=50755&p1=branches/1.4/build_tools/make_sample_voicemail&r1=50754&p2=trunk/build_tools/make_sample_voicemail&r2=50755
==============================================================================
--- branches/1.4/build_tools/make_sample_voicemail (original)
+++ trunk/build_tools/make_sample_voicemail Sat Jan 13 10:47:01 2007
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-for lang in / /fr/ /es/
+for lang in /en/ /fr/ /es/
   do
   for format in ulaw alaw wav gsm g729 g722
     do