Re: maint.mk: improve the release procedure

[Akim Demaille]

Le 3 août 2012 à 10:36, Stefano Lattarini a écrit :

> Hi Akim.
> 
> On 08/03/2012 10:14 AM, Akim Demaille wrote:
>> 
>> --- a/top/maint.mk
>> +++ b/top/maint.mk
>> @@ -1134,7 +1134,7 @@ sc_makefile_path_separator_check:
>> # i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release)
>> # and is read-only.
>> writable-files:
>> -    if test -d $(release_archive_dir); then                         \
>> +    $(AM_GEN)if test -d $(release_archive_dir); then                \
>> 
> $(AM_V_GEN) perhaps?

Definitely, thanks!

>>        for file in $(DIST_ARCHIVES); do                              \
>>          for p in ./ $(release_archive_dir)/; do                     \
>>            test -e $$p$$file || continue;                            \
>> @@ -1279,7 +1279,10 @@ else
>> endif
>> 
>> announcement: NEWS ChangeLog $(rel-files)
>> -    $(AM_V_GEN)$(srcdir)/$(_build-aux)/announce-gen                 \
>> +# Do not use $(AM_V_GEN) here, or remove @, since the output of this
>> +# command serves as annoucement message: it would start with " GEN
>> +# announcement".
>> +    @$(srcdir)/$(_build-aux)/announce-gen                           \
>> 
> I suggest using '$(AM_V_at)' instead of '@', so that the recipe will
> show when running with "make V=1".

Excellent idea, thanks again!

commit 72177c72417f0be1387e39c5b7c28722fbeaf322
Author: Akim Demaille <address@hidden>
Date:   Fri Aug 3 10:09:44 2012 +0200

    maint.mk: improve the release procedure
    
    With help from Stefano Lattarini.
    
    * top/maint.mk (writable-files): Use $(AM_V_GEN).
    (announcement): Use $(AM_V_at).
    (upload_command, upload): New.
    (emit_upload_commands): Adjust.

diff --git a/ChangeLog b/ChangeLog
index a5aca2f..400b91a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-03  Akim Demaille  <address@hidden>
+
+       maint.mk: improve the release procedure
+       With help from Stefano Lattarini.
+       * top/maint.mk (writable-files): Use $(AM_V_GEN).
+       (announcement): Use $(AM_V_at).
+       (upload_command, upload): New.
+       (emit_upload_commands): Adjust.
+
 2012-08-01  Akim Demaille  <address@hidden>
 
        maint.mk: a "release-commit" wrapper to do-release-commit-and-tag
diff --git a/top/maint.mk b/top/maint.mk
index bdc4502..e88ed54 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1134,7 +1134,7 @@ sc_makefile_path_separator_check:
 # i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release)
 # and is read-only.
 writable-files:
-       if test -d $(release_archive_dir); then                         \
+       $(AM_V_GEN)if test -d $(release_archive_dir); then              \
          for file in $(DIST_ARCHIVES); do                              \
            for p in ./ $(release_archive_dir)/; do                     \
              test -e $$p$$file || continue;                            \
@@ -1279,7 +1279,9 @@ else
 endif
 
 announcement: NEWS ChangeLog $(rel-files)
-       $(AM_V_GEN)$(srcdir)/$(_build-aux)/announce-gen                 \
+# Not $(AM_V_GEN) since the output of this command serves as
+# annoucement message: it would start with " GEN announcement".
+       $(AM_V_at)$(srcdir)/$(_build-aux)/announce-gen                  \
            --mail-headers='$(announcement_mail_headers_)'              \
            --release-type=$(RELEASE_TYPE)                              \
            --package=$(PACKAGE)                                        \
@@ -1308,16 +1310,23 @@ ftp-gnu = ftp://ftp.gnu.org/gnu
 www-gnu = http://www.gnu.org
 
 upload_dest_dir_ ?= $(PACKAGE)
+upload_command =                                               \
+  $(if $(RELEASE_TYPE),,$(error RELEASE_TYPE undefined))       \
+  $(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS)            \
+  --to $(gnu_rel_host):$(upload_dest_dir_)                     \
+  $(rel-files)
 emit_upload_commands:
        @echo =====================================
        @echo =====================================
-       @echo "$(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS) \\"
-       @echo "    --to $(gnu_rel_host):$(upload_dest_dir_) \\"
-       @echo "  $(rel-files)"
+       @echo '$(upload_command)'
        @echo '# send the ~/announce-$(my_distdir) e-mail'
        @echo =====================================
        @echo =====================================
 
+.PHONY: upload
+upload:
+       $(AM_V_GEN)$(upload_command)
+
 define emit-commit-log
   printf '%s\n' 'maint: post-release administrivia' ''                 \
     '* NEWS: Add header line for next release.'                                
\