[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: maint.mk: improve the release procedure
From: |
Akim Demaille |
Subject: |
Re: maint.mk: improve the release procedure |
Date: |
Tue, 25 Sep 2012 19:23:18 +0200 |
Le 25 sept. 2012 à 17:03, Jim Meyering a écrit :
> ACK.
> Only reservation is that the new name, "equal"
> may be too generic, i.e., may interfere with a
> Makefile that uses maint.mk. Maybe "_equal" instead?
I used that name. This is what I installed:
From cb38ce7db84edb421fbaeea5abe16ebeb8ad8a5c Mon Sep 17 00:00:00 2001
From: Akim Demaille <address@hidden>
Date: Tue, 25 Sep 2012 12:19:04 +0200
Subject: [PATCH] maint.mk: fix strict vs. lazy variable issues with RELEASE
* top/maint.mk (_equal): New function.
(member_check): Strip the result to avoid spurious spaces.
(url_dir_list): Do not use ifeq, which is strict, as it will
require RELEASE_TYPE to be defined.
(announcement_Cc_, announcement_mail_headers_): Likewise: instead
of relying on ifeq, use $(release_type) to dispatch (lazily) onto...
(announcement_Cc_alpha,announcement_mail_headers_alpha)
(announcement_Cc_beta,announcement_mail_headers_beta)
(announcement_Cc_stable,announcement_mail_headers_stable): these.
(release): Do not depend on $(release-type), as it forces its
evaluation. Bounce to it.
---
ChangeLog | 15 +++++++++++++++
top/maint.mk | 62 ++++++++++++++++++++++++++++++++++--------------------------
2 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 67ef27d..fa12c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
2012-09-25 Akim Demaille <address@hidden>
+ maint.mk: fix strict vs. lazy variable issues with RELEASE
+ * top/maint.mk (_equal): New function.
+ (member_check): Strip the result to avoid spurious spaces.
+ (url_dir_list): Do not use ifeq, which is strict, as it will
+ require RELEASE_TYPE to be defined.
+ (announcement_Cc_, announcement_mail_headers_): Likewise: instead
+ of relying on ifeq, use $(release_type) to dispatch (lazily) onto...
+ (announcement_Cc_alpha,announcement_mail_headers_alpha)
+ (announcement_Cc_beta,announcement_mail_headers_beta)
+ (announcement_Cc_stable,announcement_mail_headers_stable): these.
+ (release): Do not depend on $(release-type), as it forces its
+ evaluation. Bounce to it.
+
+2012-09-25 Akim Demaille <address@hidden>
+
maint.mk: formatting changes
* top/maint.mk: Indent bodies of if's.
diff --git a/top/maint.mk b/top/maint.mk
index d8387b0..e52deb4 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -32,17 +32,23 @@ endif
_empty =
_sp = $(_empty) $(_empty)
-# member-check VARIABLE,VALID-VALUES
+# _equal,S1,S2
+# ------------
+# If S1 == S2, return S1, otherwise the empty string.
+_equal = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
+
+# member-check,VARIABLE,VALID-VALUES
# ----------------------------------
# Check that $(VARIABLE) is in the space-separated list of VALID-VALUES, and
# return it. Die otherwise.
-member-check = \
- $(if $($(1)), \
- $(if $(findstring $(_sp),$($(1))), \
- $(error invalid $(1): '$($(1))', expected $(2)), \
- $(or $(findstring $(_sp)$($(1))$(_sp),$(_sp)$(2)(_sp)), \
- $(error invalid $(1): '$($(1))', expected $(2)))), \
- $(error $(1) undefined))
+member-check = \
+ $(strip \
+ $(if $($(1)), \
+ $(if $(findstring $(_sp),$($(1))), \
+ $(error invalid $(1): '$($(1))', expected $(2)), \
+ $(or $(findstring $(_sp)$($(1))$(_sp),$(_sp)$(2)$(_sp)), \
+ $(error invalid $(1): '$($(1))', expected $(2)))), \
+ $(error $(1) undefined)))
# Do not save the original name or timestamp in the .tar.gz file.
# Use --rsyncable if available.
@@ -126,11 +132,9 @@ gnu_ftp_host-beta = alpha.gnu.org
gnu_ftp_host-stable = ftp.gnu.org
gnu_rel_host ?= $(gnu_ftp_host-$(release-type))
-ifeq ($(gnu_rel_host),ftp.gnu.org)
- url_dir_list ?= http://ftpmirror.gnu.org/$(PACKAGE)
-else
- url_dir_list ?= ftp://$(gnu_rel_host)/gnu/$(PACKAGE)
-endif
+url_dir_list ?= $(if $(call _equal,$(gnu_rel_host),ftp.gnu.org), \
+ http://ftpmirror.gnu.org/$(PACKAGE), \
+ ftp://$(gnu_rel_host)/gnu/$(PACKAGE))
# Override this in cfg.mk if you are using a different format in your
# NEWS file.
@@ -1291,19 +1295,22 @@ gpg_key_ID ?=
\
translation_project_ ?= address@hidden
# Make info-gnu the default only for a stable release.
-ifeq ($(release-type),stable)
- announcement_Cc_ ?= $(translation_project_), $(PACKAGE_BUGREPORT)
- announcement_mail_headers_ ?=
\
- To: address@hidden \
- Cc: $(announcement_Cc_) \
- Mail-Followup-To: $(PACKAGE_BUGREPORT)
-else
- announcement_Cc_ ?= $(translation_project_)
- announcement_mail_headers_ ?=
\
- To: $(PACKAGE_BUGREPORT) \
- Cc: $(announcement_Cc_)
-endif
-
+announcement_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
+announcement_mail_headers_stable = \
+ To: address@hidden \
+ Cc: $(announcement_Cc_) \
+ Mail-Followup-To: $(PACKAGE_BUGREPORT)
+
+announcement_Cc_alpha = $(translation_project_)
+announcement_mail_headers_alpha = \
+ To: $(PACKAGE_BUGREPORT) \
+ Cc: $(announcement_Cc_)
+
+announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha)
+announcement_mail_headers_beta = $(announcement_mail_headers_alpha)
+
+announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type))
+announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type))
announcement: NEWS ChangeLog $(rel-files)
# Not $(AM_V_GEN) since the output of this command serves as
# annoucement message: it would start with " GEN announcement".
@@ -1411,7 +1418,8 @@ alpha beta stable: $(local-check) writable-files
$(submodule-checks)
$(AM_V_at)$(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
$(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
-release: $(release-type)
+release:
+ $(AM_V_GEN)$(MAKE) $(release-type)
# Override this in cfg.mk if you follow different procedures.
release-prep-hook ?= release-prep
--
1.7.11.5
- Re: maint.mk: improve the release procedure, (continued)
- Re: maint.mk: improve the release procedure, Akim Demaille, 2012/09/23
- Re: maint.mk: improve the release procedure, Jim Meyering, 2012/09/23
- Re: maint.mk: improve the release procedure, Akim Demaille, 2012/09/24
- Re: maint.mk: improve the release procedure, Jim Meyering, 2012/09/24
- Re: maint.mk: improve the release procedure, Akim Demaille, 2012/09/24
- Re: maint.mk: improve the release procedure, Jim Meyering, 2012/09/25
- Re: maint.mk: improve the release procedure, Akim Demaille, 2012/09/25
- Re: maint.mk: improve the release procedure, Akim Demaille, 2012/09/25
- Re: maint.mk: improve the release procedure, Akim Demaille, 2012/09/25
- Re: maint.mk: improve the release procedure, Jim Meyering, 2012/09/25
- Re: maint.mk: improve the release procedure,
Akim Demaille <=
- Re: maint.mk: improve the release procedure, Stefano Lattarini, 2012/09/25
- Re: maint.mk: improve the release procedure, Akim Demaille, 2012/09/25
Re: maint.mk: improve the release procedure, Akim Demaille, 2012/09/21