From c4ba685eabd654adf3b45afc2b26e7e8f14a6ece Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 10 Jun 2019 11:15:22 +0200
Subject: [PATCH] Move helpers to a dedicated directory. The m4 dir might be
 there, too

---
 helpers/constcheck.sh                          | 18 ++++++++++++++++++
 .../regen-msvc}/libsodium.vcxproj              |  0
 .../regen-msvc}/libsodium.vcxproj.filters      |  0
 .../regen-msvc}/libsodium.vcxproj.filters.tpl  |  0
 .../regen-msvc}/libsodium.vcxproj.tpl          |  0
 .../regen-msvc}/regen-msvc.py                  |  0
 .../tl_libsodium.vcxproj.filters.tpl           |  0
 .../regen-msvc}/tl_libsodium.vcxproj.tpl       |  0
 8 files changed, 18 insertions(+)
 create mode 100755 helpers/constcheck.sh
 rename {regen-msvc => helpers/regen-msvc}/libsodium.vcxproj (100%)
 rename {regen-msvc => helpers/regen-msvc}/libsodium.vcxproj.filters (100%)
 rename {regen-msvc => helpers/regen-msvc}/libsodium.vcxproj.filters.tpl (100%)
 rename {regen-msvc => helpers/regen-msvc}/libsodium.vcxproj.tpl (100%)
 rename {regen-msvc => helpers/regen-msvc}/regen-msvc.py (100%)
 rename {regen-msvc => helpers/regen-msvc}/tl_libsodium.vcxproj.filters.tpl (100%)
 rename {regen-msvc => helpers/regen-msvc}/tl_libsodium.vcxproj.tpl (100%)

diff --git a/helpers/constcheck.sh b/helpers/constcheck.sh
new file mode 100755
index 00000000..f5d49e0e
--- /dev/null
+++ b/helpers/constcheck.sh
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+CT='ct.c'
+
+echo '#include <assert.h>' > "$CT"
+echo '#include <sodium.h>' >> "$CT"
+echo 'int main(void) {' >> "$CT"
+for macro in $(egrep -r '#define crypto_.*BYTES ' src/libsodium/include | \
+               cut -d: -f2- | cut -d' ' -f2 | \
+               fgrep -v edwards25519sha512batch | sort -u); do
+  func=$(echo "$macro" | tr A-Z a-z)
+  echo "  assert($func() == $macro);" >> "$CT"
+done
+echo "return 0; }" >> "$CT"
+
+cc -Wno-deprecated-declarations "$CT" -lsodium && ./a.out
+rm -f a.out "$CT"
+
diff --git a/regen-msvc/libsodium.vcxproj b/helpers/regen-msvc/libsodium.vcxproj
similarity index 100%
rename from regen-msvc/libsodium.vcxproj
rename to helpers/regen-msvc/libsodium.vcxproj
diff --git a/regen-msvc/libsodium.vcxproj.filters b/helpers/regen-msvc/libsodium.vcxproj.filters
similarity index 100%
rename from regen-msvc/libsodium.vcxproj.filters
rename to helpers/regen-msvc/libsodium.vcxproj.filters
diff --git a/regen-msvc/libsodium.vcxproj.filters.tpl b/helpers/regen-msvc/libsodium.vcxproj.filters.tpl
similarity index 100%
rename from regen-msvc/libsodium.vcxproj.filters.tpl
rename to helpers/regen-msvc/libsodium.vcxproj.filters.tpl
diff --git a/regen-msvc/libsodium.vcxproj.tpl b/helpers/regen-msvc/libsodium.vcxproj.tpl
similarity index 100%
rename from regen-msvc/libsodium.vcxproj.tpl
rename to helpers/regen-msvc/libsodium.vcxproj.tpl
diff --git a/regen-msvc/regen-msvc.py b/helpers/regen-msvc/regen-msvc.py
similarity index 100%
rename from regen-msvc/regen-msvc.py
rename to helpers/regen-msvc/regen-msvc.py
diff --git a/regen-msvc/tl_libsodium.vcxproj.filters.tpl b/helpers/regen-msvc/tl_libsodium.vcxproj.filters.tpl
similarity index 100%
rename from regen-msvc/tl_libsodium.vcxproj.filters.tpl
rename to helpers/regen-msvc/tl_libsodium.vcxproj.filters.tpl
diff --git a/regen-msvc/tl_libsodium.vcxproj.tpl b/helpers/regen-msvc/tl_libsodium.vcxproj.tpl
similarity index 100%
rename from regen-msvc/tl_libsodium.vcxproj.tpl
rename to helpers/regen-msvc/tl_libsodium.vcxproj.tpl