diff options
| author | Loïc Hoguin <[email protected]> | 2015-06-18 12:10:36 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-06-18 12:10:36 +0200 |
| commit | 7c2fa2b68e2deb7c62d0a0dd023d74a1f1b22e84 (patch) | |
| tree | 2a0cf48e3d35fe0176ee3d26589fc9806f5fd144 | |
| parent | 4d1e0ead6cbba270b41d7612eecea443ca8c997d (diff) | |
| download | erlang.mk-7c2fa2b68e2deb7c62d0a0dd023d74a1f1b22e84.tar.gz erlang.mk-7c2fa2b68e2deb7c62d0a0dd023d74a1f1b22e84.tar.bz2 erlang.mk-7c2fa2b68e2deb7c62d0a0dd023d74a1f1b22e84.zip | |
Add RABBITMQ_SERVER_PATCH for rabbitmq-server support
| -rw-r--r-- | core/deps.mk | 18 | ||||
| -rw-r--r-- | test/Makefile | 5 |
2 files changed, 19 insertions, 4 deletions
diff --git a/core/deps.mk b/core/deps.mk index c17189e..ae786da 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -529,10 +529,20 @@ endif fi ifeq ($(filter $(1),$(NO_AUTOPATCH)),) @if [ "$(RABBITMQ_CLIENT_PATCH)" ]; then \ - echo " PATCH Downloading extra RabbitMQ repositories..."; \ - git clone https://github.com/rabbitmq/rabbitmq-codegen.git $(DEPS_DIR)/rabbitmq-codegen; \ - git clone https://github.com/rabbitmq/rabbitmq-server.git $(DEPS_DIR)/rabbit; \ - ln -s $(DEPS_DIR)/rabbit $(DEPS_DIR)/rabbitmq-server; \ + if [ ! -d $(DEPS_DIR)/rabbitmq-codegen ]; then \ + echo " PATCH Downloading rabbitmq-codegen"; \ + git clone https://github.com/rabbitmq/rabbitmq-codegen.git $(DEPS_DIR)/rabbitmq-codegen; \ + fi; \ + if [ ! -d $(DEPS_DIR)/rabbit ]; then \ + echo " PATCH Downloading rabbitmq-server"; \ + git clone https://github.com/rabbitmq/rabbitmq-server.git $(DEPS_DIR)/rabbit; \ + ln -s $(DEPS_DIR)/rabbit $(DEPS_DIR)/rabbitmq-server; \ + fi \ + elif [ "$(RABBITMQ_SERVER_PATCH)" ]; then \ + if [ ! -d $(DEPS_DIR)/rabbitmq-codegen ]; then \ + echo " PATCH Downloading rabbitmq-codegen"; \ + git clone https://github.com/rabbitmq/rabbitmq-codegen.git $(DEPS_DIR)/rabbitmq-codegen; \ + fi \ else \ $(call dep_autopatch,$(1)) \ fi diff --git a/test/Makefile b/test/Makefile index 0d85e72..3039a70 100644 --- a/test/Makefile +++ b/test/Makefile @@ -239,6 +239,11 @@ pkg-$(1): pkg-$(1)-clean pkg-$(1)-app1 source temp-python/bin/activate; \ $(MAKE) -C app1 RABBITMQ_CLIENT_PATCH=1; \ deactivate; \ + elif [ "$(1)" = "rabbit" ]; then \ + virtualenv -p /usr/bin/python2.7 --distribute temp-python; \ + source temp-python/bin/activate; \ + $(MAKE) -C app1 RABBITMQ_SERVER_PATCH=1; \ + deactivate; \ else \ $(MAKE) -C app1; \ fi; \ |