From 058791631db6ff61f702d4336b9c131b338a581f Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 1 Aug 2017 10:10:35 -0700 Subject: [PATCH] tools: make setversion: more thorough replacing of bounds (==, >= only) --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3732aea1e..990e0736e 100644 --- a/Makefile +++ b/Makefile @@ -1294,9 +1294,11 @@ updatedate: setdate $(call def-help,updatedate, set manual date to current month # update a package yaml file's version, -DVERSION, and hledger lower bounds (does not change upper bounds) %/package.yaml: $(VERSIONFILE) - perl -p -e "s/(^version *: *).*/\$${1}'$(VERSION)'/" -i $@ - perl -pe "s/(hledger(-\w+)?) *>=? *((\d+\.)*\d+) *&& *< *((\d+\.)*\d+)$$/\$$1 >= $(VERSION) && < \$$5/" -i $@ - perl -p -e "s/(-DVERSION=\")[^\"]+/\$${1}$(VERSION)/" -i $@ + perl -pe "s/(^version *: *).*/\$${1}'$(VERSION)'/" -i $@ # version: 'A' + perl -pe "s/(-DVERSION=\")[^\"]+/\$${1}$(VERSION)/" -i $@ # -DVERSION="A" + perl -pe "s/(hledger(-\w+)?) *== *((\d+\.)*\d+) *$$/\$$1 == $(VERSION)/" -i $@ # hledgerX == A + perl -pe "s/(hledger(-\w+)?) *>=? *((\d+\.)*\d+) *$$/\$$1 >= $(VERSION)/" -i $@ # hledgerX >= A + perl -pe "s/(hledger(-\w+)?) *>=? *((\d+\.)*\d+) *&& *< *((\d+\.)*\d+) *$$/\$$1 >= $(VERSION) && < \$$5/" -i $@ # hledgerX >= A && < B # update hledger-api's version strings hledger-api/hledger-api.hs: $(VERSIONFILE)