From 2b809c56a0df61a4219de195374f5f3fad0b185a Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 19 Sep 2022 06:16:25 -0700 Subject: [PATCH] Move things to util/ and update docs+build system references --- DEVELOPING.md | 2 +- Makefile.am | 4 ++-- contrib/devtools/README.md | 2 +- doc/release-process.md | 6 +++--- src/Makefile.am | 4 ++-- {contrib/devtools => util}/security-check.py | 0 {contrib/devtools => util}/symbol-check.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename {contrib/devtools => util}/security-check.py (100%) rename {contrib/devtools => util}/symbol-check.py (99%) diff --git a/DEVELOPING.md b/DEVELOPING.md index 069fb7496..1de87fcc6 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -78,7 +78,7 @@ of a dependency or something inside of Rust, you will need `build.sh` . Make sure that you have updated all version numbers in hushd and compiled, then to generate new unix man pages for that version : - ./contrib/devtools/gen-manpages.sh + ./util/gen-manpages.sh ## Generating new debian packages diff --git a/Makefile.am b/Makefile.am index de977adfc..b76763e10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,8 +24,8 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md) -BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \ - $(top_srcdir)/contrib/devtools/security-check.py +BIN_CHECKS=$(top_srcdir)/util/symbol-check.py \ + $(top_srcdir)/util/security-check.py diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index fa03b6cff..1b82a47f0 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -14,7 +14,7 @@ still compatible with the minimum supported Linux distribution versions. Example usage after a gitian build: - find ../gitian-builder/build -type f -executable | xargs python contrib/devtools/symbol-check.py + find ../gitian-builder/build -type f -executable | xargs python util/symbol-check.py If only supported symbols are used the return value will be 0 and the output will be empty. diff --git a/doc/release-process.md b/doc/release-process.md index 715ff2e0f..7e1bdd39e 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -61,7 +61,7 @@ Install deps on Linux: - To make a pre-release "beta" you can modify `CLIENT_VERSION_BUILD` but that is rarely done in Hush world. - A `CLIENT_VERSION_BUILD` of 50 means "actual non-beta release" - Make sure to keep the values in configure.ac and src/clientversion.h the same. The variables are prefixed wth an underscore in configure.ac - - Run ./contrib/devtools/gen-manpages.sh, commit + push results + - Run ./util/gen-manpages.sh, commit + push results - PROTIP: Man page creation must be done after updating the version number and recompiling and before Debian package creation - Update checkpoints in src/chainparams.cpp via util/checkpoints.pl - checkpoints.pl will just generate the data you need, it must be manually copied into the correct place @@ -69,12 +69,12 @@ Install deps on Linux: - Checkpoints make block verification a bit faster, because nodes can say "is this block a descendant of a checkpoint block" instead of doing full consensus checks, which take more time - Checkpoints also provide a bit of security against some attacks that would create malicious chainforks - Update man pages - - Update copyright years (if applicable) with contrib/devtools/replace.pl + - Update copyright years (if applicable) with util/replace.pl - Do a fresh clone and fresh sync with new checkpoints - Stop node, wait 20 minutes, and then do a partial sync with new checkpoints - Make Gitea release - Make Git Tag (Gitea can do this) - - Use contrib/devtools/gen-linux-binary-release.sh to make a Linux release binary + - Use util/gen-linux-binary-release.sh to make a Linux release binary - Use util/build-debian-package.sh to make an x86 Debian package for the release - Use util/build-debian-package-ARM.sh (does this still work?) to make an ARM Debian package for the release - Upload the debian packages to the Gitea release page, with SHA256 sums diff --git a/src/Makefile.am b/src/Makefile.am index 797aac856..6a3e3dab8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -683,13 +683,13 @@ clean-local: check-symbols: $(bin_PROGRAMS) if GLIBC_BACK_COMPAT @echo "Checking glibc back compat of [$(bin_PROGRAMS)]..." - $(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(top_srcdir)/contrib/devtools/symbol-check.py $(bin_PROGRAMS) + $(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(top_srcdir)/util/symbol-check.py $(bin_PROGRAMS) endif check-security: $(bin_PROGRAMS) if HARDEN @echo "Checking binary security of [$(bin_PROGRAMS)]..." - $(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(top_srcdir)/contrib/devtools/security-check.py $(bin_PROGRAMS) + $(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(top_srcdir)/util/security-check.py $(bin_PROGRAMS) endif %.pb.cc %.pb.h: %.proto diff --git a/contrib/devtools/security-check.py b/util/security-check.py similarity index 100% rename from contrib/devtools/security-check.py rename to util/security-check.py diff --git a/contrib/devtools/symbol-check.py b/util/symbol-check.py similarity index 99% rename from contrib/devtools/symbol-check.py rename to util/symbol-check.py index e86b54b2b..312f27e5e 100755 --- a/contrib/devtools/symbol-check.py +++ b/util/symbol-check.py @@ -10,7 +10,7 @@ still compatible with the minimum supported Linux distribution versions. Example usage: - find ../gitian-builder/build -type f -executable | xargs python contrib/devtools/symbol-check.py + find ../gitian-builder/build -type f -executable | xargs python util/symbol-check.py ''' from __future__ import division, print_function import subprocess