Mercurial > hg > chronicle
changeset 23:59b123e21627
2007-08-15 18:23:35 by steve
Show a real release number in the templates, generated by the makefile.
| author | steve |
|---|---|
| date | Wed, 15 Aug 2007 18:23:35 +0000 |
| parents | b9a683f07bab |
| children | 4a936d95aca5 |
| files | Makefile bin/chronicle |
| diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Aug 15 00:46:06 2007 +0000 +++ b/Makefile Wed Aug 15 18:23:35 2007 +0000 @@ -8,14 +8,14 @@ # -- # http://www.steve.org.uk/ # -# $Id: Makefile,v 1.5 2007-08-14 17:58:46 steve Exp $ +# $Id: Makefile,v 1.6 2007-08-15 18:23:35 steve Exp $ # # Only used to build distribution tarballs. # DIST_PREFIX = ${TMP} -VERSION = 0.3 +VERSION = 0.4 BASE = chronicle @@ -71,6 +71,7 @@ rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION) rm -f $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz cp -R . $(DIST_PREFIX)/$(BASE)-$(VERSION) + perl -pi.bak -e "s/UNRELEASED/$(VERSION)/g" $(DIST_PREFIX)/$(BASE)-$(VERSION)/bin/chronicle find $(DIST_PREFIX)/$(BASE)-$(VERSION) -name "CVS" -print | xargs rm -rf rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/debian cd $(DIST_PREFIX) && tar --exclude=.cvsignore -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
--- a/bin/chronicle Wed Aug 15 00:46:06 2007 +0000 +++ b/bin/chronicle Wed Aug 15 18:23:35 2007 +0000 @@ -54,7 +54,7 @@ -- http://www.steve.org.uk/ - $Id: chronicle,v 1.10 2007-08-15 00:40:35 steve Exp $ + $Id: chronicle,v 1.11 2007-08-15 18:23:35 steve Exp $ =cut @@ -80,6 +80,12 @@ use Pod::Usage; +# +# Release number +# +# NOTE: Set by 'make release'. +# +my $RELEASE = 'UNRELEASED'; # @@ -330,13 +336,13 @@ if ( $VERSION ) { - my $REVISION = '$Revision: 1.10 $'; + my $REVISION = '$Revision: 1.11 $'; if ( $REVISION =~ /1.([0-9.]+) / ) { $REVISION = $1; } - logprint( "chronicle release $REVISION\n" ); + print( "chronicle release $RELEASE\n" ); exit; } } @@ -806,6 +812,8 @@ if ( $CONFIG{'blog_title'} ); $template->param( blog_subtitle => $CONFIG{'blog_subtitle'} ) if ( $CONFIG{'blog_subtitle'} ); + $template->param( release => $RELEASE ); + # # Page to use