[MERGED] libosmocore[master]: Make release helper more robust

[Max]

Max has submitted this change and it was merged.

Change subject: Make release helper more robust
......................................................................


Make release helper more robust

* check for bumpversion and error out if missing
* drop bumpversion dependency from .deb

Change-Id: Ide04d4c1ba20426bdf9531e25b462eda9418858a
Related: OS#1861
---
M debian/control
M osmo-release.mk
2 files changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/debian/control b/debian/control
index e266173..b19448e 100644
--- a/debian/control
+++ b/debian/control
@@ -281,7 +281,6 @@
 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 03eb3cb..40eb121 100644
--- a/osmo-release.mk
+++ b/osmo-release.mk
@@ -2,6 +2,7 @@
 	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 @@
 
 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

-- 
To view, visit https://gerrit.osmocom.org/3817
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide04d4c1ba20426bdf9531e25b462eda9418858a
Gerrit-PatchSet: 2
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>