From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 3 Aug 2023 14:18:22 +0000 (+0300)
Subject: No redo during installation
X-Git-Tag: v5.12.0~1
X-Git-Url: http://www.git.cypherpunks.ru/?p=gogost.git;a=commitdiff_plain;h=eb3c28c5170bd08b047cba754ae18eb268c227b6

No redo during installation
---

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index fd85e30..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-VERSION
diff --git a/TODO b/TODO
deleted file mode 100644
index 7938d48..0000000
--- a/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* 28147-89 and CryptoPro key wrapping (RFC 4357)
-* 28147-89 CryptoPro key meshing for CFB mode (RFC 4357)
diff --git a/VERSION.do b/VERSION.do
deleted file mode 100644
index a66c2df..0000000
--- a/VERSION.do
+++ /dev/null
@@ -1,2 +0,0 @@
-redo-ifchange gogost.go
-perl -ne 'print "$1\n" if /Version.*"(.*)"$/' < gogost.go
diff --git a/all.do b/all.do
deleted file mode 100644
index 8e4f885..0000000
--- a/all.do
+++ /dev/null
@@ -1 +0,0 @@
-redo-ifchange streebog256 streebog512
diff --git a/bench b/bench
new file mode 100755
index 0000000..fcf1907
--- /dev/null
+++ b/bench
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+exec go test -benchmem -bench . ./...
diff --git a/bench.do b/bench.do
deleted file mode 100644
index 8136d2e..0000000
--- a/bench.do
+++ /dev/null
@@ -1,2 +0,0 @@
-exec >&2
-go test -benchmem -bench . ./...
diff --git a/clean.do b/clean.do
deleted file mode 100644
index 1b6ba08..0000000
--- a/clean.do
+++ /dev/null
@@ -1 +0,0 @@
-rm -f streebog256 streebog512 VERSION
diff --git a/default.do b/default.do
deleted file mode 100644
index fc883f9..0000000
--- a/default.do
+++ /dev/null
@@ -1 +0,0 @@
-go build -o $3 ./cmd/$1
diff --git a/install.texi b/install.texi
index 210b073..fec94eb 100644
--- a/install.texi
+++ b/install.texi
@@ -10,17 +10,11 @@ $ [fetch|wget] http://www.gogost.cypherpunks.ru/gogost-@value{VERSION}.tar.zst.a
 $ gpg --verify gogost-@value{VERSION}.tar.zst.asc gogost-@value{VERSION}.tar.zst
 $ zstd --decompress --stdout gogost-@value{VERSION}.tar.zst | tar xf -
 $ cd gogost-@value{VERSION}
-$ redo all
+$ go build -mod=vendor -o streebog256 ./cmd/streebog256
 $ echo hello world | ./streebog256
 f72018189a5cfb803dbe1f2149cf554c40093d8e7f81c21e08ac5bcd09d9934d
 @end example
 
-It uses @url{http://cr.yp.to/redo.html, redo} build system for that
-examples. You can use either dozen of various implementations, or at
-least minimalistic POSIX shell @command{contrib/do} (just replace
-@command{redo} with @command{contrib/do} in the example above) included
-in tarball.
-
 @include download.texi
 
 And then you can include its source code in your project for example
diff --git a/makedist b/makedist
index 2db3575..1cf553e 100755
--- a/makedist
+++ b/makedist
@@ -9,10 +9,8 @@ redo-ifchange streebog256
 git clone . $tmp/gogost-$release
 cd $tmp/gogost-$release
 git checkout v$release
-redo VERSION
+./version > VERSION
 go mod vendor
-mkdir contrib
-cp ~/work/redo/apenwarr/minimal/do contrib/do
 
 cat > download.texi <<EOF
 You can obtain releases source code prepared tarballs on
@@ -55,23 +53,13 @@ mkinfo --output FAQ $texi
 
 rm -rf .git
 redo-cleanup full
-rm -f \
-    $texi \
-    *.texi \
-    .gitignore \
-    clean.do \
-    makedist.sh \
-    style.css \
-    TODO \
-    VERSION.do \
-    www.do
-
-perl -i -npe "s/build/build -mod=vendor/" default.do
-perl -i -npe "s/test/test -mod=vendor/" bench.do
+rm -f $texi *.texi makedist version www.do
+
+perl -i -npe "s/test/test -mod=vendor/" bench
 
 find . -type d -exec chmod 755 {} +
 find . -type f -exec chmod 644 {} +
-chmod +x contrib/do
+chmod +x bench
 
 cd ..
 tar cvf gogost-"$release".tar --uid=0 --gid=0 --numeric-owner gogost-"$release"
diff --git a/version b/version
new file mode 100755
index 0000000..0775f20
--- /dev/null
+++ b/version
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+exec perl -ne 'print "$1\n" if /Version.*"(.*)"$/' < "$(realpath -- $(dirname "$0"))"/gogost.go
diff --git a/www.do b/www.do
index 3947d45..b3fdb84 100644
--- a/www.do
+++ b/www.do
@@ -1,8 +1,8 @@
-redo-ifchange *.texi VERSION
+redo-ifchange *.texi
 html=gogost.html
 rm -f $html/*.html
 ${MAKEINFO:-makeinfo} --html \
-    -D "VERSION `cat VERSION`" \
+    -D "VERSION `./VERSION`" \
     --set-customization-variable NO_CSS=1 \
     --set-customization-variable SECTION_NAME_IN_TITLE=1 \
     --set-customization-variable TREE_TRANSFORMATIONS=complete_tree_nodes_menus \