Merge branch 'bmk/inets/prepare-for-release'

3 files changed, 22 insertions, 108 deletions

diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index ffd0ed622f..c63dcafa6c 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -1,7 +1,7 @@
 %% This is an -*- erlang -*- file.
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. 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
@@ -18,109 +18,8 @@
 
 {"%VSN%",
  [
-  {"5.9.1", 
-   [
-    {load_module, httpd_request_handler, soft_purge, soft_purge, []}
-   ]
-  },
-  {"5.9", 
-   [
-    {load_module, httpd_request_handler, soft_purge, soft_purge, []},
-    {load_module, tftp,          soft_purge, soft_purge, [inets_service]}, 
-    {load_module, inets_service, soft_purge, soft_purge, []}, 
-    {load_module, httpc,         soft_purge, soft_purge, [httpc_manager]}, 
-    {update,      httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
-    {update,      httpc_manager, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.8.1", 
-   [
-    {load_module, httpd_request_handler, soft_purge, soft_purge, []},
-    {load_module, tftp,          soft_purge, soft_purge, [inets_service]}, 
-    {load_module, inets_service, soft_purge, soft_purge, []}, 
-
-    {load_module, http_uri,      soft_purge, soft_purge, []}, 
-    {load_module, httpc_response, soft_purge, soft_purge, [http_uri]}, 
-
-    {load_module, httpc,         soft_purge, soft_purge, 
-     [http_uri, httpc_manager]}, 
-
-    {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, 
-    {update,      inets_sup,     soft, soft_purge, soft_purge, []},
-
-    {load_module, httpd_conf, soft_purge, soft_purge, []}, 
-    {load_module, httpd_response, soft_purge, soft_purge, []}, 
-    {load_module, httpd_script_env, soft_purge, soft_purge, []}, 
-
-    {load_module, inets,         soft_purge, soft_purge, [inets_trace]},
-    {update,      httpc_manager, soft, soft_purge, soft_purge, [http_uri]},
-    {update,      httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
-    {update,      httpd_sup,     soft, soft_purge, soft_purge, []},
-    {add_module,  inets_trace}
-   ]
-  }, 
-  {"5.8", 
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.7.2", 
-   [
-    {restart_application, inets}
-   ]
-  }
- ],
+  {<<"5\\.*">>, [{restart_application, inets}]}
+ ], 
  [
-  {"5.9.1", 
-   [
-    {load_module, httpd_request_handler, soft_purge, soft_purge, []}
-   ]
-  },
-  {"5.9", 
-   [
-    {load_module, httpd_request_handler, soft_purge, soft_purge, []},
-    {load_module, tftp,          soft_purge, soft_purge, [inets_service]}, 
-    {load_module, inets_service, soft_purge, soft_purge, []}, 
-    {load_module, httpc,         soft_purge, soft_purge, [httpc_manager]}, 
-    {update,      httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
-    {update,      httpc_manager, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.8.1",
-   [
-    {load_module, httpd_request_handler, soft_purge, soft_purge, []},
-    {load_module, tftp,          soft_purge, soft_purge, [inets_service]}, 
-    {load_module, inets_service, soft_purge, soft_purge, []}, 
-
-    {load_module, http_uri,      soft_purge, soft_purge, []}, 
-    {load_module, httpc_response, soft_purge, soft_purge, [http_uri]}, 
-
-    {load_module, httpc,         soft_purge, soft_purge, 
-     [http_uri, httpc_manager]}, 
-
-    {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, 
-    {update,      inets_sup,     soft, soft_purge, soft_purge, []},
-
-    {load_module, httpd_conf, soft_purge, soft_purge, []}, 
-    {load_module, httpd_response, soft_purge, soft_purge, []}, 
-    {load_module, httpd_script_env, soft_purge, soft_purge, []}, 
-
-    {load_module, inets,         soft_purge, soft_purge, []},
-    {update,      httpc_manager, soft, soft_purge, soft_purge, [http_uri]},
-    {update,      httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
-    {update,      httpd_sup,     soft, soft_purge, soft_purge, []},
-    {remove,      {inets_trace, soft_purge, brutal_purge}}
-   ]
-  }, 
-  {"5.8",
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.7.2", 
-   [
-    {restart_application, inets}
-   ]
-  } 
- ]
-}.
+  {<<"5\\.*">>, [{restart_application, inets}]}
+]}.
diff --git a/lib/inets/test/inets_appup_test.erl b/lib/inets/test/inets_appup_test.erl
index 7ed237243e..648e373312 100644
--- a/lib/inets/test/inets_appup_test.erl
+++ b/lib/inets/test/inets_appup_test.erl
@@ -257,6 +257,21 @@ check_instruction(_, Instr, _AllInstr, _Modules) ->
 
 check_version(V) when is_list(V) ->
     ok;
+check_version(REBin) when is_binary(REBin) ->
+    try
+	begin
+	    RE = binary_to_list(REBin),
+	    case re:compile(RE) of
+		{ok, _} ->
+		    ok;
+		{error, _} ->
+		    error({bad_version, REBin})
+	    end
+	end
+    catch
+	_T:_E ->
+	    error({bad_version, REBin})
+    end;
 check_version(V) ->
     error({bad_version, V}).
 
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 0c7cb5e7c2..394dccab48 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2012. All Rights Reserved.
+# Copyright Ericsson AB 2001-2013. 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
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 5.9.2
+INETS_VSN   = 5.9.3
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"