Browse Source

Remove rabbit/amqp_client packages and patches

We expect users to fetch these projects from hex.pm now
and the packages no longer worked.
Loïc Hoguin 2 years ago
parent
commit
2f61a6cfc0
5 changed files with 4 additions and 35 deletions
  1. 1 16
      core/deps.mk
  2. 2 4
      doc/src/guide/deps.asciidoc
  3. 0 7
      index/amqp_client.mk
  4. 0 7
      index/rabbit.mk
  5. 1 1
      test/Makefile

+ 1 - 16
core/deps.mk

@@ -766,22 +766,7 @@ endif
 .PHONY: autopatch-$(call dep_name,$1)
 .PHONY: autopatch-$(call dep_name,$1)
 
 
 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/; \
 		ln -s lib/elixir/ebin $(DEPS_DIR)/elixir/; \
 	else \
 	else \
 		$$(call dep_autopatch,$(call dep_name,$1)) \
 		$$(call dep_autopatch,$(call dep_name,$1)) \

+ 2 - 4
doc/src/guide/deps.asciidoc

@@ -559,10 +559,8 @@ performed:
 * Run autopatch on the project
 * Run autopatch on the project
 
 
 Autopatch first checks if there is any project-specific patch
 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
 Otherwise, autopatch performs different operations depending
 on the kind of project it finds the dependency to be.
 on the kind of project it finds the dependency to be.

+ 0 - 7
index/amqp_client.mk

@@ -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

+ 0 - 7
index/rabbit.mk

@@ -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

+ 1 - 1
test/Makefile

@@ -167,7 +167,7 @@ $(eval $(foreach t,$(patsubst %.mk,%,$(patsubst plugin_%,%,$(wildcard plugin_*.m
 # Packages.
 # Packages.
 
 
 PACKAGES = $(foreach pkg,$(sort $(wildcard ../index/*.mk)),$(notdir $(basename $(pkg))))
 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))
 packages: $(addprefix pkg-,$(PACKAGES))