From ae5138d3e00eab97adba4d473643e1e8ae72efff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Fri, 9 Jun 2017 20:22:49 +0200 Subject: [PATCH] build: release.mk: fix no-release conflict (implied-required version) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, generating custom versioned tarballs without requiring a "release" (which comprises also tagging hence in turn making the implied version match the required one as desired) would not allow to test the release routines thoroughly incl. GPG signing. Unfortunately, allowing for a temporary tag is prone to accidentally slipping it to the distributed tree, so that should rather be avoided. Now it can. Another step to blur the boundaries between whether "release" is specified or not is make checksums file generated unconditionally. Signed-off-by: Jan Pokorný --- build-aux/release.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build-aux/release.mk b/build-aux/release.mk index fc6ce1a..a7c3190 100644 --- a/build-aux/release.mk +++ b/build-aux/release.mk @@ -30,7 +30,9 @@ tag: setup ./tag-$(version) tag-$(version): ifeq (,$(release)) @echo Building test release $(version), no tagging + echo '$(version)' > .tarball-version else + # following will be captured by git-version-gen automatically git tag -a -m "v$(version) release" v$(version) HEAD @touch $@ endif @@ -46,12 +48,8 @@ sha256: $(project)-$(version).sha256 $(deliverables): tarballs $(project)-$(version).sha256: -ifeq (,$(release)) - @echo Building test release $(version), no sha256 -else # checksum anything from deliverables except for in-prep checksums file sha256sum $(deliverables:$@=) | sort -k2 > $@ -endif sign: $(deliverables:=.asc) @@ -81,4 +79,4 @@ else endif clean: - rm -rf $(project)-* tag-* + rm -rf $(project)-* tag-* .tarball-version