diff options
| -rw-r--r-- | core/deps.mk | 17 | ||||
| -rw-r--r-- | doc/src/guide/deps.asciidoc | 6 | ||||
| -rw-r--r-- | index/amqp_client.mk | 7 | ||||
| -rw-r--r-- | index/rabbit.mk | 7 | ||||
| -rw-r--r-- | test/Makefile | 2 |
5 files changed, 4 insertions, 35 deletions
diff --git a/core/deps.mk b/core/deps.mk index 7fc26a0..10621ea 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -766,22 +766,7 @@ endif .PHONY: autopatch-$(call dep_name,$1) autopatch-$(call dep_name,$1):: - $(verbose) if [ "$(1)" = "amqp_client" -a "$(RABBITMQ_CLIENT_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; \ - if [ ! -d $(DEPS_DIR)/rabbitmq-server ]; then \ - echo " PATCH Downloading rabbitmq-server"; \ - git clone https://github.com/rabbitmq/rabbitmq-server.git $(DEPS_DIR)/rabbitmq-server; \ - fi; \ - ln -s $(DEPS_DIR)/amqp_client/deps/rabbit_common-0.0.0 $(DEPS_DIR)/rabbit_common; \ - elif [ "$(1)" = "rabbit" -a "$(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 \ - elif [ "$1" = "elixir" -a "$(ELIXIR_PATCH)" ]; then \ + if [ "$1" = "elixir" -a "$(ELIXIR_PATCH)" ]; then \ ln -s lib/elixir/ebin $(DEPS_DIR)/elixir/; \ else \ $$(call dep_autopatch,$(call dep_name,$1)) \ diff --git a/doc/src/guide/deps.asciidoc b/doc/src/guide/deps.asciidoc index 081f4f7..a6b50f8 100644 --- a/doc/src/guide/deps.asciidoc +++ b/doc/src/guide/deps.asciidoc @@ -559,10 +559,8 @@ performed: * Run autopatch on the project Autopatch first checks if there is any project-specific patch -enabled. There are currently three: `RABBITMQ_CLIENT_PATCH` for -the `amqp_client` dependency (before 3.6.0), `RABBITMQ_SERVER_PATCH` -for the `rabbit` dependency (before 3.6.0) and `ELIXIR_PATCH` -for the `elixir` dependency. +enabled. There is currently one: `ELIXIR_PATCH` for the `elixir` +dependency. Otherwise, autopatch performs different operations depending on the kind of project it finds the dependency to be. diff --git a/index/amqp_client.mk b/index/amqp_client.mk deleted file mode 100644 index 13e7f48..0000000 --- a/index/amqp_client.mk +++ /dev/null @@ -1,7 +0,0 @@ -PACKAGES += amqp_client -pkg_amqp_client_name = amqp_client -pkg_amqp_client_description = RabbitMQ Erlang AMQP client -pkg_amqp_client_homepage = https://www.rabbitmq.com/erlang-client-user-guide.html -pkg_amqp_client_fetch = git -pkg_amqp_client_repo = https://github.com/rabbitmq/rabbitmq-erlang-client.git -pkg_amqp_client_commit = master diff --git a/index/rabbit.mk b/index/rabbit.mk deleted file mode 100644 index b9ca63d..0000000 --- a/index/rabbit.mk +++ /dev/null @@ -1,7 +0,0 @@ -PACKAGES += rabbit -pkg_rabbit_name = rabbit -pkg_rabbit_description = RabbitMQ Server -pkg_rabbit_homepage = https://www.rabbitmq.com/ -pkg_rabbit_fetch = git -pkg_rabbit_repo = https://github.com/rabbitmq/rabbitmq-server.git -pkg_rabbit_commit = master diff --git a/test/Makefile b/test/Makefile index 0517684..1ef7584 100644 --- a/test/Makefile +++ b/test/Makefile @@ -167,7 +167,7 @@ $(eval $(foreach t,$(patsubst %.mk,%,$(patsubst plugin_%,%,$(wildcard plugin_*.m # Packages. PACKAGES = $(foreach pkg,$(sort $(wildcard ../index/*.mk)),$(notdir $(basename $(pkg)))) -EXCLUDE_FROM_CHECK = ['ci.erlang.mk', esh_mk, hexer_mk, inaka_mk, 'lfe.mk', rabbitmq_codegen] +EXCLUDE_FROM_CHECK = ['ci.erlang.mk', esh_mk, hexer_mk, inaka_mk, 'lfe.mk'] packages: $(addprefix pkg-,$(PACKAGES)) |