X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist.sh;h=aa647f4d9cf2422eda9fc6c235f4741707ff9c2e;hb=fed124f1460226ab037657bac5717bdb49bf6b78;hp=3353af22fd5ec751463daab7901fdde1b790228f;hpb=5bb5106f8120241abc5725497d0060014da16c17;p=goredo.git

diff --git a/makedist.sh b/makedist.sh
index 3353af2..aa647f4 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -8,22 +8,21 @@ release=$1
 git clone . $tmp/goredo-$release
 cd $tmp/goredo-$release
 git checkout v$release
+go generate
 
-redo-ifchange module-name VERSION
-mod_name=`cat module-name`
+redo-ifchange VERSION
 
 ########################################################################
+cd doc
 cat > download.texi <<EOF
 You can obtain releases source code prepared tarballs on
 @url{http://www.goredo.cypherpunks.ru/}.
 EOF
-redo goredo.info
 
 mkinfo() {
     ${MAKEINFO:-makeinfo} --plaintext \
-        --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \
-        --set-customization-variable OPEN_QUOTE_SYMBOL=\" \
-        -D "VERSION `cat VERSION`" $@
+        --set-customization-variable ASCII_PUNCTUATION=1 \
+        -D "VERSION `cat ../VERSION`" $@
 }
 
 texi=$(mktemp)
@@ -33,7 +32,6 @@ cat > $texi <<EOF
 @documentencoding UTF-8
 @settitle NEWS
 @node News
-@unnumbered News
 `sed -n '3,$p' < news.texi`
 @bye
 EOF
@@ -46,87 +44,79 @@ cat > $texi <<EOF
 @include install.texi
 @bye
 EOF
-perl -i -p -e "s/.verbatiminclude PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
+perl -i -p -e "s/.verbatiminclude .*PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
 mkinfo --output INSTALL $texi
 
+cat > $texi <<EOF
+\input texinfo
+@documentencoding UTF-8
+@settitle THANKS
+`cat thanks.texi`
+@bye
+EOF
+mkinfo --output THANKS $texi
+
 rm $texi
+redo goredo.info
+mv goredo.info INSTALL NEWS THANKS ..
+cd ..
 
 ########################################################################
 
-mkdir -p src/$mod_name
-mv *.go go.* src/$mod_name
-
-mods="
-go.cypherpunks.ru/recfile
-go.cypherpunks.ru/tai64n
-golang.org/x/crypto
-golang.org/x/sys
-golang.org/x/term
-"
-
-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/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/sys/AUTHORS
-golang.org/x/sys/CONTRIBUTORS
-golang.org/x/sys/cpu
-golang.org/x/sys/go.mod
-golang.org/x/sys/internal/unsafeheader
-golang.org/x/sys/LICENSE
-golang.org/x/sys/PATENTS
-golang.org/x/sys/README.md
-golang.org/x/sys/unix
-golang.org/x/term
-EOF
-tar cfCI - src $tmp/includes | tar xfC - $tmp
-rm -fr src/golang.org $tmp/includes
-mv $tmp/golang.org src
+mkdir -p src
+mv *.go go.* src
+cd src
+go mod vendor
+modvendor -v -copy="**/*_test.go **/private-gen.go **/main.go **/vectors.json **/gen.go"
+rm -rf vendor/golang.org/x/sys/plan9 vendor/golang.org/x/sys/windows
+find vendor/golang.org/x/sys -name "*_test.go" -delete
+find . \( -name .gitignore -o -name .travis.yml \) -delete
+cd ..
 
 ########################################################################
 
-rm -rf *.texi .redo .git .gitignore makedist.sh goredo.info.do module-name* VERSION.do
-find . -type d -exec chmod 755 {} \;
-find . -type f -exec chmod 644 {} \;
+rm -rf *.texi .redo .git .gitignore doc makedist.sh VERSION.do
+find . -type d -exec chmod 755 {} +
+find . -type f -exec chmod 644 {} +
+find t/redo-sh.tests -name test -exec chmod +x {} +
+find t -name wrapper.rc -exec chmod +x {} +
+chmod +x t/apenwarr/sleep t/goredo-*.t
 
 cd ..
 tar cvf goredo-"$release".tar --uid=0 --gid=0 --numeric-owner goredo-"$release"
 zstd -19 -v goredo-"$release".tar
-gpg --detach-sign --sign --local-user 3A528DDE952C7E93 goredo-"$release".tar.zst
-
 tarball=goredo-"$release".tar.zst
+gpg --detach-sign --sign --local-user 3A528DDE952C7E93 "$tarball"
+gpg --enarmor < "$tarball".sig |
+    sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc
+meta4-create -file "$tarball" -mtime "$tarball" -sig "$tarball".asc \
+    http://www.goredo.cypherpunks.ru/download/"$tarball" \
+    http://y.www.goredo.cypherpunks.ru/download/"$tarball" > "$tarball".meta4
+
 size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
 
+release_underscored=`echo $release | tr . _`
 cat <<EOF
 An entry for documentation:
-@item @ref{Release $release, $release} @tab $release_date @tab $size KiB
-@tab @url{download/goredo-${release}.tar.zst, link} @url{download/goredo-${release}.tar.zst.sig, sign}
+@item @ref{Release $release_underscored, $release} @tab $release_date @tab $size KiB
+@tab
+    @url{download/$tarball.meta4, meta4}
+    @url{download/$tarball, link}
+    @url{download/$tarball.sig, sig}
 @tab @code{$hash}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $cur/goredo.html/download
+mv $tmp/$tarball $tmp/"$tarball".sig $tarball.meta4 $cur/doc/goredo.html/download
 
 cat <<EOF
 Subject: goredo $release release announcement
 
 I am pleased to announce goredo $release release availability!
 
-goredo is redo implementation on pure Go.
+goredo is Go implementation of djb's redo,
+Makefile replacement that sucks less.
 
 ------------------------ >8 ------------------------
 
@@ -147,5 +137,9 @@ GPG key ID: 0x3A528DDE952C7E93 goredo releases <goredo@cypherpunks.ru>
 Fingerprint: 7531 BB84 FAF0 BF35 960C  63B9 3A52 8DDE 952C 7E93
 
 Please send questions regarding the use of goredo, bug reports and patches
-to mailing list: https://lists.cypherpunks.ru/pipermail/goredo-devel/
+to mailing list: http://lists.cypherpunks.ru/goredo_002ddevel.html
 EOF
+
+echo mutt -s \"goredo $release release announcement\" \
+    goredo-devel@lists.cypherpunks.ru \
+    -a $cur/doc/goredo.html/download/"$tarball".meta4