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 /res/ari | |
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 'res/ari')
-rw-r--r-- | res/ari/ari_model_validators.c | 2 | ||||
-rw-r--r-- | res/ari/ari_websockets.c | 2 | ||||
-rw-r--r-- | res/ari/cli.c | 2 | ||||
-rw-r--r-- | res/ari/config.c | 2 | ||||
-rw-r--r-- | res/ari/resource_applications.c | 2 | ||||
-rw-r--r-- | res/ari/resource_asterisk.c | 2 | ||||
-rw-r--r-- | res/ari/resource_bridges.c | 2 | ||||
-rw-r--r-- | res/ari/resource_channels.c | 2 | ||||
-rw-r--r-- | res/ari/resource_device_states.c | 2 | ||||
-rw-r--r-- | res/ari/resource_endpoints.c | 2 | ||||
-rw-r--r-- | res/ari/resource_events.c | 2 | ||||
-rw-r--r-- | res/ari/resource_mailboxes.c | 2 | ||||
-rw-r--r-- | res/ari/resource_playbacks.c | 2 | ||||
-rw-r--r-- | res/ari/resource_recordings.c | 2 | ||||
-rw-r--r-- | res/ari/resource_sounds.c | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c index 97435d025..db12f0000 100644 --- a/res/ari/ari_model_validators.c +++ b/res/ari/ari_model_validators.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/module.h" diff --git a/res/ari/ari_websockets.c b/res/ari/ari_websockets.c index f3b764bf1..ac5b5788d 100644 --- a/res/ari/ari_websockets.c +++ b/res/ari/ari_websockets.c @@ -18,7 +18,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/ari.h" #include "asterisk/astobj2.h" diff --git a/res/ari/cli.c b/res/ari/cli.c index 819407997..4468e44f1 100644 --- a/res/ari/cli.c +++ b/res/ari/cli.c @@ -24,7 +24,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/cli.h" diff --git a/res/ari/config.c b/res/ari/config.c index 667d91ac0..e2d5b1c0a 100644 --- a/res/ari/config.c +++ b/res/ari/config.c @@ -24,7 +24,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/config_options.h" #include "asterisk/http_websocket.h" diff --git a/res/ari/resource_applications.c b/res/ari/resource_applications.c index 85a631a02..456d9c08b 100644 --- a/res/ari/resource_applications.c +++ b/res/ari/resource_applications.c @@ -26,7 +26,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/stasis_app.h" #include "resource_applications.h" diff --git a/res/ari/resource_asterisk.c b/res/ari/resource_asterisk.c index 9871df4ff..a2198bb93 100644 --- a/res/ari/resource_asterisk.c +++ b/res/ari/resource_asterisk.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/ast_version.h" #include "asterisk/buildinfo.h" diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c index 5914a0711..70365ec6d 100644 --- a/res/ari/resource_bridges.c +++ b/res/ari/resource_bridges.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "resource_bridges.h" #include "asterisk/stasis.h" diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c index 594315831..e35fc8b05 100644 --- a/res/ari/resource_channels.c +++ b/res/ari/resource_channels.c @@ -30,7 +30,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/file.h" #include "asterisk/pbx.h" diff --git a/res/ari/resource_device_states.c b/res/ari/resource_device_states.c index 621910e1c..53a3683a9 100644 --- a/res/ari/resource_device_states.c +++ b/res/ari/resource_device_states.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "resource_device_states.h" #include "asterisk/stasis_app_device_state.h" diff --git a/res/ari/resource_endpoints.c b/res/ari/resource_endpoints.c index f794969f2..10b49e38c 100644 --- a/res/ari/resource_endpoints.c +++ b/res/ari/resource_endpoints.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "resource_endpoints.h" diff --git a/res/ari/resource_events.c b/res/ari/resource_events.c index d159741c2..eddcb662c 100644 --- a/res/ari/resource_events.c +++ b/res/ari/resource_events.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/stasis_app.h" diff --git a/res/ari/resource_mailboxes.c b/res/ari/resource_mailboxes.c index 0d9bac704..de41338ef 100644 --- a/res/ari/resource_mailboxes.c +++ b/res/ari/resource_mailboxes.c @@ -26,7 +26,7 @@ #include "asterisk.h" #include "asterisk/stasis_app_mailbox.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "resource_mailboxes.h" diff --git a/res/ari/resource_playbacks.c b/res/ari/resource_playbacks.c index 3ef6710ac..f610c6d1b 100644 --- a/res/ari/resource_playbacks.c +++ b/res/ari/resource_playbacks.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/stasis_app_playback.h" #include "resource_playbacks.h" diff --git a/res/ari/resource_recordings.c b/res/ari/resource_recordings.c index bd273aa62..e7e74ff9f 100644 --- a/res/ari/resource_recordings.c +++ b/res/ari/resource_recordings.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/stasis_app_recording.h" #include "resource_recordings.h" diff --git a/res/ari/resource_sounds.c b/res/ari/resource_sounds.c index 5a523d387..a1420eaf2 100644 --- a/res/ari/resource_sounds.c +++ b/res/ari/resource_sounds.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "resource_sounds.h" #include "asterisk/media_index.h" |