Merge branch 'anders/diameter/17.0_release/OTP-11605'

* anders/diameter/17.0_release/OTP-11605:
  Move info modules into own subdirectory
  Include compiler and info modules in app file
  Remove unused diameter_dbg:log/4
  Remove case expecting a pre-R16B return value from os:type/1
  Fix doc typo: required -> requires
  Remove release note unrelated to functionality

7 files changed, 48 insertions, 37 deletions

diff --git a/lib/diameter/doc/src/diameter_make.xml b/lib/diameter/doc/src/diameter_make.xml
index 13ec5bbfc1..0c7e6b794d 100644
--- a/lib/diameter/doc/src/diameter_make.xml
+++ b/lib/diameter/doc/src/diameter_make.xml
@@ -52,7 +52,7 @@ under the License.
 <p>
 The function &codec; is used to compile a diameter
 &dictionary; into Erlang source.
-The resulting source implements the interface diameter required
+The resulting source implements the interface diameter requires
 to encode and decode the dictionary's messages and AVPs.</p>
 
 <p>
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index cd14195e78..e2390df37c 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -11,7 +11,7 @@
 <header>
 <copyright>
 <year>2011</year>
-<year>2013</year>
+<year>2014</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -73,12 +73,6 @@ first.</p>
           <p>
 	    Own Id: OTP-11361</p>
         </item>
-        <item>
-          <p>
-	    Fix silent make rules (Thanks to Anthony Ramine)</p>
-          <p>
-	    Own Id: OTP-11514</p>
-        </item>
       </list>
     </section>
 
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index 578bbaee2e..127406ae23 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2013. All Rights Reserved.
+# Copyright Ericsson AB 2010-2014. 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
@@ -41,7 +41,7 @@ INCDIR = ../include
 ABS_EBIN := $(shell cd $(EBIN) && pwd)
 
 # Where make should look for dependencies.
-VPATH = .:base:compiler:transport:gen
+VPATH = .:base:compiler:transport:gen:info
 
 # ----------------------------------------------------
 # Target specs
@@ -55,13 +55,13 @@ DICT_ERLS    = $(DICT_MODULES:%=%.erl)
 DICT_HRLS    = $(DICT_MODULES:%=%.hrl)
 
 # Modules to build before compiling dictionaries.
-COMPILER_MODULES = $(notdir $(filter compiler/%, $(CT_MODULES))) \
-                   $(DICT_YRL)
+COMPILER_MODULES = $(notdir $(CT_MODULES)) $(DICT_YRL)
 
 # All handwritten modules from which a depend.mk is generated.
 MODULES = \
 	$(RT_MODULES) \
-	$(CT_MODULES)
+	$(CT_MODULES) \
+	$(INFO_MODULES)
 
 # Modules whose names are inserted into the app file.
 APP_MODULES = \
@@ -72,6 +72,7 @@ APP_MODULES = \
 TARGET_MODULES = \
 	$(APP_MODULES) \
 	$(CT_MODULES) \
+	$(INFO_MODULES) \
 	$(DICT_YRL:%=gen/%)
 
 # What to build for the 'opt' target.
@@ -150,9 +151,13 @@ gen/$(DICT_YRL).erl: compiler/$(DICT_YRL).yrl
 $(APP_TARGET): $(APP_SRC) ../vsn.mk modules.mk
 	$(gen_verbose) \
 	M=`echo $(notdir $(APP_MODULES)) | tr ' ' ,`; \
+	C=`echo $(COMPILER_MODULES) | tr ' ' ,`; \
+	I=`echo $(notdir $(INFO_MODULES)) | tr ' ' ,`; \
 	R=`echo $(REGISTERED) | tr ' ' ,`; \
 	sed -e 's;%VSN%;$(VSN);' \
 	    -e "s;%MODULES%;$$M;" \
+	    -e "s;%COMPILER%;$$C;" \
+	    -e "s;%INFO%;$$I;" \
 	    -e "s;%REGISTERED%;$$R;" \
 	  $< > $@
 
@@ -177,6 +182,8 @@ info:
 	@echo
 	@$(call list,CT_MODULES)
 	@echo
+	@$(call list,INFO_MODULES)
+	@echo
 	@$(call list,TARGET_MODULES)
 	@echo
 	@$(call list,TARGET_DIRS)
@@ -216,7 +223,7 @@ dialyze: opt $(PLT)
 	         -Wno_improper_lists \
 	         $(EBIN)/diameter_gen_base_rfc3588.$(EMULATOR) \
 	         $(patsubst %, $(EBIN)/%.$(EMULATOR), \
-                          $(notdir $(RT_MODULES) $(CT_MODULES)))
+	                $(notdir $(RT_MODULES) $(CT_MODULES) $(INFO_MODULES)))
 # Omit all but the common dictionary module since these
 # (diameter_gen_relay in particular) generate warning depending on how
 # much of the included diameter_gen.hrl they use.
diff --git a/lib/diameter/src/diameter.app.src b/lib/diameter/src/diameter.app.src
index 509de9e595..d2290aeccc 100644
--- a/lib/diameter/src/diameter.app.src
+++ b/lib/diameter/src/diameter.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. 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
@@ -20,9 +20,18 @@
 {application, diameter,
  [{description, "Diameter protocol"},
   {vsn, "%VSN%"},
-  {modules, [%MODULES%]},
+  {modules, [
+      %MODULES%
+      %,%COMPILER%
+      %,%INFO%
+      ]},
   {registered, [%REGISTERED%]},
-  {applications, [stdlib, kernel]},
+  {applications, [
+      stdlib, kernel
+      %, syntax_tools
+      %, runtime_tools
+      %, ssl
+      ]},
   {env, []},
   {mod, {diameter_app, []}},
   {runtime_dependencies, ["syntax_tools-1.6.14","stdlib-2.0","ssl-5.3.4",
diff --git a/lib/diameter/src/base/diameter_dbg.erl b/lib/diameter/src/info/diameter_dbg.erl
index 5b0ac3a3b6..1237007a75 100644
--- a/lib/diameter/src/base/diameter_dbg.erl
+++ b/lib/diameter/src/info/diameter_dbg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. 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
@@ -17,6 +17,10 @@
 %% %CopyrightEnd%
 %%
 
+%%
+%% Information and debug functions.
+%%
+
 -module(diameter_dbg).
 
 -export([table/1,
@@ -29,8 +33,7 @@
          compiled/0,
          procs/0,
          latest/0,
-         nl/0,
-         log/4]).
+         nl/0]).
 
 -export([diameter_config/0,
          diameter_peer/0,
@@ -52,9 +55,8 @@
          tp/1]).
 
 -include_lib("diameter/include/diameter.hrl").
--include("diameter_internal.hrl").
-
 
+-define(APPLICATION, diameter).
 -define(INFO,  diameter_info).
 -define(SEP(), ?INFO:sep()).
 
@@ -68,9 +70,6 @@
 
 -define(VALUES(Rec), tl(tuple_to_list(Rec))).
 
-log(_Slogan, _Mod, _Line, _Details) ->
-    ok.
-
 %%% ----------------------------------------------------------
 %%% # help()
 %%% ----------------------------------------------------------
diff --git a/lib/diameter/src/base/diameter_info.erl b/lib/diameter/src/info/diameter_info.erl
index 39d32d07cd..10972f3231 100644
--- a/lib/diameter/src/base/diameter_info.erl
+++ b/lib/diameter/src/info/diameter_info.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. 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
@@ -17,6 +17,11 @@
 %% %CopyrightEnd%
 %%
 
+%%
+%% Generic functions for formatting table listings and more. Used by
+%% diameter_dbg.
+%%
+
 -module(diameter_info).
 
 -export([usage/1,
@@ -573,12 +578,7 @@ sys_info() ->
     {A,V}.
 
 os_info() ->
-    {os:version(), case os:type() of
-                       {_Fam, _Name} = T ->
-                           T;
-                       Fam ->
-                           {Fam, ""}
-                   end}.
+    {os:version(), os:type()}.
 
 chomp(S) ->
     string:strip(S, right, $\n).
diff --git a/lib/diameter/src/modules.mk b/lib/diameter/src/modules.mk
index f8d3cf1d6f..a2a7a51892 100644
--- a/lib/diameter/src/modules.mk
+++ b/lib/diameter/src/modules.mk
@@ -1,8 +1,7 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2013. All Rights Reserved.
+# Copyright Ericsson AB 2010-2014. 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
@@ -64,16 +63,19 @@ RT_MODULES = \
 	transport/diameter_transport \
 	transport/diameter_transport_sup
 
-# Handwritten (compile time) modules not included in the app file.
+# Handwritten compiler modules not included in the app file.
 CT_MODULES = \
-	base/diameter_dbg \
-	base/diameter_info \
 	compiler/diameter_codegen \
 	compiler/diameter_exprecs \
 	compiler/diameter_dict_scanner \
 	compiler/diameter_dict_util \
 	compiler/diameter_make
 
+# Info/debug modules, also not included in the app file.
+INFO_MODULES = \
+	info/diameter_dbg \
+	info/diameter_info
+
 # Released hrl files in ../include intended for public consumption.
 EXTERNAL_HRLS = \
 	diameter.hrl \