aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2015-09-17 20:06:16 +0200
committerLoïc Hoguin <[email protected]>2015-09-17 20:06:16 +0200
commit42e14a3edb7b6d86c94b87d6d0956d059de5c674 (patch)
tree5ed61fd9abc0f799f724858752468b4951359705
parent27a4afe8fcdf6293ef30ca7a91dbe31157b5cbb7 (diff)
downloaderlang.mk-42e14a3edb7b6d86c94b87d6d0956d059de5c674.tar.gz
erlang.mk-42e14a3edb7b6d86c94b87d6d0956d059de5c674.tar.bz2
erlang.mk-42e14a3edb7b6d86c94b87d6d0956d059de5c674.zip
Only set id to git --describe when we are a dependency
This way we can commit the .app file once and it won't change until we actually change something. Much better for "no .app.src" file method. We are getting close to making this method the default!
-rw-r--r--core/erlc.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/erlc.mk b/core/erlc.mk
index 96690da..1a73698 100644
--- a/core/erlc.mk
+++ b/core/erlc.mk
@@ -57,7 +57,7 @@ define app_file
{application, $(PROJECT), [
{description, "$(PROJECT_DESCRIPTION)"},
{vsn, "$(PROJECT_VERSION)"},
- {id, "$(1)"},
+ $(if $(IS_DEP),{id, "$(1)"},)
{modules, [$(call comma_list,$(2))]},
{registered, []},
{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]}
@@ -68,7 +68,7 @@ define app_file
{application, $(PROJECT), [
{description, "$(PROJECT_DESCRIPTION)"},
{vsn, "$(PROJECT_VERSION)"},
- {id, "$(1)"},
+ $(if $(IS_DEP),{id$(comma)$(space)"$(1)"}$(comma))
{modules, [$(call comma_list,$(2))]},
{registered, [$(call comma_list,$(PROJECT)_sup $(PROJECT_REGISTERED))]},
{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]},