X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist.sh;h=96946f12b662eac2770171e567923e1a415f6d4a;hb=0fad171c0d79ad583c0faf5427e22d1d62a0a52d;hp=21368a2a555f1b32965e1372bd4c06209a1c320f;hpb=e62f2727d30cd7166d88447c234dd1f3586f11e0;p=nncp.git

diff --git a/makedist.sh b/makedist.sh
index 21368a2..96946f1 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -8,98 +8,26 @@ release=$1
 git clone . $tmp/nncp-$release
 cd $tmp/nncp-$release
 git checkout v$release
-rm -fr .git
-
-mod_name=$(sed -n 's/^module //p' src/go.mod)
-mv src src.orig
-mkdir -p src/$mod_name
-mv src.orig/* src/$mod_name
-rmdir src.orig
-
-mods="
-github.com/davecgh/go-xdr
-github.com/dustin/go-humanize
-github.com/flynn/noise
-github.com/gorhill/cronexpr
-github.com/hjson/hjson-go
-github.com/klauspost/compress
-go.cypherpunks.ru/balloon
-golang.org/x/crypto
-golang.org/x/net
-golang.org/x/sys
-"
-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
-
-cat > $tmp/includes <<EOF
-golang.org/x/crypto/AUTHORS
-golang.org/x/crypto/blake2b
-golang.org/x/crypto/blake2s
-golang.org/x/crypto/chacha20
-golang.org/x/crypto/chacha20poly1305
-golang.org/x/crypto/CONTRIBUTORS
-golang.org/x/crypto/curve25519
-golang.org/x/crypto/ed25519
-golang.org/x/crypto/go.mod
-golang.org/x/crypto/go.sum
-golang.org/x/crypto/internal/subtle
-golang.org/x/crypto/LICENSE
-golang.org/x/crypto/nacl
-golang.org/x/crypto/PATENTS
-golang.org/x/crypto/poly1305
-golang.org/x/crypto/README.md
-golang.org/x/crypto/salsa20
-golang.org/x/crypto/ssh/terminal
-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
-golang.org/x/sys/unix
-EOF
-tar cfCI - src $tmp/includes | tar xfC - $tmp
-rm -fr src/golang.org $tmp/includes
-mv $tmp/golang.org src
-
-cat > $tmp/includes <<EOF
-compress/compressible.go
-compress/fse
-compress/huff0
-compress/LICENSE
-compress/README.md
-compress/zstd
-EOF
-cat > $tmp/excludes <<EOF
-*testdata*
-*_test.go
-snappy.go
-EOF
-tar cfCIX - src/github.com/klauspost $tmp/includes $tmp/excludes | tar xfC - $tmp
-rm -fr src/github.com/klauspost/compress $tmp/includes $tmp/excludes
-mv $tmp/compress src/github.com/klauspost
-
-find src -name .travis.yml -delete
-rm -fr src/github.com/davecgh/go-xdr/xdr
-rm -r src/github.com/flynn/noise/vector*
-rm src/github.com/hjson/hjson-go/build_release.sh
-rm src/github.com/gorhill/cronexpr/APLv2
-rm -fr ports
-rm makedist.sh
+redo VERSION
+cd src
+go mod vendor
+modvendor -v -copy="**/*_test.go **/words.go **/README.md **/main.go"
+cd vendor
+rm -r \
+    github.com/flynn/noise/vector* \
+    github.com/gorhill/cronexpr/APLv2 \
+    github.com/hjson/hjson-go/build_release.sh \
+    github.com/golang/snappy \
+    github.com/klauspost/compress/zstd/snappy.go \
+    golang.org/x/sys/plan9 \
+    golang.org/x/sys/windows
+find github.com/klauspost/compress golang.org/x/sys -name "*_test.go" -delete
+cd ../..
+rm -r ports
+find . \( -name .gitignore -o -name .travis.yml \) -delete
+
+mkdir contrib
+cp ~/work/redo/minimal/do contrib/do
 
 cat > doc/download.texi <<EOF
 @node Tarballs
@@ -111,13 +39,20 @@ perl -i -ne 'print unless /include pedro/' doc/index.texi doc/about.ru.texi
 perl -p -i -e 's/^(.verbatiminclude) .*$/$1 PUBKEY.asc/g' doc/integrity.texi
 mv doc/.well-known/openpgpkey/hu/i4cdqgcarfjdjnba6y4jnf498asg8c6p.asc PUBKEY.asc
 ln -s ../PUBKEY.asc doc
-make -C doc
+redo doc
 
 ########################################################################
 # Supplementary files autogeneration
 ########################################################################
 texi=$(TMPDIR=doc mktemp)
 
+mkinfo() {
+    ${MAKEINFO:-makeinfo} --plaintext \
+        --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \
+        --set-customization-variable OPEN_QUOTE_SYMBOL=\" \
+        -D "VERSION `cat VERSION`" $@
+}
+
 cat > $texi <<EOF
 \input texinfo
 @documentencoding UTF-8
@@ -127,7 +62,7 @@ cat > $texi <<EOF
 `sed -n '5,$p' < doc/news.texi`
 @bye
 EOF
-makeinfo --plaintext -o NEWS $texi
+mkinfo --output NEWS $texi
 
 cat > $texi <<EOF
 \input texinfo
@@ -138,7 +73,7 @@ cat > $texi <<EOF
 `sed -n '3,$p' < doc/news.ru.texi | sed 's/^@subsection/@section/'`
 @bye
 EOF
-makeinfo --plaintext -o NEWS.RU $texi
+mkinfo --output NEWS.RU $texi
 
 cat > $texi <<EOF
 \input texinfo
@@ -147,7 +82,7 @@ cat > $texi <<EOF
 @include install.texi
 @bye
 EOF
-makeinfo --plaintext -o INSTALL $texi
+mkinfo --output INSTALL $texi
 
 cat > $texi <<EOF
 \input texinfo
@@ -156,25 +91,31 @@ cat > $texi <<EOF
 `cat doc/thanks.texi`
 @bye
 EOF
-makeinfo --plaintext -o THANKS $texi
+mkinfo --output THANKS $texi
 
 rm -f $texi
+rm -r doc/.well-known doc/nncp.html/.well-known
 
 ########################################################################
 
-rm -r doc/.gitignore doc/.well-known doc/nncp.html/.well-known
-
+perl -i -npe "s/GO build/GO build -mod=vendor/" bin/default.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.sh VERSION.do
+rm -r .git
+redo-cleanup full
 find . -type d -exec chmod 755 {} \;
 find . -type f -exec chmod 644 {} \;
-find . -type f -name "*.sh" -exec chmod 755 {} \;
+find . -type f -name "*.sh" -exec chmod +x {} \;
+chmod +x contrib/do
 
 cd ..
 tar cvf nncp-"$release".tar --uid=0 --gid=0 --numeric-owner nncp-"$release"
 xz -9v nncp-"$release".tar
 gpg --detach-sign --sign --local-user releases@nncpgo.org nncp-"$release".tar.xz
-mv -v $tmp/nncp-"$release".tar.xz $tmp/nncp-"$release".tar.xz.sig $cur/doc/nncp.html/download
+mv -v $tmp/nncp-"$release".tar.xz $tmp/nncp-"$release".tar.xz.sig $cur/doc/download
 
-tarball=$cur/doc/nncp.html/download/nncp-"$release".tar.xz
+tarball=$cur/doc/download/nncp-"$release".tar.xz
 size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
@@ -229,7 +170,7 @@ GPG key ID: 0x2B25868E75A1A953 NNCP releases <releases@nncpgo.org>
 Fingerprint: 92C2 F0AE FE73 208E 46BF  F3DE 2B25 868E 75A1 A953
 
 Please send questions regarding the use of NNCP, bug reports and patches
-to mailing list: https://lists.cypherpunks.ru/pipermail/nncp-devel/
+to mailing list: http://lists.cypherpunks.ru/nncp_002ddevel.html
 EOF
 
 cat <<EOF
@@ -279,5 +220,5 @@ SHA256 хэш: $hash
 
 Пожалуйста, все вопросы касающиеся использования NNCP, отчёты об ошибках
 и патчи отправляйте в nncp-devel почтовую рассылку:
-https://lists.cypherpunks.ru/pipermail/nncp-devel/
+http://lists.cypherpunks.ru/nncp_002ddevel.html
 EOF