Просмотр исходного кода

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!
Loïc Hoguin 9 лет назад
Родитель
Сommit
42e14a3edb
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      core/erlc.mk

+ 2 - 2
core/erlc.mk

@@ -57,7 +57,7 @@ define app_file
 {application, $(PROJECT), [
 {application, $(PROJECT), [
 	{description, "$(PROJECT_DESCRIPTION)"},
 	{description, "$(PROJECT_DESCRIPTION)"},
 	{vsn, "$(PROJECT_VERSION)"},
 	{vsn, "$(PROJECT_VERSION)"},
-	{id, "$(1)"},
+	$(if $(IS_DEP),{id, "$(1)"},)
 	{modules, [$(call comma_list,$(2))]},
 	{modules, [$(call comma_list,$(2))]},
 	{registered, []},
 	{registered, []},
 	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]}
 	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]}
@@ -68,7 +68,7 @@ define app_file
 {application, $(PROJECT), [
 {application, $(PROJECT), [
 	{description, "$(PROJECT_DESCRIPTION)"},
 	{description, "$(PROJECT_DESCRIPTION)"},
 	{vsn, "$(PROJECT_VERSION)"},
 	{vsn, "$(PROJECT_VERSION)"},
-	{id, "$(1)"},
+	$(if $(IS_DEP),{id$(comma)$(space)"$(1)"}$(comma))
 	{modules, [$(call comma_list,$(2))]},
 	{modules, [$(call comma_list,$(2))]},
 	{registered, [$(call comma_list,$(PROJECT)_sup $(PROJECT_REGISTERED))]},
 	{registered, [$(call comma_list,$(PROJECT)_sup $(PROJECT_REGISTERED))]},
 	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]},
 	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]},