summaryrefslogtreecommitdiff
path: root/generate_deps
diff options
context:
space:
mode:
authorMichael Bridgen <mikeb@lshift.net>2010-03-18 12:42:57 +0000
committerMichael Bridgen <mikeb@lshift.net>2010-03-18 12:42:57 +0000
commit02becf40efe0665aef62493554fd3c12a5e16bfa (patch)
tree6007d8832daa28778bcd9eb388468b04158064a4 /generate_deps
parent2bfce36f9575fb2465550b095e9e612b0ba159f6 (diff)
parent928aa9c03865357b82539bdcb1cd22f5f4ca3dc8 (diff)
downloadrabbitmq-server-git-02becf40efe0665aef62493554fd3c12a5e16bfa.tar.gz
Non-trivial merge of default into amqp_0_9_1. Queue exclusivity (bug
20578) and exchange hooks intersect in a few places. The main things to take care over are that the post-queue-deletion hooks gets called, and the exclusivity check is called. NB: exchange auto-delete machinery needs to be removed, which will simplify things in a few places.
Diffstat (limited to 'generate_deps')
-rw-r--r--generate_deps3
1 files changed, 2 insertions, 1 deletions
diff --git a/generate_deps b/generate_deps
index 916006d101..e16624d2d4 100644
--- a/generate_deps
+++ b/generate_deps
@@ -35,7 +35,8 @@ main([IncludeDir, ErlDir, EbinDir, TargetFile]) ->
detect_deps(IncludeDir, EbinDir, Modules, Headers, Path) ->
{ok, Forms} = epp:parse_file(Path, [IncludeDir], [{use_specs, true}]),
lists:foldl(
- fun ({attribute, _LineNumber, behaviour, Behaviour}, Deps) ->
+ fun ({attribute, _LineNumber, Attribute, Behaviour}, Deps)
+ when Attribute =:= behaviour orelse Attribute =:= behavior ->
case sets:is_element(Behaviour, Modules) of
true -> sets:add_element(
[EbinDir, "/", atom_to_list(Behaviour), ".beam"],