X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist.sh;h=85d815389b370676f3646eaa5dc3a9688a0869ea;hb=480ab4060b2762490e72a2a89ddf3d106f1402e1;hp=e891eca22527f9d04310ab02e98ffd8fe5bc3481;hpb=a698abb36d3ab6fa380660ffdf9863dcd47df2ff;p=goredo.git

diff --git a/makedist.sh b/makedist.sh
index e891eca..85d8153 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -9,8 +9,7 @@ git clone . $tmp/goredo-$release
 cd $tmp/goredo-$release
 git checkout v$release
 
-redo-ifchange module-name VERSION
-mod_name=`cat module-name`
+redo-ifchange VERSION
 
 ########################################################################
 cd doc
@@ -49,61 +48,40 @@ EOF
 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 NEWS INSTALL ..
+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 doc makedist.sh module-name* VERSION.do
+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"
@@ -129,7 +107,8 @@ 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 ------------------------
 
@@ -150,5 +129,5 @@ 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