Merge branch 'anders/diameter/R15B02_release' into maint

* anders/diameter/R15B02_release:
  Update appup
  Add plt/dialyze targets to src/Makefile
  Add realclean target to src/Makefile
  Add any target to test/Makefile
  vsn -> 1.2

5 files changed, 56 insertions, 9 deletions

diff --git a/lib/diameter/src/.gitignore b/lib/diameter/src/.gitignore
index feeb378fd8..cc06720fd1 100644
--- a/lib/diameter/src/.gitignore
+++ b/lib/diameter/src/.gitignore
@@ -1,2 +1,3 @@
 
 /depend.mk
+/otp.plt
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index de2eca0279..99c343275b 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-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
@@ -181,6 +181,31 @@ clean:
 	rm -f $(TARGET_FILES) gen/*
 	rm -f depend.mk
 
+realclean: clean
+	rm -f ../ebin/*
+# Not $(EBIN) just to be a bit paranoid
+
+PLT = ./otp.plt
+
+plt:
+	dialyzer --build_plt \
+	         --apps erts stdlib kernel \
+	                xmerl ssl public_key crypto \
+	                compiler syntax_tools runtime_tools \
+	         --output_plt $(PLT) \
+	         --verbose
+
+dialyze: opt $(PLT)
+	dialyzer --plt $(PLT) \
+	         --verbose \
+	         -Wno_improper_lists \
+	         $(EBIN)/diameter_gen_base_rfc3588.$(EMULATOR) \
+	         $(patsubst %, $(EBIN)/%.$(EMULATOR), \
+                          $(notdir $(RT_MODULES) $(CT_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.
+
 # ----------------------------------------------------
 # Release targets
 # ----------------------------------------------------
@@ -245,10 +270,11 @@ depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
 
 -include depend.mk
 
-.PHONY: app clean depend dict info release_subdir
+.PHONY: app clean realclean depend dict info release_subdir
 .PHONY: debug opt release_docs_spec release_spec
 .PHONY: $(TARGET_DIRS:%/=%) $(TARGET_DIRS:%/=release_src_%)
 .PHONY: $(EXAMPLE_DIRS:%/=release_examples_%)
+.PHONY: plt dialyze
 
 # Keep intermediate files.
 .SECONDARY: $(DICT_ERLS) $(DICT_HRLS) gen/$(DICT_YRL:%=%.erl)
diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/base/diameter.appup.src
index 2ebdad598f..9b2a7d18ab 100644
--- a/lib/diameter/src/base/diameter.appup.src
+++ b/lib/diameter/src/base/diameter.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -22,13 +22,28 @@
  [
   {"0.9",  [{restart_application, diameter}]},
   {"0.10", [{restart_application, diameter}]},
-  {"1.0",  [{update, diameter_service},
-            {update, diameter_watchdog}]}
+  {"1.0",  [{restart_application, diameter}]},
+  {"1.1",  [%% new code
+            {add_module, diameter_transport},
+            %% modified code
+            {load, diameter_sctp},
+            {load, diameter_stats},
+            {load, diameter_service},
+            {load, diameter_config},
+            {load, diameter_codec},
+            {load, diameter_watchdog},
+            {load, diameter_peer},
+            {load, diameter_peer_fsm},
+            {load, diameter},
+            %% unmodified but including modified diameter.hrl
+            {load, diameter_callback},
+            {load, diameter_capx},
+            {load, diameter_types}]}
  ],
  [
   {"0.9",  [{restart_application, diameter}]},
   {"0.10", [{restart_application, diameter}]},
-  {"1.0",  [{update, diameter_watchdog},
-            {update, diameter_service}]}
+  {"1.0",  [{restart_application, diameter}]},
+  {"1.1",  [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index 1659330a91..616fcca0c0 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -67,8 +67,13 @@ ERL_COMPILE_FLAGS += +warn_export_vars \
 # Targets
 # ----------------------------------------------------
 
+# Require success ...
 all: opt
 
+# ... or not.
+any: opt
+	$(MAKE) -i $(SUITES)
+
 run: $(SUITES)
 
 debug opt: $(TARGET_FILES)
@@ -113,7 +118,7 @@ help:
 	@echo "        Echo some relevant variables."
 	@echo ========================================
 
-.PHONY: all run clean debug docs help info opt realclean
+.PHONY: all any run clean debug docs help info opt realclean
 
 # ----------------------------------------------------
 # Special Targets
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index f6dc786417..c69133a178 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.1
+DIAMETER_VSN = 1.2
 PRE_VSN      =
 APP_VSN      = "$(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)"