From 9c672e85f50efb891bb7df65b4b341f6f3f0ca2d Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 24 Sep 2014 10:32:33 +0000 Subject: Rework build script to use $(!builddate). The existing Halibut bob script defaults to building a completely unversioned source tarball. I think building one with the version format I'm now more or less standardising on (date + VCS id info) is a more sensible default. So I'm retiring the SNAPSHOT setting, which I never used anyway, and making the default work like that. [originally from svn r10252] --- Buildscr | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Buildscr b/Buildscr index 67d1557..5187793 100644 --- a/Buildscr +++ b/Buildscr @@ -5,19 +5,16 @@ module halibut ifnexist halibut/charset checkout charset halibut/charset -set Ver -ifneq "$(RELEASE)" "" set Ver $(RELEASE) -ifneq "$(SNAPSHOT)" "" set Ver $(SNAPSHOT) +set Version $(!builddate).$(vcsid) +ifneq "$(RELEASE)" "" set Version $(RELEASE) set Rel ifneq "$(RELEASE)" "" set Rel RELEASE=$(RELEASE) -ifneq "$(SNAPSHOT)" "" set Rel RELEASE=$(SNAPSHOT) -set Basename halibut -ifneq "$(ver)" "" set Basename halibut-$(Ver) +set Basename halibut-$(Version) # Make the source archive. -in halibut do ./release.sh $(Basename) $(Ver) +in halibut do ./release.sh $(Basename) $(Version) # Build a local binary of Halibut in order to build the docs. Make # sure to tag it with the supplied version number, so that the -- cgit v1.1