diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2009-10-12 13:57:23 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2009-10-12 13:57:23 +0100 |
| commit | e6f6c3de0317fcc7d90b4e95e22fc7eba5bd00b6 (patch) | |
| tree | 307b418398f3971bb0a1ae84c80f19471258b7a3 | |
| parent | f38f75be3b7027c82ebb834e1847f52b3b1ff33e (diff) | |
| download | rabbitmq-server-bug21763.tar.gz | |
Remove demo extension, and clean up the makefile.bug21763
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | demo_extension.json | 18 |
2 files changed, 5 insertions, 25 deletions
@@ -37,9 +37,7 @@ TARGET_SRC_DIR=dist/$(TARBALL_NAME) 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 +AMQP_SPEC_JSON_FILES=$(AMQP_CODEGEN_DIR)/amqp-0.8.json ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e @@ -57,11 +55,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) $(AMQP_SPEC_EXTENSIONS) - $(PYTHON) codegen.py header $(AMQP_SPEC_JSON_PATH) $(AMQP_SPEC_EXTENSIONS) $@ +$(INCLUDE_DIR)/rabbit_framing.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES) + $(PYTHON) codegen.py header $(AMQP_SPEC_JSON_FILES) $@ -$(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) $@ +$(SOURCE_DIR)/rabbit_framing.erl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES) + $(PYTHON) codegen.py body $(AMQP_SPEC_JSON_FILES) $@ dialyze: $(BEAM_TARGETS) $(BASIC_PLT) $(ERL_EBIN) -eval \ diff --git a/demo_extension.json b/demo_extension.json deleted file mode 100644 index 4a65dbe6..00000000 --- a/demo_extension.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 |