summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-07-02 17:59:15 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-07-02 17:59:15 +0100
commit34b1c0dc5ea524d05ae16c44014ff9d0ad192be8 (patch)
treef19807243550e3d1ab77a235da15f55c16278b89
parentab5e0e4d8e749be10ed2b2dcea1a4ef92eda4388 (diff)
downloadrabbitmq-server-34b1c0dc5ea524d05ae16c44014ff9d0ad192be8.tar.gz
Correct spec; correct dependencies.
-rw-r--r--Makefile4
-rw-r--r--codegen.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0c97b2db..279da78b 100644
--- a/Makefile
+++ b/Makefile
@@ -100,10 +100,10 @@ $(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app
$(EBIN_DIR)/%.beam:
erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $<
-$(INCLUDE_DIR)/rabbit_framing.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES_0_9_1)
+$(INCLUDE_DIR)/rabbit_framing.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8)
$(PYTHON) codegen.py header $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8) $@
-$(INCLUDE_DIR)/rabbit_framing_spec.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES_0_9_1)
+$(INCLUDE_DIR)/rabbit_framing_spec.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8)
$(PYTHON) codegen.py spec $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8) $@
$(SOURCE_DIR)/rabbit_framing_amqp_0_9_1.erl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES_0_9_1)
diff --git a/codegen.py b/codegen.py
index 9eb6fca2..d8981a48 100644
--- a/codegen.py
+++ b/codegen.py
@@ -356,7 +356,7 @@ bitvalue(undefined) -> 0.
-spec(encode_properties/1 :: (amqp_method_record()) -> binary()).
-spec(lookup_amqp_exception/1 :: (amqp_exception()) -> {boolean(), amqp_exception_code(), binary()}).
-spec(amqp_exception/1 :: (amqp_exception_code()) -> amqp_exception()).
--spec(version/0 :: () -> {integer, integer, integer}).
+-spec(version/0 :: () -> {non_neg_integer(), non_neg_integer(), non_neg_integer()}).
-endif. % use_specs
"""
for m in methods: genLookupMethodName(m)