.gitignore | 1 + VERSION | 1 - VERSION.do | 2 ++ clean.do | 1 + gocheese.do | 2 +- gocheese.go | 2 +- gocheese.info.do | 8 ++++++-- install.texi | 13 ++++--------- makedist.sh | 30 +++++++++++++++++++----------- pyshop2packages.sh => contrib/pyshop2packages.sh | 0 www.do | 12 +++++++----- diff --git a/.gitignore b/.gitignore index 25cd6fa311827fa8a9b71147d11a95242aa6452e684d9da97086cf2d34715811..faec53f7756047d88c5d3694b70e63527cd438c8e0dfb99214da814f6050a2c5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gocheese gocheese.info gocheese.html module-name +VERSION diff --git a/VERSION b/VERSION deleted file mode 100644 index 4134a4655c8a4fc9baa45847da4ce422c187ccca44b7b3b718a831b409f586ba..0000000000000000000000000000000000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.4.0 diff --git a/VERSION.do b/VERSION.do new file mode 100644 index 0000000000000000000000000000000000000000..118d8766e1e7ef7ab7f570fa21b6dc07044aa7be4038beb6b80a95b96f284738 --- /dev/null +++ b/VERSION.do @@ -0,0 +1,2 @@ +redo-ifchange gocheese.go +perl -ne 'print "$1\n" if /Version.*"(.*)"$/' < gocheese.go diff --git a/clean.do b/clean.do new file mode 100644 index 0000000000000000000000000000000000000000..d8603db7ba763ed83528927c6df263e9a4948646330700658430197332b50d3e --- /dev/null +++ b/clean.do @@ -0,0 +1 @@ +rm -f gocheese module-name VERSION diff --git a/gocheese.do b/gocheese.do index 07666b9b4df996a5caab2242127ede00570e83b38164a962e98b6e53b20ca4fe..6f52ec22b78f7bea9fecf4131fe4a5d09396e6d8985aa97ac5c7036d08ceafc6 100644 --- a/gocheese.do +++ b/gocheese.do @@ -1,2 +1,2 @@ redo-ifchange *.go module-name -${GO:=go} build -o $3 -ldflags "-X main.Version=`cat VERSION`" `cat module-name` +${GO:=go} build -o $3 `cat module-name` diff --git a/gocheese.go b/gocheese.go index 3b7cf46604ad56e8376ee0b763cd3553a3ea57e5b988dee8e62d66d2eb984b99..ebf9cc06ec302f9caf48386acd53e54161bea051e16e87b3b52d8b4427f2d0de 100644 --- a/gocheese.go +++ b/gocheese.go @@ -43,6 +43,7 @@ "golang.org/x/net/netutil" ) const ( + Version = "2.4.1" HTMLBegin = ` @@ -98,7 +99,6 @@ maxClients = flag.Int("maxclients", 128, "Maximal amount of simultaneous clients") version = flag.Bool("version", false, "Print version information") warranty = flag.Bool("warranty", false, "Print warranty information") - Version string = "UNKNOWN" killed bool pypiURLParsed *url.URL ) diff --git a/gocheese.info.do b/gocheese.info.do index ae636dfcee87c95b788a17d3cf4a355f66be63dfd150d29b44d18285656fd753..8f8589619ede5259a0f4fda1150edd7f4efe78fc13cf82429537844fa995ed62 100644 --- a/gocheese.info.do +++ b/gocheese.info.do @@ -1,2 +1,6 @@ -redo-ifchange *.texi -${MAKEINFO:=makeinfo} -o $3 gocheese.texi +redo-ifchange *.texi VERSION +${MAKEINFO:-makeinfo} \ + -D "VERSION `cat VERSION`" \ + --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \ + --set-customization-variable OPEN_QUOTE_SYMBOL=\" \ + --output $3 gocheese.texi diff --git a/install.texi b/install.texi index 1e02a5c12aa667c4a7c1373bfdd0a4b19e8b96d3c64d9cbdb36ad6699c94b83e..90d8e5658f58a9972ede315ea6373ad2c0dd2b9604519df2785cc997a08e3daa 100644 --- a/install.texi +++ b/install.texi @@ -1,8 +1,6 @@ @node Install @unnumbered Install -@set VERSION 2.4.0 - Preferable way is to download tarball with the signature from website and, for example, run tests with benchmarks: @@ -12,17 +10,14 @@ $ [fetch|wget] http://www.gocheese.cypherpunks.ru/gocheese-@value{VERSION}.tar.xz.sig $ gpg --verify gocheese-@value{VERSION}.tar.xz.sig gocheese-@value{VERSION}.tar.xz $ xz -d < gocheese-@value{VERSION}.tar.xz | tar xf - $ cd gocheese-@value{VERSION} -$ redo all test +$ redo test all @end example It uses @url{http://cr.yp.to/redo.html, redo} build system for that examples. You can use either dozen of various implementations, or at -least minimalistic POSIX shell @code{apenwarr/do}: - -@example -$ [fetch|wget] https://github.com/apenwarr/redo/raw/master/minimal/do -$ mv do redo ; chmod +x redo -@end example +least minimalistic POSIX shell @command{contrib/do} (just replace +@command{redo} with @command{contrib/do} in the example above) included +in tarball. @include download.texi diff --git a/makedist.sh b/makedist.sh index d5bcd596be42630186d3305c6c77f157d90ec3675e3fbaf6ec3dc8ee5ea49955..43e3b53cfa3218df939ca7a3be374d9e1de12998d17d8a579c065bca61a06597 100755 --- a/makedist.sh +++ b/makedist.sh @@ -4,14 +4,20 @@ cur=$(pwd) tmp=$(mktemp -d) release=$1 [ -n "$release" ] -MAKEINFO=${MAKEINFO:=makeinfo} git clone . $tmp/gocheese-$release cd $tmp/gocheese-$release git checkout v$release -redo-ifchange module-name +redo-ifchange module-name VERSION mod_name=`cat module-name` + +cat > download.texi < download.texi < $texi < gocheese.do +rm -rf .redo .git .gitignore style.css makedist.sh www.do module-name.do VERSION.do +echo 'GOPATH=`pwd` ${GO:=go} build -o $3 `cat module-name`' > gocheese.do echo 'GOPATH=`pwd` ${GO:=go} test `cat module-name`/... >&2' > test.do +cp ~/work/redo/minimal/do contrib/do find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \; -chmod +x pyshop2packages.sh +chmod 755 contrib/pyshop2packages.sh contrib/do cd .. tar cvf gocheese-"$release".tar --uid=0 --gid=0 --numeric-owner gocheese-"$release" diff --git a/pyshop2packages.sh b/contrib/pyshop2packages.sh rename from pyshop2packages.sh rename to contrib/pyshop2packages.sh diff --git a/www.do b/www.do index 781c8bbbee122b6532dff71269f220bff26d3e8c37279c909b2d2568bcfd2b30..d7f43141b975f92f391a62f513424af540bc04948d447a92f512607d6716ff0f 100644 --- a/www.do +++ b/www.do @@ -1,12 +1,14 @@ -rm -f gocheese.html/*.html +redo-ifchange *.texi VERSION +html=gocheese.html +rm -f $html/*.html ${MAKEINFO:=makeinfo} --html \ + -D "VERSION `cat VERSION`" \ --set-customization-variable CSS_LINES="`cat style.css`" \ --set-customization-variable SHOW_TITLE=0 \ - --set-customization-variable USE_ACCESSKEY=0 \ --set-customization-variable DATE_IN_HEADER=1 \ --set-customization-variable TOP_NODE_UP_URL=index.html \ --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \ --set-customization-variable OPEN_QUOTE_SYMBOL=\" \ - -o gocheese.html gocheese.texi -find gocheese.html -type d -exec chmod 755 {} \; -find gocheese.html -type f -exec chmod 644 {} \; + -o $html gocheese.texi +find $html -type d -exec chmod 755 {} \; +find $html -type f -exec chmod 644 {} \;