X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist.sh;h=7889d49e01726b8829ab44f6ff9902d25a21021c;hb=89cfc56cd7a844fc51475c5817b3b531ba6130d1;hp=0e9ec01762ef05516dbdde9c73f8fb85ca4d9953;hpb=407dbee34b6f748c662e8dc58efc3a2d0e273c58;p=goredo.git

diff --git a/makedist.sh b/makedist.sh
index 0e9ec01..7889d49 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
@@ -53,7 +52,7 @@ cat > $texi <<EOF
 \input texinfo
 @documentencoding UTF-8
 @settitle THANKS
-`cat doc/thanks.texi`
+`cat thanks.texi`
 @bye
 EOF
 mkinfo --output THANKS $texi
@@ -65,56 +64,29 @@ cd ..
 
 ########################################################################
 
-mkdir -p src/$mod_name
-mv *.go go.* src/$mod_name
-
-mods="
-go.cypherpunks.ru/recfile
-go.cypherpunks.ru/tai64n
-golang.org/x/sys
-golang.org/x/term
-lukechampine.com/blake3
-"
-
-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
-
-for mod in github.com/klauspost/cpuid; do
-    mod_path=$(sed -n "s#^\($mod\) \(.*\) h1:.*\$#\1@\2#p" src/$mod_name/go.sum | sed /go.mod/d | sort -n -r | sed -n 1p)
-    [ -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/sys/AUTHORS
-golang.org/x/sys/CONTRIBUTORS
-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
+
+rm vendor/lukechampine.com/blake3/cpu_darwin.go
+sed -n -i.tmp '3,$p' vendor/lukechampine.com/blake3/cpu.go
+rm vendor/lukechampine.com/blake3/cpu.go.tmp
 
-rm -r src/golang.org/x/sys/unix/linux
-rm -r src/github.com/klauspost/cpuid/private src/github.com/klauspost/cpuid/testdata
+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"