[compiler] Improved version info printout.

OTP-9618

Merge branch 'bmk/snmp/compiler/misc/OTP-9618' into bmk/snmp/r15_integration

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.appup.src
	lib/snmp/vsn.mk

3 files changed, 27 insertions, 2 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index b4b5367169..dcb3e860d1 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,6 +22,10 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.21.2", 
+   [
+   ]
+  }, 
   {"4.21.1", 
    [
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}
@@ -124,6 +128,10 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.21.2", 
+   [
+   ]
+  }, 
   {"4.21.1", 
    [
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}
diff --git a/lib/snmp/src/compile/depend.mk b/lib/snmp/src/compile/depend.mk
index f7084f8bcd..3ee8dc4bec 100644
--- a/lib/snmp/src/compile/depend.mk
+++ b/lib/snmp/src/compile/depend.mk
@@ -44,6 +44,6 @@ $(EBIN)/snmpc_mib_gram.$(EMULATOR): \
 	../../include/snmp_types.hrl \
 	snmpc_mib_gram.erl
 
-$(BIN)/snmpc: snmpc.src
+$(BIN)/snmpc: snmpc.src ../../vsn.mk
 	$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
 	chmod 755 $@
diff --git a/lib/snmp/src/compile/snmpc.src b/lib/snmp/src/compile/snmpc.src
index f993335b89..8760ce14b5 100644
--- a/lib/snmp/src/compile/snmpc.src
+++ b/lib/snmp/src/compile/snmpc.src
@@ -221,7 +221,10 @@ process_args([], #state{verbosity = Verbosity0, file = MIB} = State) ->
 process_args(["--help"|_Args], _State) ->
     ok;
 process_args(["--version"|_Args], #state{version = Version, mfv = MFV} = _State) ->
-    {ok, lists:flatten(io_lib:format("snmpc ~s (~s)", [Version, MFV]))};
+    OtpVersion = otp_release(), 
+    {ok, lists:flatten(
+	   io_lib:format("snmpc ~s [Mib format version ~s] (OTP ~s)", 
+			 [Version, MFV, OtpVersion]))};
 process_args(["--verbosity", Verbosity0|Args], #state{verbosity = V} = State) 
   when (V =:= undefined) ->
     Verbosity = list_to_atom(Verbosity0),
@@ -398,3 +401,17 @@ usage() ->
 e(Reason) ->
     throw({error, Reason}).
 
+
+otp_release() ->
+    system_info(otp_release, string).
+
+system_info(Tag, Type) ->
+    case (catch erlang:system_info(Tag)) of
+        {'EXIT', _} ->
+            "-";
+        Info when is_list(Info) andalso (Type =:= string) ->
+            Info;
+        Info ->
+            lists:flatten(io_lib:format("~w", [Info]))
+    end.
+