diff options
| author | Loïc Hoguin <[email protected]> | 2014-10-31 12:58:13 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-10-31 12:58:13 +0100 |
| commit | d009b7e27315b07802cffc07f8d6b8785e6048c0 (patch) | |
| tree | c66cbb6347662b2882d5f0b3a60ca3f1bb8bf7c0 /core | |
| parent | bf28af49d39be2ce2b6f5e453e24989f5e73403f (diff) | |
| parent | ee97e84f8b606736ebe3bb9991f89ec65a9bdfd3 (diff) | |
| download | erlang.mk-d009b7e27315b07802cffc07f8d6b8785e6048c0.tar.gz erlang.mk-d009b7e27315b07802cffc07f8d6b8785e6048c0.tar.bz2 erlang.mk-d009b7e27315b07802cffc07f8d6b8785e6048c0.zip | |
Merge branch 'add-git-describe-to-id-field' of git://github.com/dch/erlang.mk
Diffstat (limited to 'core')
| -rw-r--r-- | core/erlc.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index 03e174e..a7f73f8 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -30,8 +30,10 @@ app:: erlc-include ebin/$(PROJECT).app echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ exit 1; \ fi + $(eval GITDESCRIBE := $(shell git describe --dirty --abbrev=7 --tags --always --first-parent 2>/dev/null || true)) $(appsrc_verbose) cat src/$(PROJECT).app.src \ | sed "s/{modules,[[:space:]]*\[\]}/{modules, \[$(MODULES)\]}/" \ + | sed "s/{id,[[:space:]]*\"git\"}/{id, \"$(GITDESCRIBE)\"}/" \ > ebin/$(PROJECT).app define compile_erl |