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

rabbitmq-dist.mk: Don't assume the plugin lives in `$(DEPS_DIR)` 

The application to "package" as a plugin (an .ez archive) might be under
`$(APPS_DIR)`. Therefore now, the all the variables and recipes are
created from the path to the application not just its name.
This commit is contained in:
Jean-Sébastien Pédron 2019-07-01 14:41:53 +02:00
parent e887709ada
commit ed3dba3670
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,14 +105,10 @@ endef
# it finds a Mix configuration file, it calls do_ez_target_mix. It # it finds a Mix configuration file, it calls do_ez_target_mix. It
# should be called as: # should be called as:
# #
# $(call ez_target,app_name) # $(call ez_target,path_to_app)
define ez_target define ez_target
dist_$(1)_appdir = $$(if $$(filter $(PROJECT),$(1)), \ dist_$(1)_appdir = $(2)
$(CURDIR), \
$$(if $$(shell test -d $(APPS_DIR)/$(1) && echo OK), \
$(APPS_DIR)/$(1), \
$(DEPS_DIR)/$(1)))
dist_$(1)_appfile = $$(dist_$(1)_appdir)/ebin/$(1).app dist_$(1)_appfile = $$(dist_$(1)_appdir)/ebin/$(1).app
dist_$(1)_mixfile = $$(dist_$(1)_appdir)/mix.exs dist_$(1)_mixfile = $$(dist_$(1)_appdir)/mix.exs
@ -135,10 +131,10 @@ ifeq ($(wildcard $(DIST_PLUGINS_LIST)),)
$(error DIST_PLUGINS_LIST ($(DIST_PLUGINS_LIST)) is missing) $(error DIST_PLUGINS_LIST ($(DIST_PLUGINS_LIST)) is missing)
endif endif
$(eval $(foreach app, \ $(eval $(foreach path, \
$(filter-out rabbit looking_glass lz4, \ $(filter-out %/rabbit %/looking_glass %/lz4, \
$(sort $(notdir $(shell cat $(DIST_PLUGINS_LIST)))) $(PROJECT)), \ $(sort $(shell cat $(DIST_PLUGINS_LIST))) $(CURDIR)), \
$(call ez_target,$(app)))) $(call ez_target,$(if $(filter $(path),$(CURDIR)),$(PROJECT),$(notdir $(path))),$(path))))
endif endif
endif endif