root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Reinstate the `prepare-dist` tasks for rabbitmq components 

The consolidation of `rabbitmq-components.mk` broke the previous
method by which rabbit components were detected. Now we check
$(RABBITMQ_COMPONENTS) directly.
This commit is contained in:
Philip Kuryloski 2021-03-23 17:42:23 +01:00
parent db420ef933
commit b62c5499ce
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deps/rabbit_common/mk/rabbitmq-dist.mk vendored
View File

@ -185,10 +185,13 @@ $(ERLANGMK_DIST_EZS):
$(call core_unix_path,$(SRC_DIR))/ $(call core_unix_path,$(EZ_DIR))/ $(call core_unix_path,$(SRC_DIR))/ $(call core_unix_path,$(EZ_DIR))/
@# Give a chance to the application to make any modification it @# Give a chance to the application to make any modification it
@# wants to the tree before we make an archive. @# wants to the tree before we make an archive.
$(verbose) ! (test -f $(SRC_DIR)/rabbitmq-components.mk \ ifneq ($(RABBITMQ_COMPONENTS),)
&& grep -q '^prepare-dist::' $(SRC_DIR)/Makefile) || \ ifneq ($(filter $(PROJECT),$(RABBITMQ_COMPONENTS)),)
$(verbose) ! (grep -q '^prepare-dist::' $(SRC_DIR)/Makefile) || \
$(MAKE) --no-print-directory -C $(SRC_DIR) prepare-dist \ $(MAKE) --no-print-directory -C $(SRC_DIR) prepare-dist \
APP=$(APP) VSN=$(VSN) EZ_DIR=$(EZ_DIR) APP=$(APP) VSN=$(VSN) EZ_DIR=$(EZ_DIR)
endif
endif
ifneq ($(DIST_AS_EZS),) ifneq ($(DIST_AS_EZS),)
$(verbose) (cd $(DIST_DIR) && \ $(verbose) (cd $(DIST_DIR) && \
find "$(basename $(notdir $@))" | LC_COLLATE=C sort \ find "$(basename $(notdir $@))" | LC_COLLATE=C sort \