brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Check NEWS file during release, not distcheck

Browse Source 
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
This commit is contained in:
Emmanuele Bassi 2010-12-09 13:49:01 +00:00
parent 88f7579a9d
commit 8c7298b0c1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/autotools/Makefile.am.release
View File

@ -34,9 +34,18 @@ release-tag:
fi \ fi \
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 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 release-verify-sane-changelogs: changelogs
@echo -n "Checking that the ChangeLog files are sane..." @echo -n "Checking that the ChangeLog files are sane..."
@if grep -q "is required to generate" $(CHANGELOGS); then \ @if grep -q "is required to generate" $(CHANGELOGS); then \

2
configure.ac
View File

@ -58,7 +58,7 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build]) AC_CONFIG_AUX_DIR([build])
AC_CONFIG_MACRO_DIR([build/autotools]) 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]) AM_SILENT_RULES([yes])