maint: more 1.18 preparations.

* HACKING: it's the distcheck results that get distributed; tags.
* maintainer/maint.mk (git-tag-release, git-upload-release):
show commands that are being run.

diff --git a/HACKING b/HACKING
index 00fac1cecb466d21b61649d64cc0f3fd699cf153..61ddc3a995874348fb2f1b95a8fab67afb0913b0 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -575,6 +575,8 @@
     make -j12 distcheck                                # regular distcheck
     make -j12 distcheck AM_TESTSUITE_MAKE="make -j12"  # parallelize makes
 
+  The resulting automake-$VERSION.tar.* files are what will be the release.
+
   You can run "git clean -fdx" before invoking the bootstrap, to ensure
   a completely clean rebuild.  However, it must be done carefully,
   because that command will remove *all* the files that are not tracked
@@ -588,7 +590,8 @@
   a proper signed git tag for the release, based on the contents
   of $(VERSION). It's highly undesirable (at least) to change anything
   after the tag is made, so don't run this until everything is committed
-  and pushed and you're ready to release.
+  and pushed and you're ready to release. (If you need to delete the tag
+  locally because you ran it too soon: git tag --delete v$VERSION.)
 
 * Create additional info for the announcement with the announce-gen
   script that is part of gnulib.  It requires the new release tarball,

diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index 5672d91f5a754f48815323526ab8bbaba4f3a241..ee5a25076836d416dcc9b002dffa0acad26326e7 100644 (file)
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -182,8 +182,8 @@ print-release-type:
 git-tag-release: maintainer-check
        @set -e -u; \
        case '$(AM_TAG_DRYRUN)' in \
-         ""|[nN]|[nN]o|NO) run="";; \
-         *) run="echo Running:";; \
+         ""|[nN]|[nN]o|NO) run="set -x;";; \
+         *) run="echo Would run:";; \
        esac; \
        $(git_must_have_clean_workdir); \
        $$run $(GIT) tag -s "v$(VERSION)" -m "$(PACKAGE) $(VERSION)"
@@ -205,8 +205,8 @@ git-upload-release:
        @# Upload it to the correct FTP repository.
        @$(determine_release_type) \
          && dest=$$dest.gnu.org:automake \
-         && echo "Will upload to $$dest: $(DIST_ARCHIVES)" \
-         && $(srcdir)/lib/gnupload $(GNUPLOADFLAGS) --to $$dest \
+         && echo "Uploading to $$dest: $(DIST_ARCHIVES)" \
+         && set -x && $(srcdir)/lib/gnupload $(GNUPLOADFLAGS) --to $$dest \
                                    $(DIST_ARCHIVES)
 
 .PHONY: print-release-type git-upload-release git-tag-release