Merge branch 'develop'

[nncp.git] / makedist.sh

diff --git a/makedist.sh b/makedist.sh
index 311c2daec523c8e535baaf25c1419cc06a091ff9..21368a2a555f1b32965e1372bd4c06209a1c320f 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -10,7 +10,7 @@ cd $tmp/nncp-$release
 git checkout v$release
 rm -fr .git
 
-mod_name=go.cypherpunks.ru/nncp/v5
+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
@@ -22,6 +22,7 @@ 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
@@ -39,13 +40,13 @@ 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/chacha20
 golang.org/x/crypto/internal/subtle
 golang.org/x/crypto/LICENSE
 golang.org/x/crypto/nacl
@@ -75,6 +76,23 @@ 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*
@@ -89,23 +107,24 @@ cat > doc/download.texi <<EOF
 You can obtain releases source code prepared tarballs on
 @url{http://www.nncpgo.org/}.
 EOF
+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
 
 ########################################################################
 # Supplementary files autogeneration
 ########################################################################
-texi=`mktemp`
+texi=$(TMPDIR=doc mktemp)
 
 cat > $texi <<EOF
 \input texinfo
 @documentencoding UTF-8
 @settitle NEWS
-
 @node News
 @unnumbered News
-
 `sed -n '5,$p' < doc/news.texi`
-
 @bye
 EOF
 makeinfo --plaintext -o NEWS $texi
@@ -114,48 +133,35 @@ cat > $texi <<EOF
 \input texinfo
 @documentencoding UTF-8
 @settitle NEWS.RU
-
 @node Новости
 @unnumbered Новости
-
 `sed -n '3,$p' < doc/news.ru.texi | sed 's/^@subsection/@section/'`
-
 @bye
 EOF
 makeinfo --plaintext -o NEWS.RU $texi
 
-rm -f $texi
-
-texi=$(TMPDIR=doc mktemp)
 cat > $texi <<EOF
 \input texinfo
 @documentencoding UTF-8
 @settitle INSTALL
-
 @include install.texi
-
 @bye
 EOF
 makeinfo --plaintext -o INSTALL $texi
-rm -f $texi
-
-texi=`mktemp`
 
 cat > $texi <<EOF
 \input texinfo
 @documentencoding UTF-8
 @settitle THANKS
-
 `cat doc/thanks.texi`
-
 @bye
 EOF
 makeinfo --plaintext -o THANKS $texi
+
 rm -f $texi
 
 ########################################################################
 
-mv doc/.well-known/openpgpkey/hu/i4cdqgcarfjdjnba6y4jnf498asg8c6p.asc PUBKEY.asc
 rm -r doc/.gitignore doc/.well-known doc/nncp.html/.well-known
 
 find . -type d -exec chmod 755 {} \;
@@ -207,7 +213,7 @@ online TCP daemon with full-duplex resumable data transmission exists.
 
 The main improvements for that release are:
 
-$(git cat-file -p $release | sed -n '6,/^.*BEGIN/p' | sed '$d')
+$(git cat-file -p v$release | sed -n '6,/^.*BEGIN/p' | sed '$d')
 
 ------------------------ >8 ------------------------
 
@@ -255,7 +261,7 @@ NNCP (Node to Node copy) это набор утилит упрощающий б
 
 Основные усовершенствования в этом релизе:
 
-$(git cat-file -p $release | sed -n '6,/^.*BEGIN/p' | sed '$d')
+$(git cat-file -p v$release | sed -n '6,/^.*BEGIN/p' | sed '$d')
 
 ------------------------ >8 ------------------------