From 945d09cdea615404454b5951cb49472adab29eeb Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 14 Oct 2011 01:55:55 +0200
Subject: Whitespace fixes

---
 lib/diameter/bin/diameterc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/diameter/bin')

diff --git a/lib/diameter/bin/diameterc b/lib/diameter/bin/diameterc
index f5cf3ebc10..e232cdb120 100755
--- a/lib/diameter/bin/diameterc
+++ b/lib/diameter/bin/diameterc
@@ -120,7 +120,7 @@ arg(["-H" | Args], #argv{output = Output} = A) ->
 
 arg(["-d" | Args], #argv{options = Opts, output = Output} = A) ->
     arg(Args, A#argv{options = [debug | Opts],
-                            output = [spec | Output]});
+                     output = [spec | Output]});
 
 arg([[$- = M, C, H | T] | Args], A)  %% clustered options
   when C /= $i, C /= $o ->
-- 
cgit v1.2.3


From 1327c7c7d098a7593e5458bc5c06fd9459e73de3 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 14 Oct 2011 10:01:22 +0200
Subject: Allow @name/@prefix to be set with diameterc

---
 lib/diameter/bin/diameterc | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'lib/diameter/bin')

diff --git a/lib/diameter/bin/diameterc b/lib/diameter/bin/diameterc
index e232cdb120..c4dbd0060f 100755
--- a/lib/diameter/bin/diameterc
+++ b/lib/diameter/bin/diameterc
@@ -33,19 +33,23 @@
 
 usage() ->
     io:format(
-      "~w [options] file~n"
+      "~w [options] dict~n"
       "~n"
       "  Compile a diameter dictionary file (.dia) to Erlang source (.erl)~n"
       "  and/or header (.hrl) files.~n"
       "~n"
       "  options:~n"
-      "      -h      = print this message~n"
-      "      -v      = verbose output~n"
-      "      -o dir  = set the output directory (default .)~n"
-      "      -i dir  = set an include directory for inherited beams~n"
-      "      -E      = no .erl output~n"
-      "      -H      = no .hrl output~n"
-      "      -d      = write intermediate files (.spec and .forms)~n",
+      "~n"
+      "      --name name     = set @name~n"
+      "      --prefix prefix = set @prefix~n"
+      "~n"
+      "      -h        = print this message~n"
+      "      -v        = verbose output~n"
+      "      -o dir    = set the output directory (default .)~n"
+      "      -i dir    = set an include directory for inherited beams~n"
+      "      -E        = no .erl output~n"
+      "      -H        = no .hrl output~n"
+      "      -d        = write intermediate files (.spec and .forms)~n",
       [?MODULE]).
 
 main(Args) ->
@@ -112,6 +116,12 @@ arg(["-i", Dir | Args], #argv{options = Opts} = A) ->
     true = dir_exists(Dir),
     arg(Args, A#argv{options = Opts ++ [{include, Dir}]});
 
+arg(["--name", Name | Args], #argv{options = Opts} = A) ->
+    arg(Args, A#argv{options = [{name, Name} | Opts]});
+    
+arg(["--prefix", Name | Args], #argv{options = Opts} = A) ->
+    arg(Args, A#argv{options = [{prefix, Name} | Opts]});
+    
 arg(["-E" | Args], #argv{output = Output} = A) ->
     arg(Args, A#argv{output = lists:delete(erl, Output)});
 
@@ -123,7 +133,7 @@ arg(["-d" | Args], #argv{options = Opts, output = Output} = A) ->
                      output = [spec | Output]});
 
 arg([[$- = M, C, H | T] | Args], A)  %% clustered options
-  when C /= $i, C /= $o ->
+  when C /= $i, C /= $o, C /= $- ->
     arg([[M,C], [M,H|T] | Args], A);
 
 arg([File], A) ->
-- 
cgit v1.2.3


From 7352ec2c7d3f52a44b8bc18642dadfdc160209a5 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 14 Oct 2011 14:59:27 +0200
Subject: Allow @inherits to be set/cleared with diameterc

This is to enable dictionaries compiled with --name/--prefix
to be inherited using --inherits.
---
 lib/diameter/bin/diameterc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib/diameter/bin')

diff --git a/lib/diameter/bin/diameterc b/lib/diameter/bin/diameterc
index c4dbd0060f..8e0eda10dd 100755
--- a/lib/diameter/bin/diameterc
+++ b/lib/diameter/bin/diameterc
@@ -40,8 +40,9 @@ usage() ->
       "~n"
       "  options:~n"
       "~n"
-      "      --name name     = set @name~n"
-      "      --prefix prefix = set @prefix~n"
+      "      --name name       = set @name~n"
+      "      --prefix prefix   = set @prefix~n"
+      "      --inherits dict|- = set/clear @inherits~n"
       "~n"
       "      -h        = print this message~n"
       "      -v        = verbose output~n"
@@ -122,6 +123,9 @@ arg(["--name", Name | Args], #argv{options = Opts} = A) ->
 arg(["--prefix", Name | Args], #argv{options = Opts} = A) ->
     arg(Args, A#argv{options = [{prefix, Name} | Opts]});
     
+arg(["--inherits", Dict | Args], #argv{options = Opts} = A) ->
+    arg(Args, A#argv{options = Opts ++ [{inherits, Dict}]});
+
 arg(["-E" | Args], #argv{output = Output} = A) ->
     arg(Args, A#argv{output = lists:delete(erl, Output)});
 
-- 
cgit v1.2.3


From dcfb32c0a47a8e87cb475d7304bc5d7b407e5f0e Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 14 Oct 2011 15:23:34 +0200
Subject: Don't require -i directory to exist

---
 lib/diameter/bin/diameterc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/diameter/bin')

diff --git a/lib/diameter/bin/diameterc b/lib/diameter/bin/diameterc
index 8e0eda10dd..c0e83ea1a4 100755
--- a/lib/diameter/bin/diameterc
+++ b/lib/diameter/bin/diameterc
@@ -114,7 +114,6 @@ arg(["-o", Dir | Args], #argv{options = Opts} = A) ->
     arg(Args, A#argv{options = [{outdir, Dir} | Opts]});
 
 arg(["-i", Dir | Args], #argv{options = Opts} = A) ->
-    true = dir_exists(Dir),
     arg(Args, A#argv{options = Opts ++ [{include, Dir}]});
 
 arg(["--name", Name | Args], #argv{options = Opts} = A) ->
-- 
cgit v1.2.3