From 30f6149275eeab9cdae51f360d64b942bd016070 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Mon, 23 May 2016 15:30:22 +0200 Subject: [PATCH] update versioning. fix #119 * use git based version like v0.6-78-g109ac21 -- not sure if this plays well with rpm/deb but we'll know soon * build should be specific for rpm/deb and only rarely be incremented --- Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 769ac9d7..d2dc2b28 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ -VERSION=0.0.0 -BUILD=1 +VERSION=$(shell git describe --tags) build: @@ -17,12 +16,12 @@ deb: build -s dir \ -t deb \ -n carbon-relay-ng \ - -v $(VERSION)-$(BUILD) \ + -v $(VERSION)-1 \ -a amd64 \ - -m "Dieter Plaetinck " \ + -m "Dieter Plaetinck " \ --description "Fast carbon relay+aggregator with admin interfaces for making changes online" \ --license BSD \ - --url https://github.com/rcrowley/carbon-relay-ng \ + --url https://github.com/graphite-ng/carbon-relay-ng \ -C debian . rm -rf debian @@ -36,12 +35,12 @@ rpm: build -t rpm \ -n carbon-relay-ng \ -v $(VERSION) \ - --epoch $(BUILD) \ + --epoch 1 \ -a amd64 \ - -m "Dieter Plaetinck " \ + -m "Dieter Plaetinck " \ --description "Fast carbon relay+aggregator with admin interfaces for making changes online" \ --license BSD \ - --url https://github.com/rcrowley/carbon-relay-ng \ + --url https://github.com/graphite-ng/carbon-relay-ng \ -C redhat . rm -rf redhat