Remove maintainer-check target, fold into normal build

make maintainer-check was obscure and rarely called in practice, and
many breakages were missed.  Fold everything that make maintainer-check
used to do into the normal build.  Specifically:

- Call duplicate_oids when genbki.pl is called.

- Check for tabs in SGML files when the documentation is built.

- Run msgfmt with the -c option during the regular build.  Add an
  additional configure check to see whether we are using the GNU
  version.  (make maintainer-check probably used to fail with non-GNU
  msgfmt.)

Keep maintainer-check as around as phony target for the time being in
case anyone is calling it.  But it won't do anything anymore.
This commit is contained in:
Peter Eisentraut 2013-09-11 14:34:28 -04:00
parent 3dc543b3d8
commit 5dd41f3574
11 changed files with 32 additions and 23 deletions

View File

@ -70,8 +70,6 @@ $(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib,check)
$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib,installcheck)
$(call recurse,maintainer-check,doc src config contrib)
GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
./config.status $@

View File

@ -197,6 +197,11 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
if test -z "$MSGFMT"; then
AC_MSG_ERROR([msgfmt is required for NLS])
fi
AC_CACHE_CHECK([for msgfmt flags], pgac_cv_msgfmt_flags,
[if test x"$MSGFMT" != x"" && "$MSGFMT" --version 2>&1 | grep "GNU" >/dev/null; then
pgac_cv_msgfmt_flags=-c
fi])
AC_SUBST(MSGFMT_FLAGS, $pgac_cv_msgfmt_flags)
AC_CHECK_PROGS(MSGMERGE, msgmerge)
AC_CHECK_PROGS(XGETTEXT, xgettext)
])# PGAC_CHECK_GETTEXT

14
configure vendored
View File

@ -659,6 +659,7 @@ TCL_CONFIG_SH
TCLSH
XGETTEXT
MSGMERGE
MSGFMT_FLAGS
MSGFMT
HAVE_POSIX_SIGNALS
LDAP_LIBS_BE
@ -29346,6 +29347,19 @@ done
$as_echo "$as_me: error: msgfmt is required for NLS" >&2;}
{ (exit 1); exit 1; }; }
fi
{ $as_echo "$as_me:$LINENO: checking for msgfmt flags" >&5
$as_echo_n "checking for msgfmt flags... " >&6; }
if test "${pgac_cv_msgfmt_flags+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test x"$MSGFMT" != x"" && "$MSGFMT" --version 2>&1 | grep "GNU" >/dev/null; then
pgac_cv_msgfmt_flags=-c
fi
fi
{ $as_echo "$as_me:$LINENO: result: $pgac_cv_msgfmt_flags" >&5
$as_echo "$pgac_cv_msgfmt_flags" >&6; }
MSGFMT_FLAGS=$pgac_cv_msgfmt_flags
for ac_prog in msgmerge
do
# Extract the first word of "$ac_prog", so it can be a program name with args.

View File

@ -12,5 +12,5 @@ subdir = doc
top_builddir = ..
include $(top_builddir)/src/Makefile.global
all distprep html man install installdirs uninstall clean distclean maintainer-clean maintainer-check:
all distprep html man install installdirs uninstall clean distclean maintainer-clean:
$(MAKE) -C src $@

View File

@ -4,5 +4,5 @@ subdir = doc/src
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
all distprep html man install installdirs uninstall clean distclean maintainer-clean maintainer-check:
all distprep html man install installdirs uninstall clean distclean maintainer-clean:
$(MAKE) -C sgml $@

View File

@ -22,9 +22,9 @@ top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
all: html man
all: check-tabs html man
distprep: html distprep-man
distprep: check-tabs html distprep-man
ifndef JADE
@ -301,7 +301,7 @@ MAKEINFO = makeinfo
##
# Quick syntax check without style processing
check maintainer-check: postgres.sgml $(ALMOSTALLSGML) check-tabs
check: postgres.sgml $(ALMOSTALLSGML) check-tabs
$(NSGMLS) $(SPFLAGS) $(SGMLINCLUDE) -s $<

View File

@ -18,11 +18,11 @@
#
# Meta configuration
standard_targets = all install installdirs uninstall distprep clean distclean maintainer-clean coverage check installcheck maintainer-check init-po update-po
standard_targets = all install installdirs uninstall distprep clean distclean maintainer-clean coverage check installcheck init-po update-po
# these targets should recurse even into subdirectories not being built:
standard_always_targets = distprep clean distclean maintainer-clean
.PHONY: $(standard_targets) install-strip html man installcheck-parallel
.PHONY: $(standard_targets) install-strip html man installcheck-parallel maintainer-check
# make `all' the default target
all:
@ -283,6 +283,7 @@ perl_embed_ldflags = @perl_embed_ldflags@
AWK = @AWK@
LN_S = @LN_S@
MSGFMT = @MSGFMT@
MSGFMT_FLAGS = @MSGFMT_FLAGS@
MSGMERGE = @MSGMERGE@
PYTHON = @PYTHON@
TAR = @TAR@

View File

@ -62,7 +62,8 @@ schemapg.h: postgres.bki ;
# even in distribution tarballs. So this is cheating a bit, but it
# will achieve the goal of updating the version number when it
# changes.
postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(top_srcdir)/configure
postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(top_srcdir)/configure $(top_srcdir)/src/include/catalog/duplicate_oids
cd $(top_srcdir)/src/include/catalog && ./duplicate_oids
$(PERL) -I $(catalogdir) $< $(pg_includes) --set-version=$(MAJORVERSION) $(POSTGRES_BKI_SRCS)
.PHONY: install-data

View File

@ -45,4 +45,4 @@ clean: clean-local
clean-local:
rm -f $(subsysfilename) $(OBJS)
$(call recurse,coverage maintainer-check)
$(call recurse,coverage)

View File

@ -75,6 +75,3 @@ clean:
distclean maintainer-clean: clean
rm -f pg_config.h pg_config_ext.h pg_config_os.h dynloader.h stamp-h stamp-ext-h
maintainer-check:
cd catalog && ./duplicate_oids

View File

@ -68,7 +68,7 @@ BACKEND_COMMON_GETTEXT_FLAGS = \
all-po: $(MO_FILES)
%.mo: %.po
$(MSGFMT) -o $@ $<
$(MSGFMT) $(MSGFMT_FLAGS) -o $@ $<
ifeq ($(word 1,$(GETTEXT_FILES)),+)
po/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES)) $(MAKEFILE_LIST)
@ -113,12 +113,6 @@ clean-po:
rm -f po/$(CATALOG_NAME).pot
maintainer-check-po: $(ALL_PO_FILES)
for file in $^; do \
$(MSGFMT) -c -v -o /dev/null $$file || exit 1; \
done
init-po: po/$(CATALOG_NAME).pot
@ -155,7 +149,6 @@ install: install-po
installdirs: installdirs-po
uninstall: uninstall-po
clean distclean maintainer-clean: clean-po
maintainer-check: maintainer-check-po
.PHONY: all-po install-po installdirs-po uninstall-po clean-po \
maintainer-check-po init-po update-po
init-po update-po