.gitignore | 2 -- doc/.gitignore | 1 + doc/install.texi | 4 ++-- doc/news.texi | 9 +++++++++ makedist.sh | 58 ++++++++++------------------------------------------- module-name.do | 2 -- usage.go | 2 +- diff --git a/.gitignore b/.gitignore index 92ea4e35f49ed203570bef50af2af8456b984db90d8c2112e5376c0c5a4cb00f..21ac9e786dd84d34524ee02ae005fcd51e3ad6b508e291d89a74a471a253ca1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ /goredo -/goredo.info -/module-name /redo /redo-always /redo-cleanup diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..7cfed757f4bbb1d5f65d416c787d8692eff26f6b835df5aed445609bf399ce8b --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1 @@ +/goredo.info diff --git a/doc/install.texi b/doc/install.texi index 28dda57e54b31b41ca1ab8f4e361633453af0b92f3faf7f1deb0eba41596d3bc..6d97285c94a2df558f58f69c66ba278f49ab0ca61e564a25d6de9dd629392739 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -13,8 +13,8 @@ $ [fetch|wget] http://www.goredo.cypherpunks.ru/download/goredo-@value{VERSION}.tar.zst $ [fetch|wget] http://www.goredo.cypherpunks.ru/download/goredo-@value{VERSION}.tar.zst.sig $ gpg --verify goredo-@value{VERSION}.tar.zst.sig goredo-@value{VERSION}.tar.zst $ zstd -d < goredo-@value{VERSION}.tar.zst | tar xf - -$ cd goredo-@value{VERSION} -$ GOPATH=`pwd` go build go.cypherpunks.ru/goredo +$ cd goredo-@value{VERSION}/src +$ go build -mod=vendor $ ./goredo -symlinks # create redo-* commands symlinks $ export PATH=`pwd`:$PATH # let your system know about goredo @end example diff --git a/doc/news.texi b/doc/news.texi index 51e7241a5ac8a1fe5babd914f9b115a304426d2e78488a898c6018307d76ada5..073c2802656d4492ad170fc8e016269828b356dc93fd2a21ace20f23a5758630 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -1,6 +1,15 @@ @node News @unnumbered News +@anchor{Release 0.12.1} +@section Release 0.12.1 +@itemize +@item + Tarball uses @file{vendor} directory without @env{GOPATH} + overriding. @command{goredo} and its dependencies anyway uses Go + 1.12+ versions, that have @file{vendor}-ing support. +@end itemize + @anchor{Release 0.12.0} @section Release 0.12.0 @itemize diff --git a/makedist.sh b/makedist.sh index 51fc82d6f73f7480f048ea9dfc21179d666c290ef4bf4d20183443e4f84abfa7..b487bf312c2ac5635f79af564f783af60217db442769aa0fec5c2e298e781d54 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 @@ -65,54 +64,19 @@ 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 <