<p>Christian Savinovich has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11493">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_voicemail.c: Build all three variants for app_voicemail at the same time<br><br>This review makes changes to apps/Makefile to offer the built of all three<br>app_voicemail variations at the same time: file (default), odbc, and imap.<br>This functionality was requested by users. modules.conf.sample warns the<br>user to make sure only one voicemail is loaded at a time.<br><br>Change-Id: Iba3cd8ffb4b7e8b1c64a11dd383e1eafcd3ed0e7<br>---<br>M apps/Makefile<br>M apps/app_voicemail.c<br>A apps/app_voicemail_imap.c<br>A apps/app_voicemail_imap.exports.in<br>A apps/app_voicemail_odbc.c<br>A apps/app_voicemail_odbc.exports.in<br>M configs/samples/modules.conf.sample<br>7 files changed, 13 insertions(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/93/11493/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/Makefile b/apps/Makefile</span><br><span>index 589293c..63cc06b 100644</span><br><span>--- a/apps/Makefile</span><br><span>+++ b/apps/Makefile</span><br><span>@@ -16,12 +16,6 @@</span><br><span> MENUSELECT_DESCRIPTION=Applications</span><br><span> </span><br><span> MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)</span><br><span style="color: hsl(0, 100%, 40%);">-ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)</span><br><span style="color: hsl(0, 100%, 40%);">- MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(0, 100%, 40%);">-ifneq ($(findstring IMAP_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)</span><br><span style="color: hsl(0, 100%, 40%);">- MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span> </span><br><span> all: _all</span><br><span> </span><br><span>@@ -32,7 +26,9 @@</span><br><span> app_confbridge.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)</span><br><span> app_meetme.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)</span><br><span> app_minivm.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)</span><br><span style="color: hsl(0, 100%, 40%);">-app_voicemail.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)</span><br><span style="color: hsl(120, 100%, 40%);">+app_voicemail.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION) -DFILE_STORAGE</span><br><span style="color: hsl(120, 100%, 40%);">+app_voicemail_odbc.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION) -DODBC_STORAGE</span><br><span style="color: hsl(120, 100%, 40%);">+app_voicemail_imap.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION) -DIMAP_STORAGE</span><br><span> app_while.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)</span><br><span> </span><br><span> ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)</span><br><span>diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c</span><br><span>index c0edd44..c35803d 100644</span><br><span>--- a/apps/app_voicemail.c</span><br><span>+++ b/apps/app_voicemail.c</span><br><span>@@ -53,31 +53,6 @@</span><br><span> <support_level>core</support_level></span><br><span> ***/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*** MAKEOPTS</span><br><span style="color: hsl(0, 100%, 40%);">-<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" touch_on_change="apps/app_voicemail.c apps/app_directory.c"></span><br><span style="color: hsl(0, 100%, 40%);">- <member name="FILE_STORAGE" displayname="Storage of Voicemail using filesystem"></span><br><span style="color: hsl(0, 100%, 40%);">- <conflict>ODBC_STORAGE</conflict></span><br><span style="color: hsl(0, 100%, 40%);">- <conflict>IMAP_STORAGE</conflict></span><br><span style="color: hsl(0, 100%, 40%);">- <defaultenabled>yes</defaultenabled></span><br><span style="color: hsl(0, 100%, 40%);">- <support_level>core</support_level></span><br><span style="color: hsl(0, 100%, 40%);">- </member></span><br><span style="color: hsl(0, 100%, 40%);">- <member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC"></span><br><span style="color: hsl(0, 100%, 40%);">- <depend>generic_odbc</depend></span><br><span style="color: hsl(0, 100%, 40%);">- <conflict>IMAP_STORAGE</conflict></span><br><span style="color: hsl(0, 100%, 40%);">- <conflict>FILE_STORAGE</conflict></span><br><span style="color: hsl(0, 100%, 40%);">- <defaultenabled>no</defaultenabled></span><br><span style="color: hsl(0, 100%, 40%);">- <support_level>core</support_level></span><br><span style="color: hsl(0, 100%, 40%);">- </member></span><br><span style="color: hsl(0, 100%, 40%);">- <member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4"></span><br><span style="color: hsl(0, 100%, 40%);">- <depend>imap_tk</depend></span><br><span style="color: hsl(0, 100%, 40%);">- <conflict>ODBC_STORAGE</conflict></span><br><span style="color: hsl(0, 100%, 40%);">- <conflict>FILE_STORAGE</conflict></span><br><span style="color: hsl(0, 100%, 40%);">- <use type="external">openssl</use></span><br><span style="color: hsl(0, 100%, 40%);">- <defaultenabled>no</defaultenabled></span><br><span style="color: hsl(0, 100%, 40%);">- <support_level>core</support_level></span><br><span style="color: hsl(0, 100%, 40%);">- </member></span><br><span style="color: hsl(0, 100%, 40%);">-</category></span><br><span style="color: hsl(0, 100%, 40%);">-***/</span><br><span> </span><br><span> #include "asterisk.h"</span><br><span> </span><br><span>diff --git a/apps/app_voicemail_imap.c b/apps/app_voicemail_imap.c</span><br><span>new file mode 120000</span><br><span>index 0000000..fdb024a</span><br><span>--- /dev/null</span><br><span>+++ b/apps/app_voicemail_imap.c</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+app_voicemail.c</span><br><span>\ No newline at end of file</span><br><span>diff --git a/apps/app_voicemail_imap.exports.in b/apps/app_voicemail_imap.exports.in</span><br><span>new file mode 120000</span><br><span>index 0000000..401e8f2</span><br><span>--- /dev/null</span><br><span>+++ b/apps/app_voicemail_imap.exports.in</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+app_voicemail.exports.in</span><br><span>\ No newline at end of file</span><br><span>diff --git a/apps/app_voicemail_odbc.c b/apps/app_voicemail_odbc.c</span><br><span>new file mode 120000</span><br><span>index 0000000..fdb024a</span><br><span>--- /dev/null</span><br><span>+++ b/apps/app_voicemail_odbc.c</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+app_voicemail.c</span><br><span>\ No newline at end of file</span><br><span>diff --git a/apps/app_voicemail_odbc.exports.in b/apps/app_voicemail_odbc.exports.in</span><br><span>new file mode 120000</span><br><span>index 0000000..401e8f2</span><br><span>--- /dev/null</span><br><span>+++ b/apps/app_voicemail_odbc.exports.in</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+app_voicemail.exports.in</span><br><span>\ No newline at end of file</span><br><span>diff --git a/configs/samples/modules.conf.sample b/configs/samples/modules.conf.sample</span><br><span>index c6c0dbc..1e83349 100644</span><br><span>--- a/configs/samples/modules.conf.sample</span><br><span>+++ b/configs/samples/modules.conf.sample</span><br><span>@@ -41,4 +41,10 @@</span><br><span> noload => res_hep.so</span><br><span> noload => res_hep_pjsip.so</span><br><span> noload => res_hep_rtcp.so</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+; The default voicemail module is app_voicemal. All voicemail modules</span><br><span style="color: hsl(120, 100%, 40%);">+; are mutually exclusive. Therefore it is better to make sure they</span><br><span style="color: hsl(120, 100%, 40%);">+; are not loaded at startup</span><br><span> ;</span><br><span style="color: hsl(120, 100%, 40%);">+noload => app_voicemail_odbc.so</span><br><span style="color: hsl(120, 100%, 40%);">+noload => app_voicemail_imap.so</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11493">change 11493</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/11493"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: Iba3cd8ffb4b7e8b1c64a11dd383e1eafcd3ed0e7 </div>
<div style="display:none"> Gerrit-Change-Number: 11493 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Christian Savinovich <csavinovich@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>