From 8c7298b0c11df3690a8eb5afdd9226af87b4d76f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 9 Dec 2010 13:49:01 +0000 Subject: [PATCH] build: Check NEWS file during release, not distcheck The check-news option in configure.ac conflicts with the idea of using a buildbot to do a distcheck. Since we're doing some validation on the state of the build during the release-check phase we should add the NEWS file check there. http://bugzilla.clutter-project.org/show_bug.cgi?id=2468 --- build/autotools/Makefile.am.release | 11 ++++++++++- configure.ac | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build/autotools/Makefile.am.release b/build/autotools/Makefile.am.release index 3a3163917..f563afe0b 100644 --- a/build/autotools/Makefile.am.release +++ b/build/autotools/Makefile.am.release @@ -34,9 +34,18 @@ release-tag: fi \ fi -release-check: release-verify-even-micro release-verify-sane-changelogs +release-check: release-verify-even-micro release-verify-sane-changelogs release-verify-news TAR_OPTIONS="$(TAR_OPTIONS)" $(MAKE) $(AM_MAKEFLAGS) distcheck +release-verify-news: + @echo -n "Checking that the NEWS file has been updated..." + @if ! grep -q "$(CLUTTER_VERSION)" $(top_srcdir)/NEWS; then \ + (echo "Ouch." && \ + echo "The version in the NEWS file does not match $(CLUTTER_VERSION)." && \ + echo "This probably means you haven't updated the NEWS file." && \ + false); else :; fi + @echo "Good." + release-verify-sane-changelogs: changelogs @echo -n "Checking that the ChangeLog files are sane..." @if grep -q "is required to generate" $(CHANGELOGS); then \ diff --git a/configure.ac b/configure.ac index 6427db88d..e3aa6ef8f 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build]) AC_CONFIG_MACRO_DIR([build/autotools]) -AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-define no-dist-gzip dist-bzip2 check-news]) +AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-define no-dist-gzip dist-bzip2]) AM_SILENT_RULES([yes])