diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-04-11 21:38:22 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-04-13 03:48:57 -0400 |
| commit | 4a58261694f1538a419dd869f87ea4590171a9f2 (patch) | |
| tree | a8d3196d5b69f233f814ef3fa7a543c2ce50bd24 /channels | |
| parent | 1174ef588dafe864fe3f2c1f8297690def8f85d1 (diff) | |
git migration: Refactor the ASTERISK_FILE_VERSION macro
Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file. As a
result, this patch removes Asterisk's support for showing source file
versions.
Specifically, it does the following:
* Rename ASTERISK_FILE_VERSION macro to ASTERISK_REGISTER_FILE, and
remove passing the version in with the macro. Other facilities
than 'core show file version' make use of the file names, such as
setting a debug level only on a specific file. As such, the act of
registering source files with the Asterisk core still has use. The
macro rename now reflects the new macro purpose.
* main/asterisk:
- Refactor the file_version structure to reflect that it no longer
tracks a version field.
- Remove the "core show file version" CLI command. Without the file
version, it is no longer useful.
- Remove the ast_file_version_find function. The file version is no
longer tracked.
- Rename ast_register_file_version/ast_unregister_file_version to
ast_register_file/ast_unregister_file, respectively.
* main/manager: Remove value from the Version key of the ModuleCheck
Action. The actual key itself has not been removed, as doing so would
absolutely constitute a backwards incompatible change. However, since
the file version is no longer tracked, there is no need to attempt to
include it in the Version key.
* UPGRADE: Add notes for:
- Modification to the ModuleCheck AMI Action
- Removal of the "core show file version" CLI command
Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e
Diffstat (limited to 'channels')
32 files changed, 32 insertions, 32 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 74a61398a..755936367 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -39,7 +39,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <fcntl.h> #include <sys/ioctl.h> diff --git a/channels/chan_bridge_media.c b/channels/chan_bridge_media.c index 529fa2652..0a3468a12 100644 --- a/channels/chan_bridge_media.c +++ b/channels/chan_bridge_media.c @@ -34,7 +34,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/channel.h" #include "asterisk/bridge.h" diff --git a/channels/chan_console.c b/channels/chan_console.c index b14d4b746..4fc538b77 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -62,7 +62,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/signal.h> /* SIGURG */ diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index e3f5c81ff..b7df2b811 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -54,7 +54,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #if defined(__NetBSD__) || defined(__FreeBSD__) #include <pthread.h> diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 771f7706d..8d3e7f145 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -58,7 +58,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/mman.h> #include <dirent.h> diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 95fa2dc7c..602d38d01 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -40,7 +40,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/socket.h> #include <sys/ioctl.h> diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index ae8bcd7b8..4bfb1993d 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -81,7 +81,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <pthread.h> #include <sys/socket.h> diff --git a/channels/chan_motif.c b/channels/chan_motif.c index 13baa70eb..05c6944ef 100644 --- a/channels/chan_motif.c +++ b/channels/chan_motif.c @@ -44,7 +44,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/socket.h> #include <fcntl.h> diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index 36c3435bb..c23eecdc9 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/socket.h> #include <sys/time.h> diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 51fce44c0..0eb777a75 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -45,7 +45,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <ctype.h> /* isalnum() used here */ #include <math.h> diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 2bf7bddb4..6d790fefd 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -40,7 +40,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <ctype.h> #include <sys/socket.h> diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index ca0e5cc03..07dd1b7b4 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -38,7 +38,7 @@ #include <pjsip_ua.h> #include <pjlib.h> -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/channels/chan_rtp.c b/channels/chan_rtp.c index 97fbf9f31..04eb0b1fe 100644 --- a/channels/chan_rtp.c +++ b/channels/chan_rtp.c @@ -33,7 +33,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/channel.h" #include "asterisk/module.h" diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 179aa0fe4..3ee92da5e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -221,7 +221,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <signal.h> #include <sys/signal.h> diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index d1c05abec..06878fb96 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -39,7 +39,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/socket.h> #include <netinet/in.h> diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index f42961725..4379aa5c6 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -38,7 +38,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/stat.h> #include <signal.h> diff --git a/channels/console_board.c b/channels/console_board.c index 6c920a944..7755c449f 100644 --- a/channels/console_board.c +++ b/channels/console_board.c @@ -42,7 +42,7 @@ ***/ #include "asterisk.h" /* ast_strdupa */ -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/utils.h" /* ast_strdupa */ #include "console_video.h" /* ast_strdupa */ diff --git a/channels/console_video.c b/channels/console_video.c index a1db5cd77..da651baac 100644 --- a/channels/console_video.c +++ b/channels/console_video.c @@ -41,7 +41,7 @@ ***/ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/ioctl.h> #include "asterisk/cli.h" #include "asterisk/file.h" diff --git a/channels/dahdi/bridge_native_dahdi.c b/channels/dahdi/bridge_native_dahdi.c index 9df82b29b..d67cb5c43 100644 --- a/channels/dahdi/bridge_native_dahdi.c +++ b/channels/dahdi/bridge_native_dahdi.c @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "../sig_analog.h" #if defined(HAVE_PRI) diff --git a/channels/iax2/codec_pref.c b/channels/iax2/codec_pref.c index 85167c368..fba06a1ed 100644 --- a/channels/iax2/codec_pref.c +++ b/channels/iax2/codec_pref.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/astobj2.h" diff --git a/channels/iax2/firmware.c b/channels/iax2/firmware.c index a1ee43550..7e43bef43 100644 --- a/channels/iax2/firmware.c +++ b/channels/iax2/firmware.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/types.h> #include <sys/stat.h> diff --git a/channels/iax2/format_compatibility.c b/channels/iax2/format_compatibility.c index be7852c8f..72fabf116 100644 --- a/channels/iax2/format_compatibility.c +++ b/channels/iax2/format_compatibility.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/astobj2.h" diff --git a/channels/iax2/parser.c b/channels/iax2/parser.c index 2a3eabf41..753810070 100644 --- a/channels/iax2/parser.c +++ b/channels/iax2/parser.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/socket.h> #include <netinet/in.h> diff --git a/channels/iax2/provision.c b/channels/iax2/provision.c index 85dfe9448..fcad2fe11 100644 --- a/channels/iax2/provision.c +++ b/channels/iax2/provision.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <netdb.h> #include <netinet/in.h> diff --git a/channels/misdn_config.c b/channels/misdn_config.c index 32f92c323..5915b6e9e 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "chan_misdn_config.h" diff --git a/channels/pjsip/dialplan_functions.c b/channels/pjsip/dialplan_functions.c index e291110e2..24daac8dc 100644 --- a/channels/pjsip/dialplan_functions.c +++ b/channels/pjsip/dialplan_functions.c @@ -369,7 +369,7 @@ #include <pjlib.h> #include <pjsip_ua.h> -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/module.h" diff --git a/channels/sip/config_parser.c b/channels/sip/config_parser.c index d48ff08dd..a3964b047 100644 --- a/channels/sip/config_parser.c +++ b/channels/sip/config_parser.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "include/sip.h" #include "include/config_parser.h" diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c index ee3424955..91a46784f 100644 --- a/channels/sip/dialplan_functions.c +++ b/channels/sip/dialplan_functions.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <math.h> diff --git a/channels/sip/reqresp_parser.c b/channels/sip/reqresp_parser.c index e5c1ff2bc..1541d7c25 100644 --- a/channels/sip/reqresp_parser.c +++ b/channels/sip/reqresp_parser.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "include/sip.h" #include "include/sip_utils.h" diff --git a/channels/sip/route.c b/channels/sip/route.c index 14c2b443f..53f8805e2 100644 --- a/channels/sip/route.c +++ b/channels/sip/route.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/utils.h" diff --git a/channels/sip/security_events.c b/channels/sip/security_events.c index 691c5bde1..e1b9c174a 100644 --- a/channels/sip/security_events.c +++ b/channels/sip/security_events.c @@ -30,7 +30,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "include/sip.h" #include "include/security_events.h" diff --git a/channels/vgrabbers.c b/channels/vgrabbers.c index 45dced4e1..ce8bb2b7d 100644 --- a/channels/vgrabbers.c +++ b/channels/vgrabbers.c @@ -49,7 +49,7 @@ ***/ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/ioctl.h> #include "asterisk/file.h" #include "asterisk/utils.h" /* ast_calloc */ |