[asterisk-commits] oej: branch oej/calleridutf8 r93924 - in /team/oej/calleridutf8: ./ apps/ bui...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Dec 19 04:49:17 CST 2007
Author: oej
Date: Wed Dec 19 04:49:16 2007
New Revision: 93924
URL: http://svn.digium.com/view/asterisk?view=rev&rev=93924
Log:
Resolve, reset
Added:
team/oej/calleridutf8/channels/console_video.c
- copied unchanged from r93899, trunk/channels/console_video.c
team/oej/calleridutf8/doc/manager_1_1.txt
- copied unchanged from r93899, trunk/doc/manager_1_1.txt
team/oej/calleridutf8/include/asterisk/global_datastores.h
- copied unchanged from r93899, trunk/include/asterisk/global_datastores.h
team/oej/calleridutf8/main/global_datastores.c
- copied unchanged from r93899, trunk/main/global_datastores.c
team/oej/calleridutf8/utils/astcanary.c
- copied unchanged from r93899, trunk/utils/astcanary.c
Removed:
team/oej/calleridutf8/build_tools/prep_moduledeps
team/oej/calleridutf8/configs/privacy.conf.sample
Modified:
team/oej/calleridutf8/ (props changed)
team/oej/calleridutf8/.cleancount
team/oej/calleridutf8/CHANGES
team/oej/calleridutf8/CREDITS
team/oej/calleridutf8/Makefile
team/oej/calleridutf8/Makefile.moddir_rules
team/oej/calleridutf8/UPGRADE.txt
team/oej/calleridutf8/acinclude.m4
team/oej/calleridutf8/apps/ (props changed)
team/oej/calleridutf8/apps/Makefile
team/oej/calleridutf8/apps/app_adsiprog.c
team/oej/calleridutf8/apps/app_amd.c
team/oej/calleridutf8/apps/app_chanspy.c
team/oej/calleridutf8/apps/app_controlplayback.c
team/oej/calleridutf8/apps/app_dial.c
team/oej/calleridutf8/apps/app_directory.c
team/oej/calleridutf8/apps/app_ices.c
team/oej/calleridutf8/apps/app_meetme.c
team/oej/calleridutf8/apps/app_minivm.c
team/oej/calleridutf8/apps/app_mixmonitor.c
team/oej/calleridutf8/apps/app_osplookup.c
team/oej/calleridutf8/apps/app_privacy.c
team/oej/calleridutf8/apps/app_queue.c
team/oej/calleridutf8/apps/app_rpt.c
team/oej/calleridutf8/apps/app_voicemail.c
team/oej/calleridutf8/build_tools/embed_modules.xml
team/oej/calleridutf8/build_tools/make_defaults_h
team/oej/calleridutf8/build_tools/make_version
team/oej/calleridutf8/build_tools/make_version_h
team/oej/calleridutf8/build_tools/menuselect-deps.in
team/oej/calleridutf8/build_tools/prep_tarball
team/oej/calleridutf8/cdr/ (props changed)
team/oej/calleridutf8/cdr/Makefile
team/oej/calleridutf8/cdr/cdr_adaptive_odbc.c
team/oej/calleridutf8/cdr/cdr_csv.c
team/oej/calleridutf8/cdr/cdr_manager.c
team/oej/calleridutf8/cdr/cdr_pgsql.c
team/oej/calleridutf8/cdr/cdr_sqlite3_custom.c
team/oej/calleridutf8/channels/ (props changed)
team/oej/calleridutf8/channels/DialTone.h
team/oej/calleridutf8/channels/Makefile
team/oej/calleridutf8/channels/chan_h323.c
team/oej/calleridutf8/channels/chan_iax2.c
team/oej/calleridutf8/channels/chan_local.c
team/oej/calleridutf8/channels/chan_mgcp.c
team/oej/calleridutf8/channels/chan_misdn.c
team/oej/calleridutf8/channels/chan_oss.c
team/oej/calleridutf8/channels/chan_sip.c
team/oej/calleridutf8/channels/chan_skinny.c
team/oej/calleridutf8/channels/chan_unistim.c
team/oej/calleridutf8/channels/chan_usbradio.c
team/oej/calleridutf8/channels/chan_zap.c
team/oej/calleridutf8/channels/gentone.c
team/oej/calleridutf8/channels/iax2-provision.c
team/oej/calleridutf8/channels/iax2.h
team/oej/calleridutf8/channels/misdn/chan_misdn_config.h
team/oej/calleridutf8/channels/misdn/ie.c
team/oej/calleridutf8/channels/misdn/isdn_lib.c
team/oej/calleridutf8/channels/misdn/isdn_lib.h
team/oej/calleridutf8/channels/misdn/isdn_msg_parser.c
team/oej/calleridutf8/channels/misdn/portinfo.c
team/oej/calleridutf8/codecs/ (props changed)
team/oej/calleridutf8/codecs/Makefile
team/oej/calleridutf8/codecs/ilbc/iLBC_define.h
team/oej/calleridutf8/configs/dundi.conf.sample
team/oej/calleridutf8/configs/extensions.lua.sample
team/oej/calleridutf8/configs/features.conf.sample
team/oej/calleridutf8/configs/h323.conf.sample
team/oej/calleridutf8/configs/http.conf.sample
team/oej/calleridutf8/configs/iax.conf.sample
team/oej/calleridutf8/configs/iaxprov.conf.sample
team/oej/calleridutf8/configs/manager.conf.sample
team/oej/calleridutf8/configs/mgcp.conf.sample
team/oej/calleridutf8/configs/oss.conf.sample
team/oej/calleridutf8/configs/queues.conf.sample
team/oej/calleridutf8/configs/sip.conf.sample
team/oej/calleridutf8/configs/skinny.conf.sample
team/oej/calleridutf8/configs/unistim.conf.sample
team/oej/calleridutf8/configs/zapata.conf.sample
team/oej/calleridutf8/configure
team/oej/calleridutf8/configure.ac
team/oej/calleridutf8/doc/CODING-GUIDELINES
team/oej/calleridutf8/doc/asterisk-mib.txt
team/oej/calleridutf8/doc/asterisk.sgml
team/oej/calleridutf8/doc/tex/qos.tex
team/oej/calleridutf8/formats/ (props changed)
team/oej/calleridutf8/formats/Makefile
team/oej/calleridutf8/formats/format_g726.c
team/oej/calleridutf8/formats/format_h263.c
team/oej/calleridutf8/formats/format_h264.c
team/oej/calleridutf8/formats/format_ogg_vorbis.c
team/oej/calleridutf8/formats/format_pcm.c
team/oej/calleridutf8/formats/format_wav.c
team/oej/calleridutf8/formats/format_wav_gsm.c
team/oej/calleridutf8/funcs/ (props changed)
team/oej/calleridutf8/funcs/Makefile
team/oej/calleridutf8/funcs/func_callerid.c
team/oej/calleridutf8/funcs/func_timeout.c
team/oej/calleridutf8/include/asterisk/_private.h
team/oej/calleridutf8/include/asterisk/adsi.h
team/oej/calleridutf8/include/asterisk/ael_structs.h
team/oej/calleridutf8/include/asterisk/aes.h
team/oej/calleridutf8/include/asterisk/agi.h
team/oej/calleridutf8/include/asterisk/alaw.h
team/oej/calleridutf8/include/asterisk/app.h
team/oej/calleridutf8/include/asterisk/ast_expr.h
team/oej/calleridutf8/include/asterisk/astdb.h
team/oej/calleridutf8/include/asterisk/astobj2.h
team/oej/calleridutf8/include/asterisk/audiohook.h
team/oej/calleridutf8/include/asterisk/autoconfig.h.in
team/oej/calleridutf8/include/asterisk/callerid.h
team/oej/calleridutf8/include/asterisk/causes.h
team/oej/calleridutf8/include/asterisk/cdr.h
team/oej/calleridutf8/include/asterisk/channel.h
team/oej/calleridutf8/include/asterisk/compat.h
team/oej/calleridutf8/include/asterisk/devicestate.h
team/oej/calleridutf8/include/asterisk/doxyref.h
team/oej/calleridutf8/include/asterisk/dsp.h
team/oej/calleridutf8/include/asterisk/event.h
team/oej/calleridutf8/include/asterisk/extconf.h
team/oej/calleridutf8/include/asterisk/file.h
team/oej/calleridutf8/include/asterisk/frame.h
team/oej/calleridutf8/include/asterisk/hashtab.h
team/oej/calleridutf8/include/asterisk/io.h
team/oej/calleridutf8/include/asterisk/localtime.h
team/oej/calleridutf8/include/asterisk/lock.h
team/oej/calleridutf8/include/asterisk/logger.h
team/oej/calleridutf8/include/asterisk/manager.h
team/oej/calleridutf8/include/asterisk/mod_format.h
team/oej/calleridutf8/include/asterisk/module.h
team/oej/calleridutf8/include/asterisk/netsock.h
team/oej/calleridutf8/include/asterisk/network.h
team/oej/calleridutf8/include/asterisk/paths.h
team/oej/calleridutf8/include/asterisk/pbx.h
team/oej/calleridutf8/include/asterisk/rtp.h
team/oej/calleridutf8/include/asterisk/term.h
team/oej/calleridutf8/include/asterisk/threadstorage.h
team/oej/calleridutf8/include/asterisk/time.h
team/oej/calleridutf8/include/asterisk/transcap.h
team/oej/calleridutf8/include/asterisk/translate.h
team/oej/calleridutf8/include/asterisk/udptl.h
team/oej/calleridutf8/include/asterisk/ulaw.h
team/oej/calleridutf8/include/asterisk/unaligned.h
team/oej/calleridutf8/include/asterisk/zapata.h
team/oej/calleridutf8/include/jitterbuf.h
team/oej/calleridutf8/main/Makefile
team/oej/calleridutf8/main/asterisk.c
team/oej/calleridutf8/main/astmm.c
team/oej/calleridutf8/main/astobj2.c
team/oej/calleridutf8/main/audiohook.c
team/oej/calleridutf8/main/autoservice.c
team/oej/calleridutf8/main/callerid.c
team/oej/calleridutf8/main/cdr.c
team/oej/calleridutf8/main/channel.c
team/oej/calleridutf8/main/cli.c
team/oej/calleridutf8/main/config.c
team/oej/calleridutf8/main/cygload.c
team/oej/calleridutf8/main/db.c
team/oej/calleridutf8/main/dsp.c
team/oej/calleridutf8/main/editline/sys.h
team/oej/calleridutf8/main/event.c
team/oej/calleridutf8/main/file.c
team/oej/calleridutf8/main/hashtab.c
team/oej/calleridutf8/main/loader.c
team/oej/calleridutf8/main/logger.c
team/oej/calleridutf8/main/manager.c
team/oej/calleridutf8/main/netsock.c
team/oej/calleridutf8/main/pbx.c
team/oej/calleridutf8/main/rtp.c
team/oej/calleridutf8/main/srv.c
team/oej/calleridutf8/main/threadstorage.c
team/oej/calleridutf8/main/translate.c
team/oej/calleridutf8/main/udptl.c
team/oej/calleridutf8/main/utils.c
team/oej/calleridutf8/makeopts.in
team/oej/calleridutf8/pbx/ (props changed)
team/oej/calleridutf8/pbx/Makefile
team/oej/calleridutf8/pbx/pbx_dundi.c
team/oej/calleridutf8/pbx/pbx_lua.c
team/oej/calleridutf8/res/ (props changed)
team/oej/calleridutf8/res/Makefile
team/oej/calleridutf8/res/res_adsi.c
team/oej/calleridutf8/res/res_agi.c
team/oej/calleridutf8/res/res_config_pgsql.c
team/oej/calleridutf8/res/res_crypto.c
team/oej/calleridutf8/res/res_features.c
team/oej/calleridutf8/res/res_monitor.c
team/oej/calleridutf8/res/res_musiconhold.c
team/oej/calleridutf8/res/res_odbc.c
team/oej/calleridutf8/res/snmp/agent.c
team/oej/calleridutf8/sounds/Makefile
team/oej/calleridutf8/utils/ (props changed)
team/oej/calleridutf8/utils/Makefile
team/oej/calleridutf8/utils/ael_main.c
team/oej/calleridutf8/utils/astman.c
team/oej/calleridutf8/utils/check_expr.c
team/oej/calleridutf8/utils/clicompat.c
team/oej/calleridutf8/utils/conf2ael.c
team/oej/calleridutf8/utils/extconf.c
team/oej/calleridutf8/utils/hashtest.c
Propchange: team/oej/calleridutf8/
------------------------------------------------------------------------------
automerge = http://www.codename-pineapple.org/
Propchange: team/oej/calleridutf8/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/oej/calleridutf8/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/oej/calleridutf8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 19 04:49:16 2007
@@ -1,1 +1,1 @@
-/trunk:1-90121
+/trunk:1-93920
Modified: team/oej/calleridutf8/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/calleridutf8/.cleancount?view=diff&rev=93924&r1=93923&r2=93924
==============================================================================
--- team/oej/calleridutf8/.cleancount (original)
+++ team/oej/calleridutf8/.cleancount Wed Dec 19 04:49:16 2007
@@ -1,1 +1,1 @@
-32
+33
Modified: team/oej/calleridutf8/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/calleridutf8/CHANGES?view=diff&rev=93924&r1=93923&r2=93924
==============================================================================
--- team/oej/calleridutf8/CHANGES (original)
+++ team/oej/calleridutf8/CHANGES Wed Dec 19 04:49:16 2007
@@ -4,11 +4,17 @@
AMI - The manager (TCP/TLS/HTTP)
--------------------------------
+ * Manager has undergone a lot of changes, all of them documented
+ in doc/manager_1_1.txt
+ * Manager version has changed to 1.1
+ * Added a new action 'CoreShowChannels' to list currently defined channels
+ and some information about them.
+ * Added a new action 'SIPshowregistry' to list SIP registrations.
* Added TLS support for the manager interface and HTTP server
* Added the URI redirect option for the built-in HTTP server
* The output of CallerID in Manager events is now more consistent.
CallerIDNum is used for number and CallerIDName for name.
- * enable https support for builtin web server.
+ * Enable https support for builtin web server.
See configs/http.conf.sample for details.
* Added a new action, GetConfigJSON, which can return the contents of an
Asterisk configuration file in JSON format. This is intended to help
@@ -22,6 +28,13 @@
* Added a "ListAllVoicemailUsers" action that allows you to get a list of all
the voicemail users setup.
* Added 'DBDel' and 'DBDelTree' manager commands.
+ * cdr_manager now reports events via the "cdr" level, separating it from
+ the very verbose "call" level.
+ * Manager users are now stored in memory. If you change the manager account
+ list (delete or add accounts) you need to reload manager.
+ * Added Masquerade manager event for when a masquerade happens between
+ two channels.
+ * Added "manager reload" command for the CLI
Dialplan functions
------------------
@@ -48,6 +61,7 @@
CLI Changes
-----------
+ * New CLI command "core show hint" (usage: core show hint <exten>)
* New CLI command "core show settings"
* Added 'core show channels count' CLI command.
* Added the ability to set the core debug and verbose values on a per-file basis.
@@ -95,6 +109,11 @@
* A new option called "callcounter" (global/peer/user level) enables call counters needed
for better status reports needed for queues and SIP subscriptions. (Call-Limit was previously
used to enable this functionality).
+ * New settings for timer T1 and timer B on a global level or per device. This makes it
+ possible to force timeout faster on non-responsive SIP servers. These settings are
+ considered advanced, so don't use them unless you have a problem.
+ * Added a dial string option to be able to set the To: header in an INVITE to any
+ SIP uri.
IAX2 changes
------------
@@ -103,11 +122,66 @@
* Added support for OSP. The token is set and retrieved through the CHANNEL()
dialplan function.
+XMPP Google Talk/Jingle changes
+-------------------------------
+ * Added the bindaddr option to gtalk.conf.
+
Skinny changes
-------------
* Added skinny show device, skinny show line, and skinny show settings CLI commands.
* Proper codec support in chan_skinny.
-
+ * Added settings for IP and Ethernet QoS requests
+
+MGCP changes
+------------
+ * Added separate settings for media QoS in mgcp.conf
+
+OSS Channel changes
+-------------------
+ * Added experimental support for video under X windows
+
+Phone channel changes (chan_phone)
+----------------------------------
+ * Added G729 passthrough support to chan_phone for Sigma Designs boards.
+
+H.323 channel Changes
+---------------------
+ * H323 remote hold notification support added (by NOTIFY message
+ and/or H.450 supplementary service)
+
+Local channel changes
+---------------------
+ * The device state functionality in the Local channel driver has been updated
+ to indicate INUSE or NOT_INUSE when a Local channel is being used as opposed
+ to just UNKNOWN if the extension exists.
+ * Added jitterbuffer support for chan_local. This allows you to use the
+ generic jitterbuffer on incoming calls going to Asterisk applications.
+ For example, this would allow you to use a jitterbuffer for an incoming
+ SIP call to Voicemail by putting a Local channel in the middle. This
+ feature is enabled by using the 'j' option in the Dial string to the Local
+ channel in conjunction with the existing 'n' option for local channels.
+
+Zaptel channel driver (chan_zap) Changes
+----------------------------------------
+ * SS7 support in chan_zap (via libss7 library)
+ * In India, some carriers transmit CID via dtmf. Some code has been added
+ that will handle some situations. The cidstart=polarity_IN choice has been added for
+ those carriers that transmit CID via dtmf after a polarity change.
+ * CID matching information is now shown when doing 'dialplan show'.
+ * Added zap show version CLI command to chan_zap.
+ * Added setvar support to zapata.conf channel entries.
+ * Added two new options: mwimonitor and mwimonitornotify. These options allow
+ you to enable MWI monitoring on FXO lines. When the MWI state changes,
+ the script specified in the mwimonitornotify option is executed. An internal
+ event indicating the new state of the mailbox is also generated, so that
+ the normal MWI facilities in Asterisk work as usual.
+
+A new channel driver: Unistim
+-----------------------------
+ * Added a new channel driver, chan_unistim. See doc/unistim.txt and
+ configs/unistim.conf.sample for details. This new channel driver allows
+ you to use Nortel i2002, i2004, and i2050 phones with Asterisk.
+
DUNDi changes
-------------
* Added the ability to specify arguments to the Dial application when using
@@ -157,6 +231,8 @@
Queue changes
-------------
+ * Added the general option 'shared_lastcall' so that member's wrapuptime may be
+ used across multiple queues.
* Added QUEUE_VARIABLES function to set queue variables added setqueuevar and
setqueueentryvar options for each queue, see queues.conf.sample for details.
* Added keepstats option to queues.conf which will keep queue
@@ -227,6 +303,10 @@
for the SLATrunk application.
* The Read application no longer exits the dialplan on error. Instead, it sets
READSTATUS to ERROR, which you can catch and handle separately.
+ * Added 'm' option to Directory, which lists out names, 8 at a time, instead
+ of asking for verification of each name, one at a time.
+ * Privacy() no longer uses privacy.conf, as all options are specifyable as
+ direct options to the app.
Music On Hold Changes
---------------------
@@ -265,21 +345,6 @@
* aelparse will now read extensions.conf to see if a referenced
macro or context is there before issueing a warning.
-Zaptel channel driver (chan_zap) Changes
-----------------------------------------
- * SS7 support in chan_zap (via libss7 library)
- * In India, some carriers transmit CID via dtmf. Some code has been added
- that will handle some situations. The cidstart=polarity_IN choice has been added for
- those carriers that transmit CID via dtmf after a polarity change.
- * CID matching information is now shown when doing 'dialplan show'.
- * Added zap show version CLI command to chan_zap.
- * Added setvar support to zapata.conf channel entries.
-
-H.323 Changes
--------------
- * H323 remote hold notification support added (by NOTIFY message
- and/or H.450 supplementary service)
-
Call Features (res_features) Changes
------------------------------------
* Added the parkedcalltransfers option to features.conf
@@ -301,12 +366,13 @@
* Brazilian Portuguese (pt-BR) in VM, and say.c was added
* Added support for the Hungarian language for saying numbers, dates, and times.
-Miscellaneous
--------------
- * Added the bindaddr option to gtalk.conf.
- * Ability to use libcap to set high ToS bits when non-root
- on Linux. If configure is unable to find libcap then you
- can use --with-cap to specify the path.
+AGI Changes
+-----------
+ * Added SPEECH commands for speech recognition. A complete listing can be found
+ using agi show.
+
+Logger changes
+--------------
* Added rotatestrategy option to logger.conf, along with two new options:
"timestamp" which will use the time to name the logger files instead of
sequence number; and "rotate", which rotates the names of the logfiles,
@@ -315,12 +381,15 @@
command to be run after rotation. This is primarily useful with
rotatestrategry=rotate, to allow a limit on the number of logfiles kept
and to ensure that the oldest log file gets deleted.
- * Added Masquerade manager event for when a masquerade happens between
- two channels.
+
+Miscellaneous
+-------------
+ * Ability to use libcap to set high ToS bits when non-root
+ on Linux. If configure is unable to find libcap then you
+ can use --with-cap to specify the path.
* Added maxfiles option to options section of asterisk.conf which allows you to specify
what Asterisk should set as the maximum number of open files when it loads.
* Added the jittertargetextra configuration option.
- * Added G729 passthrough support to chan_phone for Sigma Designs boards.
* Added a new CDR module, cdr_sqlite3_custom.
* The cdr_manager module has a [mappings] feature, like cdr_custom,
to add fields to the manager event from the CDR variables.
@@ -329,24 +398,12 @@
configuration files for the IP channel drivers. The new option is "cos".
This information is also documented in doc/qos.tex, or the IP Quality of Service
section of asterisk.pdf.
- * The device state functionality in the Local channel driver has been updated
- to indicate INUSE or NOT_INUSE when a Local channel is being used as opposed
- to just UNKNOWN if the extension exists.
* When originating a call using AMI or pbx_spool that fails the reason for failure
will now be available in the failed extension using the REASON dialplan variable.
- * Added jitterbuffer support for chan_local. This allows you to use the
- generic jitterbuffer on incoming calls going to Asterisk applications.
- For example, this would allow you to use a jitterbuffer for an incoming
- SIP call to Voicemail by putting a Local channel in the middle. This
- feature is enabled by using the 'j' option in the Dial string to the Local
- channel in conjunction with the existing 'n' option for local channels.
* Added support for reading the TOUCH_MONITOR_PREFIX channel variable.
It allows you to configure a prefix for auto-monitor recordings.
* Added support for writing and running your dialplan in lua. See
configs/extensions.lua.sample for examples of how to do this.
- * Added a new channel driver, chan_unistim. See doc/unistim.txt and
- configs/unistim.conf.sample for details. This new channel driver allows
- you to use Nortel i2002, i2004, and i2050 phones with Asterisk.
* A new extension pattern matching algorithm, based on a trie, is introduced
here, that could noticeably speed up mid-sized to large dialplans.
It is NOT used by default, as duplicating the behaviour of the old pattern
@@ -355,4 +412,7 @@
set to false; setting that to true will force the use of the new algorithm.
Also, the cli commands "dialplan set extenpatternmatchingnew true/false" can
be used to switch the algorithms at run time.
-
+ * A new option when starting a remote asterisk (rasterisk, asterisk -r) for
+ specifying which socket to use to connect to the running Asterisk daemon
+ (-s)
+
Modified: team/oej/calleridutf8/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/calleridutf8/CREDITS?view=diff&rev=93924&r1=93923&r2=93924
==============================================================================
--- team/oej/calleridutf8/CREDITS (original)
+++ team/oej/calleridutf8/CREDITS Wed Dec 19 04:49:16 2007
@@ -166,6 +166,12 @@
Cedric Hans - Development of chan_unistim
cedric.hans(AT)mlkj.net
+Sergio Fadda - console_video: video support for chan_oss and chan_alsa
+
+Marta Carbone - console_video and the astobj2 framework
+
+Luigi Rizzo - astobj2, console_video, windows build, chan_oss cleanup,
+ and a bunch of infrastructure work (loader, new_cli, ...)
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Modified: team/oej/calleridutf8/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/calleridutf8/Makefile?view=diff&rev=93924&r1=93923&r2=93924
==============================================================================
--- team/oej/calleridutf8/Makefile (original)
+++ team/oej/calleridutf8/Makefile Wed Dec 19 04:49:16 2007
@@ -20,16 +20,38 @@
# SOLINK - linker flags used only for creating shared objects (.so files),
# used for all .so links
#
-# Default values fo ASTCFLAGS and ASTLDFLAGS can be specified in the
+# Initial values for ASTCFLAGS and ASTLDFLAGS can be specified in the
# environment when running make, as follows:
#
-# $ ASTCFLAGS="-Werror" make
-
-export ASTTOPDIR
+# $ ASTCFLAGS="-Werror" make ...
+#
+# note that this is different from
+#
+# $ make ASTCFLAGS="-Werror" ...
+#
+# If you need to pass compiler/linker flags as 'make' variables, please use
+#
+# $ make COPTS="..." LDOPTS="..." ...
+#
+#
+# You can add the path of local module subdirs from the command line with
+# make LOCAL_MOD_SUBDIRS= ....
+
+export ASTTOPDIR # Top level dir, used in subdirs' Makefiles
export ASTERISKVERSION
export ASTERISKVERSIONNUM
-export INSTALL_PATH
-export ASTETCDIR
+
+#--- values used for default paths
+
+# DESTDIR is the staging (or final) directory where files are copied
+# during the install process. Define it before 'export', otherwise
+# export will set it to the empty string making ?= fail.
+# WARNING: do not put spaces or comments after the value.
+DESTDIR?=$(INSTALL_PATH)
+export DESTDIR
+
+export INSTALL_PATH # Additional prefix for the following paths
+export ASTETCDIR # Path for config files
export ASTVARRUNDIR
export MODULES_DIR
export ASTSPOOLDIR
@@ -43,24 +65,32 @@
export ASTSBINDIR
export AGI_DIR
export ASTCONFPATH
-export NOISY_BUILD
-export MENUSELECT_CFLAGS
-export AST_DEVMODE
+
+export OSARCH # Operating system
+export PROC # Processor type
+
+export NOISY_BUILD # Used in Makefile.rules
+export MENUSELECT_CFLAGS # Options selected in menuselect.
+export AST_DEVMODE # Set to "yes" for additional compiler
+ # and runtime checks
+
+export SOLINK # linker flags for shared objects
+export STATIC_BUILD # Additional cflags, set to -static
+ # for static builds. Probably
+ # should go directly to ASTLDFLAGS
+
+#--- paths to various commands
export CC
export CXX
export AR
export RANLIB
export HOST_CC
-export STATIC_BUILD
export INSTALL
-export DESTDIR
-export PROC
-export SOLINK
export STRIP
export DOWNLOAD
+export AWK
export GREP
export ID
-export OSARCH
# even though we could use '-include makeopts' here, use a wildcard
# lookup anyway, so that make won't try to build makeopts if it doesn't
@@ -71,15 +101,12 @@
# Some build systems, such as the one in openwrt, like to pass custom target
# CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
-ASTCFLAGS+=$(COPTS)
+ASTCFLAGS+=$(COPTS) -D_XPG4_2
ASTLDFLAGS+=$(LDOPTS)
#Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes
-# Create OPTIONS variable
-OPTIONS=
-
ASTTOPDIR:=$(CURDIR)
# Overwite config files on "make samples"
@@ -88,12 +115,6 @@
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
DEBUG=-g3
-# Staging directory
-# Files are copied here temporarily during the install process
-# For example, make DESTDIR=/tmp/asterisk woud put things in
-# /tmp/asterisk/etc/asterisk
-# !!! Watch out, put no spaces or comments after the value !!!
-#DESTDIR?=/tmp/asterisk
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -160,6 +181,9 @@
MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
+# Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
+OPTIONS=
+
ifeq ($(OSARCH),linux-gnu)
ifeq ($(PROC),x86_64)
# You must have GCC 3.4 to use k8, otherwise use athlon
@@ -236,22 +260,26 @@
ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
endif
-ASTERISKVERSION:=$(shell build_tools/make_version .)
+ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
ifneq ($(wildcard .version),)
- ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
+ ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
else
RPMVERSION=unknown
endif
ifneq ($(wildcard .svn),)
- ASTERISKVERSIONNUM=999999
-endif
-
+ ASTERISKVERSIONNUM:=999999
+endif
+
+# XXX MALLOC_DEBUG is probably unused, Makefile.moddir_rules adds the
+# value directly to ASTCFLAGS
+# XXX BUSYDETECT is probably useless, the only similar reference is to
+# #ifdef BUSYDETECT in main/dsp.c
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res $(LOCAL_MOD_SUBDIRS)
OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -261,6 +289,7 @@
MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
+MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
ifneq ($(findstring darwin,$(OSARCH)),)
ASTCFLAGS+=-D__Darwin__
@@ -277,6 +306,15 @@
SOLINK=-shared -fpic -L/usr/local/ssl/lib
endif
+# comment to print directories during submakes
+#PRINT_DIR=yes
+
+ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
+SUBMAKE=$(MAKE) --quiet
+else
+SUBMAKE=$(MAKE) --quiet --no-print-directory
+endif
+
# This is used when generating the doxygen documentation
ifneq ($(DOT),:)
HAVEDOT=yes
@@ -293,9 +331,6 @@
mK=" make"
endif
-# comment to print directories during submakes
-PRINT_DIR?= --no-print-directory
-
all: _all
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, and +"
@@ -317,13 +352,17 @@
menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
- @echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+ @echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LDFLAGS):
- @echo "EMBED_LDFLAGS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+ @echo "EMBED_LDFLAGS+="`$(SUBMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LIBS):
- @echo "EMBED_LIBS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+ @echo "EMBED_LIBS+="`$(SUBMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_MENUSELECT_TREE):
+ @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
+ @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
makeopts.embed_rules: menuselect.makeopts
@echo "Generating embedded module rules ..."
@@ -360,30 +399,22 @@
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
- @if cmp -s $@.tmp $@ ; then : ; else \
- mv $@.tmp $@ ; \
- fi
+ @cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
include/asterisk/version.h:
@build_tools/make_version_h > $@.tmp
- @if cmp -s $@.tmp $@ ; then : ; else \
- mv $@.tmp $@ ; \
- fi
+ @cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
include/asterisk/buildopts.h: menuselect.makeopts
@build_tools/make_buildopts_h > $@.tmp
- @if cmp -s $@.tmp $@ ; then : ; else \
- mv $@.tmp $@ ; \
- fi
+ @cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
include/asterisk/build.h:
@build_tools/make_build_h > $@.tmp
- @if cmp -s $@.tmp $@ ; then : ; else \
- mv $@.tmp $@ ; \
- fi
+ @cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
$(SUBDIRS_CLEAN):
@@ -489,9 +520,9 @@
fi
$(SUBDIRS_INSTALL):
- @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) -C $(@:-install=) install
-
-NEWMODS=$(notdir $(wildcard */*.so))
+ @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) --quiet $(PRINT_DIR) -C $(@:-install=) install
+
+NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
oldmodcheck:
@@ -578,7 +609,7 @@
@if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
echo "Creating asterisk.conf"; \
( \
- echo "[directories]" ; \
+ echo "[directories](!) ; remove the (!) to enable this" ; \
echo "astetcdir => $(ASTETCDIR)" ; \
echo "astmoddir => $(MODULES_DIR)" ; \
echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
@@ -760,21 +791,32 @@
gmenuselect: menuselect/gmenuselect menuselect-tree
- at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+# options for make in menuselect/
+MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+
menuselect/menuselect: menuselect/makeopts
- echo "doing menuselect with $(HOST_CC)"
- @CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+ $(MAKE_MENUSELECT)
menuselect/gmenuselect: menuselect/makeopts
- @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect gmenuselect CONFIGURE_SILENT="--silent"
+ $(MAKE_MENUSELECT) gmenuselect
menuselect/makeopts:
- @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect makeopts CONFIGURE_SILENT="--silent"
+ $(MAKE_MENUSELECT) makeopts
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml configure
@echo "Generating input for menuselect ..."
- @build_tools/prep_moduledeps > $@
-
+ @echo "<?xml version=\"1.0\"?>" > $@
+ @echo >> $@
+ @echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
+ @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
+ @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
+ @cat build_tools/cflags.xml >> $@
+ @cat build_tools/embed_modules.xml >> $@
+ @cat sounds/sounds.xml >> $@
+ @echo "</menu>" >> $@
+
+pdf: asterisk.pdf
asterisk.pdf:
$(MAKE) -C doc/tex asterisk.pdf
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Modified: team/oej/calleridutf8/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/oej/calleridutf8/Makefile.moddir_rules?view=diff&rev=93924&r1=93923&r2=93924
==============================================================================
--- team/oej/calleridutf8/Makefile.moddir_rules (original)
+++ team/oej/calleridutf8/Makefile.moddir_rules Wed Dec 19 04:49:16 2007
@@ -34,7 +34,30 @@
include $(ASTTOPDIR)/Makefile.rules
-#comma:=, # not used
+# If MODULE_PREFIX is defined, use it to run the standard functions to set
+# C_MODS, CC_MODS, LOADABLE_MODS and EMBEDDED_MODS.
+# Each word of MODULE_PREFIX is a prefix for filenames that we consider
+# valid C or CC modules (eg. app, func ...). Note that the underscore
+# is added here, and does not need to be in MODULE_PREFIX
+#
+# Use MODULE_EXCLUDE to specify additional modules to exclude.
+
+ifneq ($(MODULE_PREFIX),)
+ ALL_C_MODS:=
+ ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
+ ALL_CC_MODS:=
+ ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc)))
+
+ C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
+ CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
+
+ # and store in the list of embedded or loadable modules
+ ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
+ EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
+ else
+ LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
+ endif
+endif
# Both C++ and C++ sources need their module name in AST_MODULE
# We also pass whatever _INCLUDE list is generated by menuselect
@@ -59,14 +82,14 @@
modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
-.PHONY: clean uninstall _all
+.PHONY: clean uninstall _all moduleinfo makeopts
ifneq ($(LOADABLE_MODS),)
_all: $(LOADABLE_MODS:%=%.so)
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
# linker options and extra libraries for cygwin
SOLINK=-Wl,--out-implib=lib$@.a -shared
- LIBS+=-L../main -lasterisk -L../res $($@_LIBS)
+ LIBS+=-L$(ASTTOPDIR)/main -lasterisk -L$(ASTTOPDIR)/res $($@_LIBS)
# additional libraries in res/
endif
endif
@@ -99,9 +122,44 @@
rm -f modules.link
install:: all
- for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ @echo "Installing modules from `basename $(CURDIR)`..."
+ @for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
uninstall::
+
+dist-clean::
+ rm -f .*.moduleinfo .moduleinfo
+ rm -f .*.makeopts .makeopts
+
+.%.moduleinfo: %.c
+ @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@
+ $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+ echo "</member>" >> $@
+
+.%.moduleinfo: %.cc
+ @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.oo $(SUBDIR)/$*.so\">" > $@
+ $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+ echo "</member>" >> $@
+
+.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+ @echo "<category name=\"MENUSELECT_$(MENUSELECT_CATEGORY)\" displayname=\"$(MENUSELECT_DESCRIPTION)\" remove_on_change=\"$(SUBDIR)/modules.link\">" > $@
+ @cat $^ >> $@
+ @echo "</category>" >> $@
+
+moduleinfo: .moduleinfo
+ @cat $<
+
+.%.makeopts: %.c
+ @$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.%.makeopts: %.cc
+ @$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.makeopts:: $(addsuffix .makeopts,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+ @cat $^ > $@
+
+makeopts: .makeopts
+ @cat $<
ifneq ($(wildcard .*.d),)
include .*.d
Modified: team/oej/calleridutf8/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/calleridutf8/UPGRADE.txt?view=diff&rev=93924&r1=93923&r2=93924
==============================================================================
--- team/oej/calleridutf8/UPGRADE.txt (original)
+++ team/oej/calleridutf8/UPGRADE.txt Wed Dec 19 04:49:16 2007
@@ -84,6 +84,8 @@
* Read() now sets a READSTATUS variable on exit. It does NOT automatically
return -1 (and hangup) anymore on error. If you want to hangup on error,
you need to do so explicitly in your dialplan.
[... 22053 lines stripped ...]
More information about the asterisk-commits
mailing list