changeset
- Slightly better comments
Mon, 02 Jul 2012 22:58:16 -0700
- author
- Mark Doliner <mark@kingant.net>
- date
- Mon, 02 Jul 2012 22:58:16 -0700
- branch
- release-2.x.y
- changeset 33062
- 280854ddb8d4
- parent 33061
- 2cac629e4549
- child 33063
- a3d157700972
- Slightly better comments
- Always check for a version in ChangeLog.API (not just for major and
minor releases). I think it's clearly if we have a line in ChangeLog.API
for micro releases that says "No Changes"
- Don't check the date in ChangeLog. I find this to be cumbersome because
I often build packages before the date in the release date listed in
the ChangeLog
| Makefile.am | file | annotate | diff | comparison | revisions |
--- a/Makefile.am Mon Jul 02 22:47:42 2012 -0700 +++ b/Makefile.am Mon Jul 02 22:58:16 2012 -0700 @@ -43,30 +43,27 @@ iconv -f utf8 -t utf8 COPYRIGHT | cmp COPYRIGHT - version-check: -# We don't want to release development versions. +# Ensure our version string does not contain "dev" test x`echo $(PACKAGE_VERSION) | grep dev` = x -# When doing a new minor (or major) release (X.Y.0), there must be a section in -# ChangeLog.API. - echo $(PACKAGE_VERSION) | grep -v "^[0-9]\+\.[0-9]\+\.0$$" >/dev/null || head ChangeLog.API | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null - -# For all releases, check the ChangeLogs. - head ChangeLog | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null - head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null +# Ensure ChangeLogs have the correct version + head ChangeLog | grep "^version $(PACKAGE_VERSION) (.*):$$" >/dev/null + head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null + head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null # Ensure we're working from a tag... test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug` # ... and have no changes in the working copy. (this isn't really necessary with hg because hg id appends a "+") test "x`hg st -mard`" = x -release: commit-check version-check distcheck packages - packages: gpg -ab pidgin-$(PACKAGE_VERSION).tar.gz gpg -ab pidgin-$(PACKAGE_VERSION).tar.bz2 gpg --verify pidgin-$(PACKAGE_VERSION).tar.gz.asc pidgin-$(PACKAGE_VERSION).tar.gz gpg --verify pidgin-$(PACKAGE_VERSION).tar.bz2.asc pidgin-$(PACKAGE_VERSION).tar.bz2 +release: commit-check version-check distcheck packages + if INSTALL_I18N PO_DIR=po DESKTOP_FILE=pidgin.desktop
