diff options
Diffstat (limited to 'lib/megaco')
| -rw-r--r-- | lib/megaco/doc/src/Makefile | 13 | ||||
| -rw-r--r-- | lib/megaco/doc/src/notes.xml | 31 | ||||
| -rw-r--r-- | lib/megaco/src/app/megaco.appup.src | 21 | ||||
| -rw-r--r-- | lib/megaco/vsn.mk | 2 |
4 files changed, 44 insertions, 23 deletions
diff --git a/lib/megaco/doc/src/Makefile b/lib/megaco/doc/src/Makefile index f782afc3f6..137f0315d8 100644 --- a/lib/megaco/doc/src/Makefile +++ b/lib/megaco/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2000-2010. All Rights Reserved. +# Copyright Ericsson AB 2000-2011. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -123,10 +123,13 @@ imgs: $(IMG_FILES:%=$(HTMLDIR)/%) man: $(MAN3_FILES) $(INDEX_TARGET): $(INDEX_SRC) $(APP_FILE) - sed -e 's/%VSN%/$(VSN)/; \ - s/%ERLANG_SITE%/www\.erlang\.se\//; \ - s/%UP_ONE_LEVEL%/..\/..\/..\/doc\/index.html/; \ - s/%OFF_PRINT%/pdf\/megaco-$(VSN).pdf/' $< > $@ + sed -e 's/%VSN%/$(VSN)/' $< > $@ + +$(INDEX_TARGET): $(INDEX_SRC) $(APP_FILE) + sed -e 's/%VSN%/$(VSN)/' \ + -e 's/%ERLANG_SITE%/www\.erlang\.se\//' \ + -e 's/%UP_ONE_LEVEL%/..\/..\/..\/doc\/index.html/' \ + -e 's/%OFF_PRINT%/pdf\/megaco-$(VSN).pdf/' $< > $@ debug opt: diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml index baf8c6a201..5eebf7729d 100644 --- a/lib/megaco/doc/src/notes.xml +++ b/lib/megaco/doc/src/notes.xml @@ -36,9 +36,9 @@ section is the version number of Megaco.</p> - <section><title>Megaco 3.15.1.2</title> + <section><title>Megaco 3.16</title> - <p>Version 3.15.1.2 supports code replacement in runtime from/to + <p>Version 3.16 supports code replacement in runtime from/to version 3.15.1.1, 3.15.1 and 3.15.</p> <section> @@ -67,6 +67,13 @@ <p>Own Id: OTP-9679</p> </item> + <item> + <p>The flex driver has been updated (along with all other drivers) + to support the new driver format. This change may effect the + ability to build and/or use the driver without reentrant support. </p> + <p>Own Id: OTP-NNNN</p> + </item> + </list> </section> @@ -88,7 +95,25 @@ </section> - </section> <!-- 3.15.1.2 --> + <section> + <title>Incompatibilities</title> +<!-- + <p>-</p> +--> + + <list type="bulleted"> + <item> + <p>Due to the change in the flex driver API, + we may no longer be able to build and/or use + the flex driver without reentrant support. </p> + <p>Own Id: OTP-NNNN</p> + </item> + + </list> + + </section> + + </section> <!-- 3.16 --> <section><title>Megaco 3.15.1.1</title> diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src index 7f6fe0c733..3c9740818a 100644 --- a/lib/megaco/src/app/megaco.appup.src +++ b/lib/megaco/src/app/megaco.appup.src @@ -141,48 +141,41 @@ %% 3.15.1.1 %% | %% v -%% 3.15.1.2 +%% 3.16 %% %% {"%VSN%", [ {"3.15.1.1", [ + {restart_application, megaco} ] }, {"3.15.1", [ + {restart_application, megaco} ] }, {"3.15", [ - {load_module, megaco_flex_scanner, soft_purge, soft_purge, []}, - {load_module, megaco_sdp, soft_purge, soft_purge, []}, - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {load_module, megaco_timer, soft_purge, soft_purge, [megaco_config_misc]}, - {update, megaco_config, soft, soft_purge, soft_purge, - [megaco_timer, megaco_config_misc]}, - {add_module, megaco_config_misc} + {restart_application, megaco} ] } ], [ {"3.15.1.1", [ + {restart_application, megaco} ] }, {"3.15.1", [ + {restart_application, megaco} ] }, {"3.15", [ - {load_module, megaco_flex_scanner, soft_purge, soft_purge, []}, - {load_module, megaco_sdp, soft_purge, soft_purge, []}, - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {load_module, megaco_timer, soft_purge, soft_purge, [megaco_config]}, - {update, megaco_config, soft, soft_purge, soft_purge, []}, - {remove, {megaco_config_misc, soft_purge, brutal_purge}} + {restart_application, megaco} ] } ] diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk index 35acffcb64..bb6f5f554a 100644 --- a/lib/megaco/vsn.mk +++ b/lib/megaco/vsn.mk @@ -18,6 +18,6 @@ # %CopyrightEnd% APPLICATION = megaco -MEGACO_VSN = 3.15.1.2 +MEGACO_VSN = 3.16 PRE_VSN = APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)" |