diff options
Diffstat (limited to 'lib/megaco/src/app')
-rw-r--r-- | lib/megaco/src/app/Makefile | 18 | ||||
-rw-r--r-- | lib/megaco/src/app/megaco.appup.src | 127 |
2 files changed, 76 insertions, 69 deletions
diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile index 01dfb9b860..42030c5b1c 100644 --- a/lib/megaco/src/app/Makefile +++ b/lib/megaco/src/app/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2007-2009. All Rights Reserved. +# Copyright Ericsson AB 2007-2012. 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 @@ -108,14 +108,14 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/app - $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/app" + $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" release_docs_spec: diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src index 66d144373c..22c7ae1372 100644 --- a/lib/megaco/src/app/megaco.appup.src +++ b/lib/megaco/src/app/megaco.appup.src @@ -18,7 +18,7 @@ %% %CopyrightEnd% %% -%% +%% %% 3.4.3 %% | %% v @@ -115,89 +115,96 @@ %% | %% v %% 3.11.3 -%% / \ -%% | \ -%% v \ -%% 3.12 \ -%% | \ -%% v \ -%% 3.13 \ -%% | \ -%% v | -%% 3.14 | -%% | | -%% v | -%% 3.14.1 | -%% | | -%% v | -%% 3.14.1.1 | -%% / \ | -%% / \ | -%% | | | -%% v | | -%% 3.15 | | -%% | | | -%% v | | -%% 3.15.1 | | -%% | | | -%% v | | -%% 3.15.1.1 | | -%% | | | -%% v v v -%% 3.15.2 <- 3.14.2 <- 3.11.4 +%% / \ +%% | \ +%% v \ +%% 3.12 \ +%% | \ +%% v \ +%% 3.13 \ +%% | \ +%% v \ +%% 3.14 \ +%% | \ +%% v \ +%% 3.14.1 \ +%% | \ +%% v \ +%% 3.14.1.1 \ +%% / \ \ +%% / \ \ +%% | \ \ +%% v \ \ +%% 3.15 \ \ +%% | \ | +%% v \ | +%% 3.15.1 \ | +%% | \ | +%% v \ | +%% 3.15.1.1 \ | +%% | \ \ | +%% v \ \ | +%% 3.16 \ | | +%% | \ | | +%% v \ | | +%% 3.16.0.1 \ | | +%% | \ | | +%% v \ | | +%% 3.16.0.2 | | | +%% | | | | +%% v v v v +%% 3.16.1 <- 3.15.2 <- 3.14.2 <- 3.11.4 %% %% + {"%VSN%", [ - {"3.15.1.1", + {"3.16.0.2", + [ + {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_16_1}, + soft_purge, soft_purge, []} + ] + }, + {"3.16.0.1", [ - {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_15_2}, + {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_16_1}, soft_purge, soft_purge, []} ] - }, - {"3.15.1", + }, + {"3.16", [ - {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_15_2}, + {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_16_1}, soft_purge, soft_purge, []} ] }, - {"3.15", + {"3.15.1.1", [ - {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]}, - {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_15_2}, - soft_purge, soft_purge, []}, - {add_module, megaco_config_misc} + {restart_application, megaco} ] } ], [ - {"3.15.1.1", + {"3.16.0.2", + [ + {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_16_1}, + soft_purge, soft_purge, []} + ] + }, + {"3.16.0.1", [ - {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_15_2}, + {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_16_1}, soft_purge, soft_purge, []} ] - }, - {"3.15.1", + }, + {"3.16", [ - {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_15_2}, + {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_16_1}, soft_purge, soft_purge, []} ] }, - {"3.15", + {"3.15.1.1", [ - {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, []}, - {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_15_2}, - soft_purge, soft_purge, []}, - {remove, {megaco_config_misc, soft_purge, brutal_purge}} + {restart_application, megaco} ] } ] |