mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
Update Gnulib to v0.0-7695-g26c0590.
* gnulib-local/m4/canonicalize.m4.diff: Remove. * Makefile.am (EXTRA_DIST): Adjust accordingly.
This commit is contained in:
Ludovic Courtès
parent
44cd55752a
commit
7ae4e75af5
34 changed files with 1116 additions and 796 deletions
269
maint.mk
269
maint.mk
|
|
@ -28,6 +28,28 @@ ifneq ($(build_aux),)
|
|||
set $$(_build-aux) relative to $$(srcdir) instead of $$(build_aux)")
|
||||
endif
|
||||
|
||||
# Helper variables.
|
||||
_empty =
|
||||
_sp = $(_empty) $(_empty)
|
||||
|
||||
# _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 = \
|
||||
$(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.
|
||||
gzip_rsyncable := \
|
||||
|
|
@ -52,16 +74,16 @@ _dot_escaped_srcdir = $(subst .,\.,$(srcdir))
|
|||
# Post-process $(VC_LIST) output, prepending $(srcdir)/, but only
|
||||
# when $(srcdir) is not ".".
|
||||
ifeq ($(srcdir),.)
|
||||
_prepend_srcdir_prefix =
|
||||
_prepend_srcdir_prefix =
|
||||
else
|
||||
_prepend_srcdir_prefix = | sed 's|^|$(srcdir)/|'
|
||||
_prepend_srcdir_prefix = | sed 's|^|$(srcdir)/|'
|
||||
endif
|
||||
|
||||
# In order to be able to consistently filter "."-relative names,
|
||||
# (i.e., with no $(srcdir) prefix), this definition is careful to
|
||||
# remove any $(srcdir) prefix, and to restore what it removes.
|
||||
_sc_excl = \
|
||||
$(if $(exclude_file_name_regexp--$@),$(exclude_file_name_regexp--$@),^$$)
|
||||
$(or $(exclude_file_name_regexp--$@),^$$)
|
||||
VC_LIST_EXCEPT = \
|
||||
$(VC_LIST) | sed 's|^$(_dot_escaped_srcdir)/||' \
|
||||
| if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
|
||||
|
|
@ -78,32 +100,41 @@ VERSION_REGEXP = $(subst .,\.,$(VERSION))
|
|||
PREV_VERSION_REGEXP = $(subst .,\.,$(PREV_VERSION))
|
||||
|
||||
ifeq ($(VC),$(GIT))
|
||||
this-vc-tag = v$(VERSION)
|
||||
this-vc-tag-regexp = v$(VERSION_REGEXP)
|
||||
this-vc-tag = v$(VERSION)
|
||||
this-vc-tag-regexp = v$(VERSION_REGEXP)
|
||||
else
|
||||
tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
|
||||
tag-this-version = $(subst .,_,$(VERSION))
|
||||
this-vc-tag = $(tag-package)-$(tag-this-version)
|
||||
this-vc-tag-regexp = $(this-vc-tag)
|
||||
tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
|
||||
tag-this-version = $(subst .,_,$(VERSION))
|
||||
this-vc-tag = $(tag-package)-$(tag-this-version)
|
||||
this-vc-tag-regexp = $(this-vc-tag)
|
||||
endif
|
||||
my_distdir = $(PACKAGE)-$(VERSION)
|
||||
|
||||
# Old releases are stored here.
|
||||
release_archive_dir ?= ../release
|
||||
|
||||
# If RELEASE_TYPE is undefined, but RELEASE is, use its second word.
|
||||
# But overwrite VERSION.
|
||||
ifdef RELEASE
|
||||
VERSION := $(word 1, $(RELEASE))
|
||||
RELEASE_TYPE ?= $(word 2, $(RELEASE))
|
||||
endif
|
||||
|
||||
# Validate and return $(RELEASE_TYPE), or die.
|
||||
RELEASE_TYPES = alpha beta stable
|
||||
release-type = $(call member-check,RELEASE_TYPE,$(RELEASE_TYPES))
|
||||
|
||||
# Override gnu_rel_host and url_dir_list in cfg.mk if these are not right.
|
||||
# Use alpha.gnu.org for alpha and beta releases.
|
||||
# Use ftp.gnu.org for stable releases.
|
||||
gnu_ftp_host-alpha = alpha.gnu.org
|
||||
gnu_ftp_host-beta = alpha.gnu.org
|
||||
gnu_ftp_host-stable = ftp.gnu.org
|
||||
gnu_rel_host ?= $(gnu_ftp_host-$(RELEASE_TYPE))
|
||||
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.
|
||||
|
|
@ -132,9 +163,9 @@ syntax-check-rules := $(sort $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' \
|
|||
.PHONY: $(syntax-check-rules)
|
||||
|
||||
ifeq ($(shell $(VC_LIST) >/dev/null 2>&1; echo $$?),0)
|
||||
local-checks-available += $(syntax-check-rules)
|
||||
local-checks-available += $(syntax-check-rules)
|
||||
else
|
||||
local-checks-available += no-vc-detected
|
||||
local-checks-available += no-vc-detected
|
||||
no-vc-detected:
|
||||
@echo "No version control files detected; skipping syntax check"
|
||||
endif
|
||||
|
|
@ -187,9 +218,11 @@ syntax-check: $(local-check)
|
|||
#
|
||||
# in_vc_files | in_files
|
||||
#
|
||||
# grep-E-style regexp denoting the files to check. If no files
|
||||
# are specified the default are all the files that are under
|
||||
# version control.
|
||||
# grep-E-style regexp selecting the files to check. For in_vc_files,
|
||||
# the regexp is used to select matching files from the list of all
|
||||
# version-controlled files; for in_files, it's from the names printed
|
||||
# by "find $(srcdir)". When neither is specified, use all files that
|
||||
# are under version control.
|
||||
#
|
||||
# containing | non_containing
|
||||
#
|
||||
|
|
@ -261,7 +294,7 @@ define _sc_search_regexp
|
|||
: Filter by file name; \
|
||||
if test -n "$$in_files"; then \
|
||||
files=$$(find $(srcdir) | grep -E "$$in_files" \
|
||||
| grep -Ev '$(exclude_file_name_regexp--$@)'); \
|
||||
| grep -Ev '$(_sc_excl)'); \
|
||||
else \
|
||||
files=$$($(VC_LIST_EXCEPT)); \
|
||||
if test -n "$$in_vc_files"; then \
|
||||
|
|
@ -328,8 +361,8 @@ sc_prohibit_atoi_atof:
|
|||
sp_ = strcmp *\(.+\)
|
||||
sc_prohibit_strcmp:
|
||||
@prohibit='! *strcmp *\(|\<$(sp_) *[!=]=|[!=]= *$(sp_)' \
|
||||
exclude=':# *define STRN?EQ\(' \
|
||||
halt='$(ME): replace strcmp calls above with STREQ/STRNEQ' \
|
||||
exclude='# *define STRN?EQ\(' \
|
||||
halt='replace strcmp calls above with STREQ/STRNEQ' \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
# Really. You don't want to use this function.
|
||||
|
|
@ -351,8 +384,9 @@ sc_prohibit_strncpy:
|
|||
# | xargs --no-run-if-empty \
|
||||
# perl -pi -e 's/(^|[^.])\b(exit ?)\(0\)/$1$2(EXIT_SUCCESS)/'
|
||||
sc_prohibit_magic_number_exit:
|
||||
@prohibit='(^|[^.])\<(usage|exit) ?\([0-9]|\<error ?\([1-9][0-9]*,' \
|
||||
halt='use EXIT_* values rather than magic number' \
|
||||
@prohibit='(^|[^.])\<(usage|exit|error) ?\(-?[0-9]+[,)]' \
|
||||
exclude='exit \(77\)|error ?\(((0|77),|[^,]*)' \
|
||||
halt='use EXIT_* values rather than magic number' \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
# Using EXIT_SUCCESS as the first argument to error is misleading,
|
||||
|
|
@ -567,8 +601,6 @@ sc_prohibit_c_ctype_without_use:
|
|||
@h='c-ctype.h' re='\<c_($(ctype_re)) *\(' \
|
||||
$(_sc_header_without_use)
|
||||
|
||||
_empty =
|
||||
_sp = $(_empty) $(_empty)
|
||||
# The following list was generated by running:
|
||||
# man signal.h|col -b|perl -ne '/bsd_signal.*;/.../sigwaitinfo.*;/ and print' \
|
||||
# | perl -lne '/^\s+(?:int|void).*?(\w+).*/ and print $1' | fmt
|
||||
|
|
@ -721,6 +753,7 @@ sc_require_test_exit_idiom:
|
|||
sc_trailing_blank:
|
||||
@prohibit='[ ]$$' \
|
||||
halt='found trailing blank(s)' \
|
||||
exclude='^Binary file .* matches$$' \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
# Match lines like the following, but where there is only one space
|
||||
|
|
@ -741,7 +774,7 @@ _gl_translatable_diag_func_re ?= error
|
|||
sc_unmarked_diagnostics:
|
||||
@prohibit='\<$(_gl_translatable_diag_func_re) *\([^"]*"[^"]*[a-z]{3}' \
|
||||
exclude='(_|ngettext ?)\(' \
|
||||
halt='$(ME): found unmarked diagnostic(s)' \
|
||||
halt='found unmarked diagnostic(s)' \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
# Avoid useless parentheses like those in this example:
|
||||
|
|
@ -775,6 +808,11 @@ sc_prohibit_always_true_header_tests:
|
|||
' with the corresponding gnulib module, they are always true') \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
sc_prohibit_defined_have_decl_tests:
|
||||
@prohibit='#[ ]*if(n?def|.*\<defined)\>[ (]+HAVE_DECL_' \
|
||||
halt='HAVE_DECL macros are always defined' \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
# ==================================================================
|
||||
gl_other_headers_ ?= \
|
||||
intprops.h \
|
||||
|
|
@ -1012,7 +1050,7 @@ sc_redundant_const:
|
|||
sc_const_long_option:
|
||||
@prohibit='^ *static.*struct option ' \
|
||||
exclude='const struct option|struct option const' \
|
||||
halt='$(ME): add "const" to the above declarations' \
|
||||
halt='add "const" to the above declarations' \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
NEWS_hash = \
|
||||
|
|
@ -1059,7 +1097,7 @@ sc_makefile_at_at_check:
|
|||
&& { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :
|
||||
|
||||
news-check: NEWS
|
||||
if sed -n $(news-check-lines-spec)p $< \
|
||||
$(AM_V_GEN)if sed -n $(news-check-lines-spec)p $< \
|
||||
| grep -E $(news-check-regexp) >/dev/null; then \
|
||||
:; \
|
||||
else \
|
||||
|
|
@ -1083,9 +1121,11 @@ fix_po_file_diag = \
|
|||
'you have changed the set of files with translatable diagnostics;\n\
|
||||
apply the above patch\n'
|
||||
|
||||
# Verify that all source files using _() are listed in po/POTFILES.in.
|
||||
# Verify that all source files using _() (more specifically, files that
|
||||
# match $(_gl_translatable_string_re)) are listed in po/POTFILES.in.
|
||||
po_file ?= $(srcdir)/po/POTFILES.in
|
||||
generated_files ?= $(srcdir)/lib/*.[ch]
|
||||
_gl_translatable_string_re ?= \b(N?_|gettext *)\([^)"]*("|$$)
|
||||
sc_po_check:
|
||||
@if test -f $(po_file); then \
|
||||
grep -E -v '^(#|$$)' $(po_file) \
|
||||
|
|
@ -1105,7 +1145,7 @@ sc_po_check:
|
|||
esac; \
|
||||
files="$$files $$file"; \
|
||||
done; \
|
||||
grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files \
|
||||
grep -E -l '$(_gl_translatable_string_re)' $$files \
|
||||
| sed 's|^$(_dot_escaped_srcdir)/||' | sort -u > $@-2; \
|
||||
diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \
|
||||
|| { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \
|
||||
|
|
@ -1115,7 +1155,7 @@ sc_po_check:
|
|||
# Sometimes it is useful to change the PATH environment variable
|
||||
# in Makefiles. When doing so, it's better not to use the Unix-centric
|
||||
# path separator of ':', but rather the automake-provided '$(PATH_SEPARATOR)'.
|
||||
msg = '$(ME): Do not use ":" above; use $$(PATH_SEPARATOR) instead'
|
||||
msg = 'Do not use ":" above; use $$(PATH_SEPARATOR) instead'
|
||||
sc_makefile_path_separator_check:
|
||||
@prohibit='PATH[=].*:' \
|
||||
in_vc_files='akefile|\.mk$$' \
|
||||
|
|
@ -1126,7 +1166,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; \
|
||||
|
|
@ -1208,22 +1248,31 @@ sc_Wundef_boolean:
|
|||
# not be constant, or might overflow a stack. In general, use PATH_MAX as
|
||||
# a limit, not an array or alloca size.
|
||||
sc_prohibit_path_max_allocation:
|
||||
@prohibit='(\balloca *\([^)]*|\[[^]]*)PATH_MAX' \
|
||||
@prohibit='(\balloca *\([^)]*|\[[^]]*)\bPATH_MAX' \
|
||||
halt='Avoid stack allocations of size PATH_MAX' \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
sc_vulnerable_makefile_CVE-2009-4029:
|
||||
@prohibit='perm -777 -exec chmod a\+rwx|chmod 777 \$$\(distdir\)' \
|
||||
in_files=$$(find $(srcdir) -name Makefile.in) \
|
||||
in_files='(^|/)Makefile\.in$$' \
|
||||
halt=$$(printf '%s\n' \
|
||||
'the above files are vulnerable; beware of running' \
|
||||
' "make dist*" rules, and upgrade to fixed automake' \
|
||||
' see http://bugzilla.redhat.com/542609 for details') \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
sc_vulnerable_makefile_CVE-2012-3386:
|
||||
@prohibit='chmod a\+w \$$\(distdir\)' \
|
||||
in_files='(^|/)Makefile\.in$$' \
|
||||
halt=$$(printf '%s\n' \
|
||||
'the above files are vulnerable; beware of running' \
|
||||
' "make distcheck", and upgrade to fixed automake' \
|
||||
' see http://bugzilla.redhat.com/CVE-2012-3386 for details') \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
vc-diff-check:
|
||||
(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || :
|
||||
if test -s vc-diffs; then \
|
||||
$(AM_V_GEN)(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || :
|
||||
$(AM_V_at)if test -s vc-diffs; then \
|
||||
cat vc-diffs; \
|
||||
echo "Some files are locally modified:" 1>&2; \
|
||||
exit 1; \
|
||||
|
|
@ -1239,31 +1288,37 @@ bootstrap-tools ?= autoconf,automake,gnulib
|
|||
|
||||
# If it's not already specified, derive the GPG key ID from
|
||||
# the signed tag we've just applied to mark this release.
|
||||
gpg_key_ID ?= \
|
||||
$$(git cat-file tag v$(VERSION) \
|
||||
| gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
|
||||
| awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}')
|
||||
gpg_key_ID ?= \
|
||||
$$(cd $(srcdir) \
|
||||
&& git cat-file tag v$(VERSION) \
|
||||
| gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
|
||||
| awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}')
|
||||
|
||||
translation_project_ ?= coordinator@translationproject.org
|
||||
|
||||
# Make info-gnu the default only for a stable release.
|
||||
ifeq ($(RELEASE_TYPE),stable)
|
||||
announcement_Cc_ ?= $(translation_project_), $(PACKAGE_BUGREPORT)
|
||||
announcement_mail_headers_ ?= \
|
||||
To: info-gnu@gnu.org \
|
||||
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: info-gnu@gnu.org \
|
||||
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)
|
||||
@$(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) \
|
||||
--release-type=$(release-type) \
|
||||
--package=$(PACKAGE) \
|
||||
--prev=$(PREV_VERSION) \
|
||||
--curr=$(VERSION) \
|
||||
|
|
@ -1276,6 +1331,12 @@ announcement: NEWS ChangeLog $(rel-files)
|
|||
--no-print-checksums \
|
||||
$(addprefix --url-dir=, $(url_dir_list))
|
||||
|
||||
.PHONY: release-commit
|
||||
release-commit:
|
||||
$(AM_V_GEN)cd $(srcdir) \
|
||||
&& $(_build-aux)/do-release-commit-and-tag \
|
||||
-C $(abs_builddir) $(RELEASE)
|
||||
|
||||
## ---------------- ##
|
||||
## Updating files. ##
|
||||
## ---------------- ##
|
||||
|
|
@ -1284,16 +1345,22 @@ ftp-gnu = ftp://ftp.gnu.org/gnu
|
|||
www-gnu = http://www.gnu.org
|
||||
|
||||
upload_dest_dir_ ?= $(PACKAGE)
|
||||
upload_command = \
|
||||
$(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.' \
|
||||
|
|
@ -1303,7 +1370,7 @@ endef
|
|||
|
||||
.PHONY: no-submodule-changes
|
||||
no-submodule-changes:
|
||||
if test -d $(srcdir)/.git; then \
|
||||
$(AM_V_GEN)if test -d $(srcdir)/.git; then \
|
||||
diff=$$(cd $(srcdir) && git submodule -q foreach \
|
||||
git diff-index --name-only HEAD) \
|
||||
|| exit 1; \
|
||||
|
|
@ -1339,19 +1406,22 @@ public-submodule-commit:
|
|||
gl_public_submodule_commit ?= public-submodule-commit
|
||||
check: $(gl_public_submodule_commit)
|
||||
|
||||
.PHONY: alpha beta stable
|
||||
.PHONY: alpha beta stable release
|
||||
ALL_RECURSIVE_TARGETS += alpha beta stable
|
||||
alpha beta stable: $(local-check) writable-files $(submodule-checks)
|
||||
test $@ = stable \
|
||||
$(AM_V_GEN)test $@ = stable \
|
||||
&& { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \
|
||||
|| { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\
|
||||
|| :
|
||||
$(MAKE) vc-diff-check
|
||||
$(MAKE) news-check
|
||||
$(MAKE) distcheck
|
||||
$(MAKE) dist
|
||||
$(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
|
||||
$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
|
||||
$(AM_V_at)$(MAKE) vc-diff-check
|
||||
$(AM_V_at)$(MAKE) news-check
|
||||
$(AM_V_at)$(MAKE) distcheck
|
||||
$(AM_V_at)$(MAKE) dist
|
||||
$(AM_V_at)$(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
|
||||
$(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
|
||||
|
||||
release:
|
||||
$(AM_V_GEN)$(MAKE) $(release-type)
|
||||
|
||||
# Override this in cfg.mk if you follow different procedures.
|
||||
release-prep-hook ?= release-prep
|
||||
|
|
@ -1359,19 +1429,19 @@ release-prep-hook ?= release-prep
|
|||
gl_noteworthy_news_ = * Noteworthy changes in release ?.? (????-??-??) [?]
|
||||
.PHONY: release-prep
|
||||
release-prep:
|
||||
case $$RELEASE_TYPE in alpha|beta|stable) ;; \
|
||||
*) echo "invalid RELEASE_TYPE: $$RELEASE_TYPE" 1>&2; exit 1;; esac
|
||||
$(MAKE) --no-print-directory -s announcement > ~/announce-$(my_distdir)
|
||||
if test -d $(release_archive_dir); then \
|
||||
$(AM_V_GEN)$(MAKE) --no-print-directory -s announcement \
|
||||
> ~/announce-$(my_distdir)
|
||||
$(AM_V_at)if test -d $(release_archive_dir); then \
|
||||
ln $(rel-files) $(release_archive_dir); \
|
||||
chmod a-w $(rel-files); \
|
||||
fi
|
||||
echo $(VERSION) > $(prev_version_file)
|
||||
$(MAKE) update-NEWS-hash
|
||||
perl -pi -e '$$. == 3 and print "$(gl_noteworthy_news_)\n\n\n"' $(srcdir)/NEWS
|
||||
$(emit-commit-log) > .ci-msg
|
||||
$(VC) commit -F .ci-msg -a
|
||||
rm .ci-msg
|
||||
$(AM_V_at)echo $(VERSION) > $(prev_version_file)
|
||||
$(AM_V_at)$(MAKE) update-NEWS-hash
|
||||
$(AM_V_at)perl -pi \
|
||||
-e '$$. == 3 and print "$(gl_noteworthy_news_)\n\n\n"' \
|
||||
$(srcdir)/NEWS
|
||||
$(AM_V_at)msg=$$($(emit-commit-log)) || exit 1; \
|
||||
cd $(srcdir) && $(VC) commit -m "$$msg" -a
|
||||
|
||||
# Override this with e.g., -s $(srcdir)/some_other_name.texi
|
||||
# if the default $(PACKAGE)-derived name doesn't apply.
|
||||
|
|
@ -1379,14 +1449,20 @@ gendocs_options_ ?=
|
|||
|
||||
.PHONY: web-manual
|
||||
web-manual:
|
||||
@test -z "$(manual_title)" \
|
||||
$(AM_V_GEN)test -z "$(manual_title)" \
|
||||
&& { echo define manual_title in cfg.mk 1>&2; exit 1; } || :
|
||||
@cd '$(srcdir)/doc'; \
|
||||
$(AM_V_at)cd '$(srcdir)/doc'; \
|
||||
$(SHELL) ../$(_build-aux)/gendocs.sh $(gendocs_options_) \
|
||||
-o '$(abs_builddir)/doc/manual' \
|
||||
--email $(PACKAGE_BUGREPORT) $(PACKAGE) \
|
||||
"$(PACKAGE_NAME) - $(manual_title)"
|
||||
@echo " *** Upload the doc/manual directory to web-cvs."
|
||||
$(AM_V_at)echo " *** Upload the doc/manual directory to web-cvs."
|
||||
|
||||
.PHONY: web-manual-update
|
||||
web-manual-update:
|
||||
$(AM_V_GEN)cd $(srcdir) \
|
||||
&& $(_build-aux)/gnu-web-doc-update -C $(abs_builddir)
|
||||
|
||||
|
||||
# Code Coverage
|
||||
|
||||
|
|
@ -1412,6 +1488,31 @@ gen-coverage:
|
|||
|
||||
coverage: init-coverage build-coverage gen-coverage
|
||||
|
||||
# Some projects carry local adjustments for gnulib modules via patches in
|
||||
# a gnulib patch directory whose default name is gl/ (defined in bootstrap
|
||||
# via local_gl_dir=gl). Those patches become stale as the originals evolve
|
||||
# in gnulib. Use this rule to refresh any stale patches. It applies each
|
||||
# patch to the original in $(gnulib_dir) and uses the temporary result to
|
||||
# generate a fuzz-free .diff file. If you customize the name of your local
|
||||
# gnulib patch directory via bootstrap.conf, this rule detects that name.
|
||||
# Run this from a non-VPATH (i.e., srcdir) build directory.
|
||||
.PHONY: refresh-gnulib-patches
|
||||
refresh-gnulib-patches:
|
||||
gl=gl; \
|
||||
if test -f bootstrap.conf; then \
|
||||
t=$$(perl -lne '/^\s*local_gl_dir=(\S+)/ and $$d=$$1;' \
|
||||
-e 'END{defined $$d and print $$d}' bootstrap.conf); \
|
||||
test -n "$$t" && gl=$$t; \
|
||||
fi; \
|
||||
for diff in $$(cd $$gl; git ls-files | grep '\.diff$$'); do \
|
||||
b=$$(printf %s "$$diff"|sed 's/\.diff$$//'); \
|
||||
VERSION_CONTROL=none \
|
||||
patch "$(gnulib_dir)/$$b" "$$gl/$$diff" || exit 1; \
|
||||
( cd $(gnulib_dir) || exit 1; \
|
||||
git diff "$$b" > "../$$gl/$$diff"; \
|
||||
git checkout $$b ) || exit 1; \
|
||||
done
|
||||
|
||||
# Update gettext files.
|
||||
PACKAGE ?= $(shell basename $(PWD))
|
||||
PO_DOMAIN ?= $(PACKAGE)
|
||||
|
|
@ -1445,7 +1546,7 @@ update-copyright-env ?=
|
|||
# in the file .x-update-copyright.
|
||||
.PHONY: update-copyright
|
||||
update-copyright:
|
||||
grep -l -w Copyright \
|
||||
$(AM_V_GEN)grep -l -w Copyright \
|
||||
$$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \
|
||||
| $(update-copyright-env) xargs $(srcdir)/$(_build-aux)/$@
|
||||
|
||||
|
|
@ -1518,6 +1619,7 @@ _gl_TS_obj_files ?= *.$(OBJEXT)
|
|||
# Files in which to search for the one-line style extern declarations.
|
||||
# $(_gl_TS_dir)-relative.
|
||||
_gl_TS_headers ?= $(noinst_HEADERS)
|
||||
_gl_TS_other_headers ?= *.h
|
||||
|
||||
.PHONY: _gl_tight_scope
|
||||
_gl_tight_scope: $(bin_PROGRAMS)
|
||||
|
|
@ -1540,7 +1642,8 @@ _gl_tight_scope: $(bin_PROGRAMS)
|
|||
&& { echo the above functions should have static scope >&2; \
|
||||
exit 1; } || : ; \
|
||||
( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_vars); \
|
||||
perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"' $$hdr *.h \
|
||||
perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"' \
|
||||
$$hdr $(_gl_TS_other_headers) \
|
||||
) | sort -u > $$t; \
|
||||
nm -e $(_gl_TS_obj_files) | sed -n 's/.* [BCDGRS] //p' \
|
||||
| sort -u | grep -Ev -f $$t \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue