diff options
| author | Diana Corbacho <diana@rabbitmq.com> | 2016-12-13 08:39:04 +0100 |
|---|---|---|
| committer | Diana Corbacho <diana@rabbitmq.com> | 2016-12-13 08:39:04 +0100 |
| commit | 321abd47ccc97d3de3b0bcae388ea30299fd47a6 (patch) | |
| tree | 0b5adf0ba727fb17152fc5affe3500c7068bdf5c /rabbitmq-components.mk | |
| parent | f43990d05f8c629e41e9f748d7e8f6963039905f (diff) | |
| parent | 21e8b335950b6871c71e5e3de54ea249fe4322f9 (diff) | |
| download | rabbitmq-server-git-321abd47ccc97d3de3b0bcae388ea30299fd47a6.tar.gz | |
Merge branch 'master' into rabbitmq-server-567
Diffstat (limited to 'rabbitmq-components.mk')
| -rw-r--r-- | rabbitmq-components.mk | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 071385e8e7..c05a66fe13 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -5,6 +5,27 @@ ifeq ($(.DEFAULT_GOAL),) .DEFAULT_GOAL = all endif +# PROJECT_VERSION defaults to: +# 1. the version exported by rabbitmq-server-release; +# 2. the version stored in `git-revisions.txt`, if it exists; +# 3. a version based on git-describe(1), if it is a Git clone; +# 4. 0.0.0 + +PROJECT_VERSION := $(RABBITMQ_VERSION) + +ifeq ($(PROJECT_VERSION),) +PROJECT_VERSION := $(shell \ +if test -f git-revisions.txt; then \ + head -n1 git-revisions.txt | \ + awk '{print $$$(words $(PROJECT_DESCRIPTION) version);}'; \ +else \ + (git describe --dirty --abbrev=7 --tags --always --first-parent \ + 2>/dev/null || echo rabbitmq_v0_0_0) | \ + sed -e 's/^rabbitmq_v//' -e 's/^v//' -e 's/_/./g' -e 's/-/+/' \ + -e 's/-/./g'; \ +fi) +endif + # -------------------------------------------------------------------- # RabbitMQ components. # -------------------------------------------------------------------- @@ -79,9 +100,9 @@ dep_rabbitmq_public_umbrella = git_rmq rabbitmq-public-umbrella $(curre # all projects use the same versions. It avoids conflicts and makes it # possible to work with rabbitmq-public-umbrella. -dep_cowboy_commit = 1.0.3 +dep_cowboy_commit = 1.0.4 dep_mochiweb = git git://github.com/basho/mochiweb.git v2.9.0p2 -dep_ranch_commit = 1.2.1 +dep_ranch_commit = 1.3.0 dep_webmachine_commit = 1.10.8p2 RABBITMQ_COMPONENTS = amqp_client \ |