X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist.sh;h=6eb38a71863ea0d32a8db36074e5d2fe957157d2;hb=899fd251608c137ed4c6bab5fc2ec757a294b482;hp=b9e3d271f464a4a6fccd1a4216f8f9734f973045;hpb=bbf3a665eace9a901d6e4d48e85b9c6921e26bbf;p=gocheese.git

diff --git a/makedist.sh b/makedist.sh
index b9e3d27..6eb38a7 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -4,67 +4,14 @@ 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
-mod_name=`cat module-name`
-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
+redo-ifchange VERSION
 
-mods="
-golang.org/x/crypto
-golang.org/x/net
-"
-for mod in $mods; do
-    mod_path=$(sed -n "s# // indirect## ; s#^	\($mod\) \(.*\)\$#\1@\2#p" src/$mod_name/go.mod)
-    [ -n "$mod_path" ]
-    mkdir -p src/$mod
-    ( cd $GOPATH/pkg/mod/$mod_path ; tar cf - --exclude ".git*" * ) | tar xfC - src/$mod
-    chmod -R +w src/$mod
-done
-
-for mod in golang.org/x/sys; do
-    mod_path=$(sed -n "s#^\($mod\) \(.*\) h1:.*\$#\1@\2#p" src/$mod_name/go.sum | sed /go.mod/d | sort -n -r | sed -n 1p)
-    [ -n "$mod_path" ]
-    mkdir -p src/$mod
-    ( cd $GOPATH/pkg/mod/$mod_path ; tar cf - --exclude ".git*" * ) | tar xfC - src/$mod
-    chmod -R +w src/$mod
-done
-
-cat > $tmp/includes <<EOF
-golang.org/x/crypto/AUTHORS
-golang.org/x/crypto/argon2
-golang.org/x/crypto/blake2b
-golang.org/x/crypto/CONTRIBUTORS
-golang.org/x/crypto/go.mod
-golang.org/x/crypto/go.sum
-golang.org/x/crypto/LICENSE
-golang.org/x/crypto/PATENTS
-golang.org/x/crypto/README.md
-golang.org/x/net/AUTHORS
-golang.org/x/net/CONTRIBUTORS
-golang.org/x/net/go.mod
-golang.org/x/net/go.sum
-golang.org/x/net/LICENSE
-golang.org/x/net/netutil
-golang.org/x/net/PATENTS
-golang.org/x/net/README.md
-golang.org/x/sys/AUTHORS
-golang.org/x/sys/CONTRIBUTORS
-golang.org/x/sys/cpu
-golang.org/x/sys/go.mod
-golang.org/x/sys/LICENSE
-golang.org/x/sys/PATENTS
-golang.org/x/sys/README.md
-EOF
-tar cfCI - src $tmp/includes | tar xfC - $tmp
-rm -fr src/golang.org $tmp/includes
-mv $tmp/golang.org src
+go mod vendor
 
 cat > download.texi <<EOF
 You can obtain releases source code prepared tarballs on
@@ -72,6 +19,13 @@ You can obtain releases source code prepared tarballs on
 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
 \input texinfo
@@ -81,23 +35,24 @@ 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
-echo 'GOPATH=`pwd` ${GO:=go} test `cat module-name`/... >&2' > test.do
+rm -rf .redo .git .gitignore style.css makedist.sh www.do VERSION.do
+perl -i -npe "s/go} build/go} build -mod=vendor/" gocheese.do
+perl -i -npe "s/go} test/go} test -mod=vendor/" 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
+find . -type d -exec chmod 755 {} +
+find . -type f -exec chmod 644 {} +
+chmod +x contrib/pyshop2packages.sh contrib/do
 
 cd ..
 tar cvf gocheese-"$release".tar --uid=0 --gid=0 --numeric-owner gocheese-"$release"
-xz -9 gocheese-"$release".tar
-gpg --detach-sign --sign --local-user CD5CD01F55343D88 gocheese-"$release".tar.xz
+zstd -19 -v gocheese-"$release".tar
+gpg --detach-sign --sign --local-user CD5CD01F55343D88 gocheese-"$release".tar.zst
 
-tarball=gocheese-"$release".tar.xz
+tarball=gocheese-"$release".tar.zst
 size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
@@ -105,7 +60,7 @@ release_date=$(date "+%Y-%m-%d")
 cat <<EOF
 An entry for documentation:
 @item $release @tab $release_date @tab $size KiB
-@tab @url{gocheese-${release}.tar.xz, link} @url{gocheese-${release}.tar.xz.sig, sign}
+@tab @url{gocheese-${release}.tar.zst, link} @url{gocheese-${release}.tar.zst.sig, sign}
 @tab @code{$hash}
 EOF