diff --git a/build-aux/GNUmakefile.in b/build-aux/GNUmakefile.in index 4bc8a48a..a07c882a 100644 --- a/build-aux/GNUmakefile.in +++ b/build-aux/GNUmakefile.in @@ -78,7 +78,7 @@ PHONY_TARGETS:=\ mostlyclean\ pdf\ ps\ - sign\ + sign-dist\ uninstall\ web\ # @@ -283,7 +283,7 @@ endif dist: $(TARBALL) -sign: $(TARBALL) +sign-dist: $(TARBALL) gpg -a --output $(TARBALL).sig --detach-sig $(TARBALL) git checkout ChangeLog @@ -319,10 +319,17 @@ tag: git tag -s v$(VERSION) -m "GNU Mes $(VERSION)." # Release process -# 0. doc: Release update, Release commit, test guix bootstrap -# 1. make tag -# 2. make dist +# 0. Prepare git, see history: +# - doc: Release update +# + NEWS, etc. +# + doc/announce/ANNOUNCE-0.22, using xxx for checksums +# - Release 0.22 +# 1. make tag VERSION=0.22 +# 2. make sign-dist # 3. make release +# - Update doc/announce/ANNOUNCE-0.22 +# - doc: Post-release update. +# 4. verify bootstrap guix-build: ./pre-inst-env $(GUIX) build mes@$(VERSION) --with-source=$(TARBALL) diff --git a/configure b/configure index a7b701af..821ad1bd 100755 --- a/configure +++ b/configure @@ -458,7 +458,7 @@ Some influential environment variables: (make-dep "diff" #:optional? #t) (make-dep "guile" #:version '(2 0) #:commands '("guile-2.2" "guile-2.0" "guile-2" "guile") #:optional? #t) (make-dep "mes" #:version '(0 20) #:optional? #t) - (make-dep "guix" #:version '(0 13) #:optional? #t) + (make-dep "guix" #:version '() #:optional? #t) (make-dep "ar" #:version '(2 10) #:optional? #t) (make-dep "sh" #:optional? #t) (make-dep "bash" #:version '(2 0) #:optional? #t)