[asterisk-commits] russell: branch 1.4 r58955 - in /branches/1.4:
./ apps/ build_tools/ doc/ main/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Mar 15 18:41:01 MST 2007
Author: russell
Date: Thu Mar 15 20:41:00 2007
New Revision: 58955
URL: http://svn.digium.com/view/asterisk?view=rev&rev=58955
Log:
Making these documentation changes in the 1.4 branch upset various people, so
these chanes will only be done in the trunk.
Added:
branches/1.4/doc/00README.1st
- copied unchanged from r58930, branches/1.4/doc/00README.1st
branches/1.4/doc/ael.txt
- copied unchanged from r58930, branches/1.4/doc/ael.txt
branches/1.4/doc/ajam.txt
- copied unchanged from r58930, branches/1.4/doc/ajam.txt
branches/1.4/doc/app-sms.txt
- copied unchanged from r58930, branches/1.4/doc/app-sms.txt
branches/1.4/doc/apps.txt
- copied unchanged from r58930, branches/1.4/doc/apps.txt
branches/1.4/doc/asterisk-conf.txt
- copied unchanged from r58930, branches/1.4/doc/asterisk-conf.txt
branches/1.4/doc/billing.txt
- copied unchanged from r58930, branches/1.4/doc/billing.txt
branches/1.4/doc/callingpres.txt
- copied unchanged from r58930, branches/1.4/doc/callingpres.txt
branches/1.4/doc/cdrdriver.txt
- copied unchanged from r58930, branches/1.4/doc/cdrdriver.txt
branches/1.4/doc/chaniax.txt
- copied unchanged from r58930, branches/1.4/doc/chaniax.txt
branches/1.4/doc/channels.txt
- copied unchanged from r58930, branches/1.4/doc/channels.txt
branches/1.4/doc/channelvariables.txt
- copied unchanged from r58930, branches/1.4/doc/channelvariables.txt
branches/1.4/doc/cliprompt.txt
- copied unchanged from r58930, branches/1.4/doc/cliprompt.txt
branches/1.4/doc/configuration.txt
- copied unchanged from r58930, branches/1.4/doc/configuration.txt
branches/1.4/doc/cygwin.txt
- copied unchanged from r58930, branches/1.4/doc/cygwin.txt
branches/1.4/doc/dundi.txt
- copied unchanged from r58930, branches/1.4/doc/dundi.txt
branches/1.4/doc/enum.txt
- copied unchanged from r58930, branches/1.4/doc/enum.txt
branches/1.4/doc/extconfig.txt
- copied unchanged from r58930, branches/1.4/doc/extconfig.txt
branches/1.4/doc/extensions.txt
- copied unchanged from r58930, branches/1.4/doc/extensions.txt
branches/1.4/doc/freetds.txt
- copied unchanged from r58930, branches/1.4/doc/freetds.txt
branches/1.4/doc/h323.txt
- copied unchanged from r58930, branches/1.4/doc/h323.txt
branches/1.4/doc/hardware.txt
- copied unchanged from r58930, branches/1.4/doc/hardware.txt
branches/1.4/doc/iax.txt
- copied unchanged from r58930, branches/1.4/doc/iax.txt
branches/1.4/doc/ices.txt
- copied unchanged from r58930, branches/1.4/doc/ices.txt
branches/1.4/doc/imapstorage.txt
- copied unchanged from r58930, branches/1.4/doc/imapstorage.txt
branches/1.4/doc/ip-tos.txt
- copied unchanged from r58930, branches/1.4/doc/ip-tos.txt
branches/1.4/doc/jitterbuffer.txt
- copied unchanged from r58930, branches/1.4/doc/jitterbuffer.txt
branches/1.4/doc/linkedlists.txt
- copied unchanged from r58930, branches/1.4/doc/linkedlists.txt
branches/1.4/doc/localchannel.txt
- copied unchanged from r58930, branches/1.4/doc/localchannel.txt
branches/1.4/doc/manager.txt
- copied unchanged from r58930, branches/1.4/doc/manager.txt
branches/1.4/doc/math.txt
- copied unchanged from r58930, branches/1.4/doc/math.txt
branches/1.4/doc/misdn.txt
- copied unchanged from r58930, branches/1.4/doc/misdn.txt
branches/1.4/doc/model.txt
- copied unchanged from r58930, branches/1.4/doc/model.txt
branches/1.4/doc/mp3.txt
- copied unchanged from r58930, branches/1.4/doc/mp3.txt
branches/1.4/doc/musiconhold-fpm.txt
- copied unchanged from r58930, branches/1.4/doc/musiconhold-fpm.txt
branches/1.4/doc/mysql.txt
- copied unchanged from r58930, branches/1.4/doc/mysql.txt
branches/1.4/doc/odbcstorage.txt
- copied unchanged from r58930, branches/1.4/doc/odbcstorage.txt
branches/1.4/doc/privacy.txt
- copied unchanged from r58930, branches/1.4/doc/privacy.txt
branches/1.4/doc/queuelog.txt
- copied unchanged from r58930, branches/1.4/doc/queuelog.txt
branches/1.4/doc/queues-with-callback-members.txt
- copied unchanged from r58930, branches/1.4/doc/queues-with-callback-members.txt
branches/1.4/doc/radius.txt
- copied unchanged from r58930, branches/1.4/doc/radius.txt
branches/1.4/doc/realtime.txt
- copied unchanged from r58930, branches/1.4/doc/realtime.txt
branches/1.4/doc/security.txt
- copied unchanged from r58930, branches/1.4/doc/security.txt
branches/1.4/doc/sla.pdf
- copied unchanged from r58930, branches/1.4/doc/sla.pdf
Removed:
branches/1.4/doc/ael.tex
branches/1.4/doc/ajam.tex
branches/1.4/doc/app-sms.tex
branches/1.4/doc/ast_appdocs.tex
branches/1.4/doc/asterisk-conf.tex
branches/1.4/doc/asterisk.tex
branches/1.4/doc/billing.tex
branches/1.4/doc/cdrdriver.tex
branches/1.4/doc/chaniax.tex
branches/1.4/doc/channelvariables.tex
branches/1.4/doc/cliprompt.tex
branches/1.4/doc/configuration.tex
branches/1.4/doc/dundi.tex
branches/1.4/doc/enum.tex
branches/1.4/doc/extensions.tex
branches/1.4/doc/freetds.tex
branches/1.4/doc/hardware.tex
branches/1.4/doc/ices.tex
branches/1.4/doc/imapstorage.tex
branches/1.4/doc/ip-tos.tex
branches/1.4/doc/jitterbuffer.tex
branches/1.4/doc/localchannel.tex
branches/1.4/doc/manager.tex
branches/1.4/doc/misdn.tex
branches/1.4/doc/mp3.tex
branches/1.4/doc/odbcstorage.tex
branches/1.4/doc/privacy.tex
branches/1.4/doc/queuelog.tex
branches/1.4/doc/queues-with-callback-members.tex
branches/1.4/doc/realtime.tex
branches/1.4/doc/security.tex
Modified:
branches/1.4/Makefile
branches/1.4/apps/app_voicemail.c
branches/1.4/build_tools/make_buildopts_h
branches/1.4/build_tools/prep_tarball
branches/1.4/configure.ac
branches/1.4/doc/PEERING
branches/1.4/doc/sla.tex
branches/1.4/main/pbx.c
branches/1.4/makeopts.in
Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?view=diff&rev=58955&r1=58954&r2=58955
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Thu Mar 15 20:41:00 2007
@@ -46,7 +46,6 @@
export ASTCONFPATH
export NOISY_BUILD
export MENUSELECT_CFLAGS
-export AST_DEVMODE
export CC
export CXX
export AR
@@ -685,24 +684,4 @@
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
-asterisk.pdf: doc/asterisk.pdf
-
-doc/asterisk.pdf: $(wildcard doc/*.tex)
-ifeq ($(findstring rubber,$(RUBBER)),)
- @echo "**********************************************"
- @echo "** You must install the \"rubber\" tool ***"
- @echo "** to generate the Asterisk reference PDF. ***"
- @echo "**********************************************"
-else
- @echo "**********************************************"
- @echo "** The Asterisk reference PDF will now be ***"
- @echo "** generated. When complete, it will be ***"
- @echo "** located at doc/asterisk.pdf. ***"
- @echo "**********************************************"
- @cp doc/asterisk.tex doc/asterisk.tex.orig
- @sed -i -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' doc/asterisk.tex
- @cd doc && $(RUBBER) --pdf asterisk.tex
- @mv doc/asterisk.tex.orig doc/asterisk.tex
-endif
-
.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Modified: branches/1.4/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_voicemail.c?view=diff&rev=58955&r1=58954&r2=58955
==============================================================================
--- branches/1.4/apps/app_voicemail.c (original)
+++ branches/1.4/apps/app_voicemail.c Thu Mar 15 20:41:00 2007
@@ -1905,7 +1905,7 @@
fprintf(p, "Subject: New message %d in mailbox %s" ENDL, msgnum + 1, mailbox);
else
fprintf(p, "Subject: [PBX]: New message %d in mailbox %s" ENDL, msgnum + 1, mailbox);
- fprintf(p, "Message-ID: <Asterisk-%d-%d-%s-%d@%s>" ENDL, msgnum + 1, (unsigned int)ast_random(), mailbox, getpid(), host);
+ fprintf(p, "Message-ID: <Asterisk-%d-%d-%s-%d@%s>" ENDL, msgnum, (unsigned int)ast_random(), mailbox, getpid(), host);
if(imap) {
/* additional information needed for IMAP searching */
fprintf(p, "X-Asterisk-VM-Message-Num: %d" ENDL, msgnum + 1);
@@ -1930,7 +1930,7 @@
fprintf(p, "MIME-Version: 1.0" ENDL);
if (attach_user_voicemail) {
/* Something unique. */
- snprintf(bound, sizeof(bound), "voicemail_%d%s%d%d", msgnum + 1, mailbox, getpid(), (unsigned int)ast_random());
+ snprintf(bound, sizeof(bound), "voicemail_%d%s%d%d", msgnum, mailbox, getpid(), (unsigned int)ast_random());
fprintf(p, "Content-Type: multipart/mixed; boundary=\"%s\"" ENDL ENDL ENDL, bound);
@@ -1946,7 +1946,7 @@
memset(passdata, 0, vmlen);
prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, cidnum, cidname, dur, date, passdata, vmlen, category);
pbx_substitute_variables_helper(ast, emailbody, passdata, vmlen);
- fprintf(p, "%s" ENDL, passdata);
+ fprintf(p, "%s\r\n", passdata);
} else
ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
ast_channel_free(ast);
@@ -1978,19 +1978,19 @@
ast_log(LOG_DEBUG, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox);
}
fprintf(p, "--%s" ENDL, bound);
- fprintf(p, "Content-Type: %s%s; name=\"msg%04d.%s\"" ENDL, ctype, format, msgnum + 1, format);
+ fprintf(p, "Content-Type: %s%s; name=\"msg%04d.%s\"" ENDL, ctype, format, msgnum, format);
fprintf(p, "Content-Transfer-Encoding: base64" ENDL);
fprintf(p, "Content-Description: Voicemail sound attachment." ENDL);
- fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.%s\"" ENDL ENDL, msgnum + 1, format);
+ fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.%s\"" ENDL ENDL, msgnum, format);
snprintf(fname, sizeof(fname), "%s.%s", attach, format);
base_encode(fname, p);
/* only attach if necessary */
if (imap && !strcmp(format, "gsm")) {
fprintf(p, "--%s" ENDL, bound);
- fprintf(p, "Content-Type: audio/x-gsm; name=\"msg%04d.%s\"" ENDL, msgnum + 1, format);
+ fprintf(p, "Content-Type: audio/x-gsm; name=\"msg%04d.%s\"" ENDL, msgnum, format);
fprintf(p, "Content-Transfer-Encoding: base64" ENDL);
fprintf(p, "Content-Description: Voicemail sound attachment." ENDL);
- fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.gsm\"" ENDL ENDL, msgnum + 1);
+ fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.gsm\"" ENDL ENDL, msgnum);
snprintf(fname, sizeof(fname), "%s.gsm", attach);
base_encode(fname, p);
}
Modified: branches/1.4/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/make_buildopts_h?view=diff&rev=58955&r1=58954&r2=58955
==============================================================================
--- branches/1.4/build_tools/make_buildopts_h (original)
+++ branches/1.4/build_tools/make_buildopts_h Thu Mar 15 20:41:00 2007
@@ -9,9 +9,5 @@
END
TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
for x in ${TMP}; do
- echo "#define ${x} 1"
+ echo "#define ${x} 1"
done
-if grep AST_DEVMODE makeopts | grep -q yes
-then
- echo "#define AST_DEVMODE 1"
-fi
Modified: branches/1.4/build_tools/prep_tarball
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/prep_tarball?view=diff&rev=58955&r1=58954&r2=58955
==============================================================================
--- branches/1.4/build_tools/prep_tarball (original)
+++ branches/1.4/build_tools/prep_tarball Thu Mar 15 20:41:00 2007
@@ -6,5 +6,3 @@
# It will be executed from the top-level directory of the project.
make -C sounds all MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget
-
-cd doc && rubber --pdf asterisk.tex
Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=58955&r1=58954&r2=58955
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Thu Mar 15 20:41:00 2007
@@ -146,7 +146,6 @@
AC_PATH_PROG([DOT], [dot], :)
AC_PATH_PROG([STRIP], [strip], :)
AC_PATH_PROG([WGET], [wget], :)
-AC_PATH_PROG([RUBBER], [rubber], :)
if test "${WGET}" != ":" ; then
DOWNLOAD=${WGET}
else
Modified: branches/1.4/doc/PEERING
URL: http://svn.digium.com/view/asterisk/branches/1.4/doc/PEERING?view=diff&rev=58955&r1=58954&r2=58955
==============================================================================
--- branches/1.4/doc/PEERING (original)
+++ branches/1.4/doc/PEERING Thu Mar 15 20:41:00 2007
@@ -1,5 +1,3 @@
-\begin{verbatim}
-
DIGIUM GENERAL PEERING AGREEMENT (TM)
Version 1.0.0, September 2004
Copyright (C) 2004 Digium, Inc.
@@ -499,5 +497,3 @@
accordance with this GPA.
DUNDi, IAX, Asterisk and GPA are trademarks of Digium, Inc.
-
-\end{verbatim}
Modified: branches/1.4/doc/sla.tex
URL: http://svn.digium.com/view/asterisk/branches/1.4/doc/sla.tex?view=diff&rev=58955&r1=58954&r2=58955
==============================================================================
--- branches/1.4/doc/sla.tex (original)
+++ branches/1.4/doc/sla.tex Thu Mar 15 20:41:00 2007
@@ -1,13 +1,13 @@
-%\documentclass[12pt,a4]{article}
-%\usepackage{hyperref}
-
-%\author{Russell Bryant \\ Software Engineer \\ Digium, Inc.}
-%\title{Shared Line Appearances}
-
-%\begin{document}
-%\maketitle
-
-%\tableofcontents
+\documentclass[12pt,a4]{article}
+\usepackage{hyperref}
+
+\author{Russell Bryant \\ Software Engineer \\ Digium, Inc.}
+\title{Shared Line Appearances}
+
+\begin{document}
+\maketitle
+
+\tableofcontents
\section{Introduction}
@@ -375,4 +375,4 @@
of this trunk on this station will then show in use. All stations that are not
currently connected to this trunk will show it on hold.
-%\end{document}
+\end{document}
Modified: branches/1.4/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/pbx.c?view=diff&rev=58955&r1=58954&r2=58955
==============================================================================
--- branches/1.4/main/pbx.c (original)
+++ branches/1.4/main/pbx.c Thu Mar 15 20:41:00 2007
@@ -3206,56 +3206,6 @@
return RESULT_SUCCESS;
}
-#ifdef AST_DEVMODE
-static char core_dumpappdocs_help[] =
-"Usage: core dump appdocs [application]\n"
-" Dump Application documentation to /tmp/ast_appdocs.tex.\n";
-
-static int handle_core_dumpappdocs(int fd, int argc, char *argv[])
-{
- struct ast_app *app;
- FILE *f;
- char *appname = NULL;
- const char *fn = "/tmp/ast_appdocs.tex";
-
- if (argc > 3)
- appname = argv[3];
-
- if (!(f = fopen(fn, "w+"))) {
- ast_cli(fd, "Unable to open %s for writing!\n", fn);
- return RESULT_FAILURE;
- }
-
- fprintf(f, "%% This file is automatically generated. Any manual edits will be lost.\n");
-
- AST_LIST_LOCK(&apps);
- AST_LIST_TRAVERSE(&apps, app, list) {
- if (appname && strcasecmp(app->name, appname))
- continue;
-
- fprintf(f, "\\section{%s}\n"
- "\\subsection{Synopsis}\n"
- "\\begin{verbatim}\n"
- "%s\n"
- "\\end{verbatim}\n"
- "\\subsection{Description}\n"
- "\\begin{verbatim}\n"
- "%s\n"
- "\\end{verbatim}\n\n\n", app->name, app->synopsis, app->description);
-
- if (appname)
- break;
- }
- AST_LIST_UNLOCK(&apps);
-
- fclose(f);
-
- ast_cli(fd, "Documentation has been dumped to %s\n", fn);
-
- return RESULT_SUCCESS;
-}
-#endif
-
/*! \brief handle_show_hints: CLI support for listing registred dial plan hints */
static int handle_show_hints(int fd, int argc, char *argv[])
{
@@ -3841,12 +3791,6 @@
{ { "core", "show", "application", NULL },
handle_show_application, "Describe a specific dialplan application",
show_application_help, complete_show_application, &cli_show_application_deprecated },
-
-#ifdef AST_DEVMODE
- { { "core", "dump", "appdocs", NULL },
- handle_core_dumpappdocs, "Dump application documentation in LaTeX format",
- core_dumpappdocs_help, NULL },
-#endif
{ { "core", "set", "global", NULL },
handle_set_global, "Set global dialplan variable",
Modified: branches/1.4/makeopts.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/makeopts.in?view=diff&rev=58955&r1=58954&r2=58955
==============================================================================
--- branches/1.4/makeopts.in (original)
+++ branches/1.4/makeopts.in Thu Mar 15 20:41:00 2007
@@ -22,7 +22,6 @@
WGET=@WGET@
FETCH=@FETCH@
DOWNLOAD=@DOWNLOAD@
-RUBBER=@RUBBER@
BUILD_PLATFORM=@BUILD_PLATFORM@
BUILD_CPU=@BUILD_CPU@
More information about the asterisk-commits
mailing list