diff options
| author | Jean-Sébastien Pédron <[email protected]> | 2019-06-18 15:22:38 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2019-06-20 14:46:52 +0200 |
| commit | 95917dbe67558b1317a2c946dff3dd45ebdbea7c (patch) | |
| tree | 2508f70c05646329125405e7d647819d891ad5f5 | |
| parent | e6131008c8a2fbb1a71469544a35469abb1a5408 (diff) | |
| download | erlang.mk-95917dbe67558b1317a2c946dff3dd45ebdbea7c.tar.gz erlang.mk-95917dbe67558b1317a2c946dff3dd45ebdbea7c.tar.bz2 erlang.mk-95917dbe67558b1317a2c946dff3dd45ebdbea7c.zip | |
Display Hex dependency version in the "DEP mydep (version)" line
... exactly as it is displayed for Git-based dependencies.
| -rw-r--r-- | core/deps.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/deps.mk b/core/deps.mk index 33177ed..6e463ac 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -47,7 +47,7 @@ $(foreach p,$(DEP_EARLY_PLUGINS),\ dep_name = $(if $(dep_$(1)),$(1),$(if $(pkg_$(1)_name),$(pkg_$(1)_name),$(1))) dep_repo = $(patsubst git://github.com/%,https://github.com/%, \ $(if $(dep_$(1)),$(word 2,$(dep_$(1))),$(pkg_$(1)_repo))) -dep_commit = $(if $(dep_$(1)_commit),$(dep_$(1)_commit),$(if $(dep_$(1)),$(word 3,$(dep_$(1))),$(pkg_$(1)_commit))) +dep_commit = $(if $(dep_$(1)_commit),$(dep_$(1)_commit),$(if $(dep_$(1)),$(if $(filter hex,$(word 1,$(dep_$(1)))),$(word 2,$(dep_$(1))),$(word 3,$(dep_$(1)))),$(pkg_$(1)_commit))) LOCAL_DEPS_DIRS = $(foreach a,$(LOCAL_DEPS),$(if $(wildcard $(APPS_DIR)/$(a)),$(APPS_DIR)/$(a))) ALL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(foreach dep,$(filter-out $(IGNORE_DEPS),$(BUILD_DEPS) $(DEPS)),$(call dep_name,$(dep)))) |