Version refactoring

[gocheese.git] / makedist.sh

diff --git a/makedist.sh b/makedist.sh
index b9e3d271f464a4a6fccd1a4216f8f9734f973045..87e7b6f988d32dd022347249bae203f51126de69 100755 (executable)
--- 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 <<EOF
+You can obtain releases source code prepared tarballs on
+@url{http://www.gocheese.cypherpunks.ru/}.
+EOF
+redo gocheese.info
+
 crypto_mod_path=$(sed -n 's#^require \(golang.org/x/crypto\) \(.*\)$#\1@\2#p' go.mod)
 mkdir -p src/$mod_name
 mv *.go go.mod go.sum src/$mod_name
@@ -66,11 +72,12 @@ tar cfCI - src $tmp/includes | tar xfC - $tmp
 rm -fr src/golang.org $tmp/includes
 mv $tmp/golang.org src
 
-cat > download.texi <<EOF
-You can obtain releases source code prepared tarballs on
-@url{http://www.gocheese.cypherpunks.ru/}.
-EOF
-redo gocheese.info
+mkinfo() {
+    ${MAKEINFO:=makeinfo} --plaintext \
+        --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \
+        --set-customization-variable OPEN_QUOTE_SYMBOL=\" \
+        -D "VERSION `cat VERSION`" $@
+}
 
 texi=$(mktemp)
 cat > $texi <<EOF
@@ -81,16 +88,17 @@ cat > $texi <<EOF
 @bye
 EOF
 perl -i -p -e "s/.verbatiminclude PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
-$MAKEINFO --plaintext -o INSTALL $texi
+mkinfo --output INSTALL $texi
 rm $texi
 
-rm -rf .redo .git .gitignore style.css makedist.sh www.do module-name.do
-echo 'GOPATH=`pwd` ${GO:=go} build -o $3 -ldflags "-X main.Version=`cat VERSION`" `cat module-name`' > 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"