diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2009-10-12 13:53:22 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2009-10-12 13:53:22 +0100 |
| commit | f38f75be3b7027c82ebb834e1847f52b3b1ff33e (patch) | |
| tree | a233560afaa494f32f3df70a3d9696483d45dd52 | |
| parent | 5612bffc489e3246771e2c170899bd4f4d0f4f30 (diff) | |
| parent | 71eaeeadc8692e8531f7d85031972f9a5d5880e4 (diff) | |
| download | rabbitmq-server-f38f75be3b7027c82ebb834e1847f52b3b1ff33e.tar.gz | |
merge default into bug21763
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | demo_extension.json | 18 |
2 files changed, 24 insertions, 4 deletions
@@ -39,6 +39,8 @@ SIBLING_CODEGEN_DIR=../rabbitmq-codegen/ AMQP_CODEGEN_DIR=$(shell [ -d $(SIBLING_CODEGEN_DIR) ] && echo $(SIBLING_CODEGEN_DIR) || echo codegen) AMQP_SPEC_JSON_PATH=$(AMQP_CODEGEN_DIR)/amqp-0.8.json +AMQP_SPEC_EXTENSIONS=demo_extension.json + ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e ERL_EBIN=erl -noinput -pa $(EBIN_DIR) @@ -55,11 +57,11 @@ $(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(INCLUDE_DIR)/rabbit_framing.hrl $(INCL erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $< # ERLC_EMULATOR="erl -smp" erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $< -$(INCLUDE_DIR)/rabbit_framing.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_PATH) - $(PYTHON) codegen.py header $(AMQP_SPEC_JSON_PATH) $@ +$(INCLUDE_DIR)/rabbit_framing.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_PATH) $(AMQP_SPEC_EXTENSIONS) + $(PYTHON) codegen.py header $(AMQP_SPEC_JSON_PATH) $(AMQP_SPEC_EXTENSIONS) $@ -$(SOURCE_DIR)/rabbit_framing.erl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_PATH) - $(PYTHON) codegen.py body $(AMQP_SPEC_JSON_PATH) $@ +$(SOURCE_DIR)/rabbit_framing.erl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_PATH) $(AMQP_SPEC_EXTENSIONS) + $(PYTHON) codegen.py body $(AMQP_SPEC_JSON_PATH) $(AMQP_SPEC_EXTENSIONS) $@ dialyze: $(BEAM_TARGETS) $(BASIC_PLT) $(ERL_EBIN) -eval \ diff --git a/demo_extension.json b/demo_extension.json new file mode 100644 index 00000000..4a65dbe6 --- /dev/null +++ b/demo_extension.json @@ -0,0 +1,18 @@ +{ + "extension": { + "name": "demo", + "version": "1.0", + "copyright": "Copyright (C) 2009 LShift Ltd." + }, + "domains": [ + ["foo-domain", "shortstr"] + ], + "constants": [ + {"name": "FOO-CONSTANT", "value": 121212} + ], + "classes": [ + {"name": "demo", + "id": 555, + "methods": [{"name": "one", "id": 1, "arguments": []}]} + ] +}
\ No newline at end of file |