diff options
| author | Tobi Oetiker <tobi@oetiker.ch> | 2011-09-29 08:52:21 +0200 |
|---|---|---|
| committer | Tobi Oetiker <tobi@oetiker.ch> | 2011-09-29 08:52:21 +0200 |
| commit | ba384d7679698812140a3ef3dd92c12b30816dfd (patch) | |
| tree | aa1d126324583d4f4cebde3295c4d5b475a55ca6 | |
| parent | d0444c7bd2713466995b986c8d47fb467f79a458 (diff) | |
| download | smokeping-ba384d7679698812140a3ef3dd92c12b30816dfd.tar.gz smokeping-ba384d7679698812140a3ef3dd92c12b30816dfd.tar.xz | |
improve release mechanism and add DESTDIR to binary paching
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | bin/Makefile.am | 2 | ||||
| -rwxr-xr-x | release-smokeping.sh | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index aad7c09..ff127f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,12 +21,9 @@ SUBDIRS = bin doc etc htdocs lib EXTRA_DIST = setup/build-perl-modules.sh setup/sdbs.inc dist-hook: - echo Version $(PACKAGE_VERSION) >DIST_REVISION - svn info >>DIST_REVISION - cp DIST_REVISION $(distdir)/ $(PERL) -i -p -e '"$(PACKAGE_VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/ and $$v = sprintf("%d.%03d%03d",$$1,$$2,$$3) and s/^\$$VERSION\s+=\s+".+?"/\$$VERSION = "$$d"/' $(distdir)/lib/Smokeping.pm - -# date >DIST_REVISION -# git branch -vv >>DIST_REVISION - +# echo Version $(PACKAGE_VERSION) >DIST_REVISION +# svn info >>DIST_REVISION +# cp DIST_REVISION $(distdir)/ +# diff --git a/bin/Makefile.am b/bin/Makefile.am index 01030c8..dafbdfd 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -18,6 +18,6 @@ dist_bin_SCRIPTS = smokeinfo smokeping smokeping_cgi tSmoke install-exec-hook: - [ x$PERL5LIB != x ] && cd "$(bindir)" && $(PERL) -i -p -e 's{^#!.*}{#!$(PERL)}; s{.*# PERL5LIB}{use lib qw($(PERL5LIB)); # PERL5LIB}' smokeinfo smokeping smokeping_cgi tSmoke + [ x$PERL5LIB != x ] && cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{^#!.*}{#!$(PERL)}; s{.*# PERL5LIB}{use lib qw($(PERL5LIB)); # PERL5LIB}' smokeinfo smokeping smokeping_cgi tSmoke # EOF diff --git a/release-smokeping.sh b/release-smokeping.sh index 42b47bc..c5ce225 100755 --- a/release-smokeping.sh +++ b/release-smokeping.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e VERSION=`perl -n -e 'm/\QAC_INIT([rrdtool],[\E(.+?)\Q])\E/ && print $1' configure.ac` -svn commit -m "preparing for the release of smokeping-$VERSION" +svn status -q && echo "ERROR: make sure your tree is consistent before release" && exit 1 cd /tmp svn export svn://svn.oetiker.ch/smokeping/trunk/software smokeping-$$ cd smokeping-$$ |