From e09e783d938f1504eac163ac94abd19822cab00a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Sep 2018 22:13:33 +0100 Subject: [PATCH 1/1] Switch to no-version-commit. --- wscript | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 8493ade..ed589ca 100644 --- a/wscript +++ b/wscript @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2016-2017 Carl Hetherington +# Copyright (C) 2016-2018 Carl Hetherington # # This file is part of libcxml. # @@ -18,10 +18,25 @@ # along with libcxml. If not, see . # +import subprocess +import shlex from waflib import Context APPNAME = 'libcxml' -VERSION = '0.15.5devel' + +this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] +last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] + +if isinstance(this_version, bytes): + this_version = this_version.decode('UTF-8') +if isinstance(last_version, bytes): + last_version = last_version.decode('UTF-8') + +if this_version == '': + VERSION = '%sdevel' % last_version[1:].strip() +else: + VERSION = this_version[1:].strip() + API_VERSION = '0.0.0' def options(opt): -- 2.30.2