Merge branch 'develop'

[nncp.git] / makedist

diff --git a/makedist b/makedist
index cc9cbc38f52c01619e3801990253da35dde00a6a..1455f9d0035a8a3f010e6ba82192c78ede7f8d6e 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -1,5 +1,6 @@
 #!/bin/sh -ex
 
+PATH=$HOME/work/meta4ra/contrib:$PATH
 cur=$(pwd)
 tmp=$(mktemp -d)
 release=$1
@@ -8,7 +9,7 @@ release=$1
 git clone . $tmp/nncp-$release
 cd $tmp/nncp-$release
 git checkout v$release
-redo VERSION
+./version > VERSION
 cd src
 go mod vendor
 modvendor -v -copy="**/*_test.go **/words.go **/README.md **/main.go"
@@ -16,7 +17,7 @@ cd vendor
 rm -r \
     github.com/flynn/noise/vector* \
     github.com/gorhill/cronexpr/APLv2 \
-    github.com/hjson/hjson-go/build_release.sh \
+    github.com/hjson/hjson-go/v4/build_release.sh \
     github.com/klauspost/compress/gen.sh \
     github.com/klauspost/compress/gzhttp \
     github.com/klauspost/compress/internal/snapref \
@@ -35,9 +36,6 @@ find . \( \
     -name .goreleaser.yml -o \
     -name .gitattributes \) -delete
 
-mkdir contrib
-cp ~/work/redo/apenwarr/minimal/do contrib/do
-
 cat > doc/download.texi <<EOF
 @node Tarballs
 @section Prepared tarballs
@@ -105,16 +103,15 @@ rm -r doc/.well-known
 
 ########################################################################
 
-perl -i -npe "s/GO build/GO build -mod=vendor/" bin/default.do bin/hjson-cli.do
-perl -i -npe "s/GO list/GO list -mod=vendor/" bin/default.do
-perl -i -npe "s/GO test/GO test -mod=vendor/" test.do
-rm makedist VERSION.do
-rm -r .git
+perl -i -npe "s/GO build/GO build -mod=vendor/" bin/build
+perl -i -npe "s/GO list/GO list -mod=vendor/" bin/build
+rm makedist version
+rm -r .git t
 redo-cleanup full
 find . -type d -exec chmod 755 {} +
 find . -type f -exec chmod 644 {} +
 find . -type f -name "*.sh" -exec chmod +x {} +
-chmod +x contrib/do
+chmod +x bin/build install install-strip uninstall
 
 cd ..
 tar cvf nncp-"$release".tar --uid=0 --gid=0 --numeric-owner nncp-"$release"
@@ -180,6 +177,7 @@ Source code and its signature for that version can be found here:
 
     http://www.nncpgo.org/download/nncp-${release}.tar.xz ($size KiB)
     http://www.nncpgo.org/download/nncp-${release}.tar.xz.asc
+    http://www.nncpgo.org/download/nncp-${release}.tar.xz.sig
 
 OpenPGP key: 92C2 F0AE FE73 208E 46BF  F3DE 2B25 868E 75A1 A953
              NNCP releases <releases@nncpgo.org>
@@ -235,6 +233,7 @@ $(git cat-file -p v$release | sed -n '6,/^.*BEGIN/p' | sed '$d')
 
     http://www.nncpgo.org/download/nncp-${release}.tar.xz ($size KiB)
     http://www.nncpgo.org/download/nncp-${release}.tar.xz.asc
+    http://www.nncpgo.org/download/nncp-${release}.tar.xz.sig
 
 OpenPGP ключ: 92C2 F0AE FE73 208E 46BF  F3DE 2B25 868E 75A1 A953
               NNCP releases <releases@nncpgo.org>