summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2017-09-04 17:15:13 +0200
committerMax <msuraev@sysmocom.de>2017-09-15 15:04:20 +0000
commit98f6482ec7eb603b17e5a99fb92d28c17fcf61e9 (patch)
tree80b7198d06b3378068f0795aef299f2d81477efe
parentb2e41cc174e3423282a30fa7c40133350973e300 (diff)
Make release helper more robust
* check for bumpversion and error out if missing * drop bumpversion dependency from .deb Change-Id: Ide04d4c1ba20426bdf9531e25b462eda9418858a Related: OS#1861
-rw-r--r--debian/control1
-rw-r--r--osmo-release.mk5
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index e2661735..b19448e1 100644
--- a/debian/control
+++ b/debian/control
@@ -281,7 +281,6 @@ Architecture: any
Multi-Arch: same
Section: libdevel
Depends: libosmocore,
- bumpversion,
libtalloc-dev,
${misc:Depends}
Description: Development headers for Open Source MObile COMmunications CORE library
diff --git a/osmo-release.mk b/osmo-release.mk
index 03eb3cbe..40eb121b 100644
--- a/osmo-release.mk
+++ b/osmo-release.mk
@@ -2,6 +2,7 @@ ifndef REL
REL := patch
endif
+BUMPVER := $(shell bumpversion)
NEW_VER := $(shell bumpversion --list --current-version $(VERSION) $(REL) --allow-dirty | awk -F '=' '{ print $$2 }')
LIBVERS := $(shell git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS)
MAKEMOD := $(shell git diff -GLIBVERSION --stat | grep Makefile.am)
@@ -9,6 +10,10 @@ ISODATE := $(shell date -I)
release:
+ifeq ($(BUMPVER),)
+ @$(error Unable to find 'bumpversion' command.)
+endif
+
ifeq ($(NEW_VER),)
@$(error Please fix versioning to match http://semver.org/ spec (current is $(VERSION)) before proceeding.)
endif