From 6174ba2d5c3195c731848d91b4036d9f4d0a363f Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sat, 21 Mar 2020 16:38:30 +0000 Subject: [PATCH 1/8] Add a `zcutil/clean.sh` script that works (unlike `make clean`). Signed-off-by: Daira Hopwood --- zcutil/clean.sh | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100755 zcutil/clean.sh diff --git a/zcutil/clean.sh b/zcutil/clean.sh new file mode 100755 index 000000000..4d591dd4d --- /dev/null +++ b/zcutil/clean.sh @@ -0,0 +1,76 @@ +#!/bin/sh +# Copyright (c) 2020 The Zcash developers + +rm -rf depends/*-*-* +rm -rf depends/built +rm -rf depends/sources +rm -rf target + +rm -f src/Makefile +rm -f src/Makefile.in +rm -f doc/man/Makefile +rm -f doc/man/Makefile.in + +rm -f src/config/stamp-h1 +rm -f src/config/bitcoin-config.h +rm -f src/obj/build.h +rm -f src/leveldb/build_config.mk +rm -f src/test/buildenv.py +rm -f src/test/data/alertTests.raw.h + +rm -f .cargo/config +rm -f .cargo/.configured-for-offline + +rm -f qa/pull-tester/run-bitcoind-for-test.sh +rm -f qa/pull-tester/tests-config.sh + +rm -rf src/test/data/*.json.h + +rm -f src/bench/bench_bitcoin +rm -f src/zcash-cli +rm -f src/zcashd +rm -f src/zcash-gtest +rm -f src/zcash-tx +rm -f src/test/test_bitcoin + +find src -type f -and \( -name '*.Po' -or -name '*.Plo' -or -name '*.o' -or -name '*.a' -or -name '*.la' -or -name '*.lo' -or -name '*.lai' -or -name '*.pc' -or -name '.dirstamp' \) -delete +find . -depth -path '*/.deps/*' -or \( -type d -and -name '.deps' \) -delete + +cleanme() +{ + rm -rf "$1/autom4te.cache" + rm -f "$1/build-aux/compile" + rm -f "$1/build-aux/config.guess" + rm -f "$1/build-aux/config.sub" + rm -f "$1/build-aux/depcomp" + rm -f "$1/build-aux/install-sh" + rm -f "$1/build-aux/ltmain.sh" + rm -f "$1/build-aux/missing" + rm -f "$1/build-aux/test-driver" + rm -f "$1/build-aux/m4/libtool.m4" + rm -f "$1/build-aux/m4/lt~obsolete.m4" + rm -f "$1/build-aux/m4/ltoptions.m4" + rm -f "$1/build-aux/m4/ltsugar.m4" + rm -f "$1/build-aux/m4/ltversion.m4" + rm -f "$1/aclocal.m4" + rm -f "$1/config.log" + rm -f "$1/config.status" + rm -f "$1/gen_context" + rm -f "$1/configure" + rm -f "$1/libtool" + rm -f "$1/Makefile" + rm -f "$1/Makefile.in" + rm -f "$1/$2" + rm -f "$1/$2~" +} + +cleanme . src/config/bitcoin-config.h.in + +cleanme src/secp256k1 src/libsecp256k1-config.h.in +rm -f src/secp256k1/src/ecmult_static_context.h +rm -f src/secp256k1/src/libsecp256k1-config.h +rm -f src/secp256k1/src/stamp-h1 + +cleanme src/univalue univalue-config.h.in +rm -f src/univalue/univalue-config.h +rm -f src/univalue/stamp-h1 From 4718c1e3069f50c3e347518f4a3fe555add8e447 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sat, 21 Mar 2020 19:34:22 +0000 Subject: [PATCH 2/8] Split into clean.sh and distclean.sh. Signed-off-by: Daira Hopwood --- zcutil/clean.sh | 8 -------- zcutil/distclean.sh | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) create mode 100755 zcutil/distclean.sh diff --git a/zcutil/clean.sh b/zcutil/clean.sh index 4d591dd4d..acbf467ee 100755 --- a/zcutil/clean.sh +++ b/zcutil/clean.sh @@ -1,11 +1,6 @@ #!/bin/sh # Copyright (c) 2020 The Zcash developers -rm -rf depends/*-*-* -rm -rf depends/built -rm -rf depends/sources -rm -rf target - rm -f src/Makefile rm -f src/Makefile.in rm -f doc/man/Makefile @@ -18,9 +13,6 @@ rm -f src/leveldb/build_config.mk rm -f src/test/buildenv.py rm -f src/test/data/alertTests.raw.h -rm -f .cargo/config -rm -f .cargo/.configured-for-offline - rm -f qa/pull-tester/run-bitcoind-for-test.sh rm -f qa/pull-tester/tests-config.sh diff --git a/zcutil/distclean.sh b/zcutil/distclean.sh new file mode 100755 index 000000000..822a8d963 --- /dev/null +++ b/zcutil/distclean.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Copyright (c) 2020 The Zcash developers + +zcutil/clean.sh + +rm -rf depends/*-*-* +rm -rf depends/built +rm -rf depends/sources +rm -rf target + +rm -f .cargo/config +rm -f .cargo/.configured-for-offline From 531e2b290fa7baecdabb47d6a7a760cccc0a7fc6 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Thu, 26 Mar 2020 13:39:22 +0000 Subject: [PATCH 3/8] Minor refactoring. Signed-off-by: Daira Hopwood --- zcutil/clean.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zcutil/clean.sh b/zcutil/clean.sh index acbf467ee..1d28141c2 100755 --- a/zcutil/clean.sh +++ b/zcutil/clean.sh @@ -16,7 +16,7 @@ rm -f src/test/data/alertTests.raw.h rm -f qa/pull-tester/run-bitcoind-for-test.sh rm -f qa/pull-tester/tests-config.sh -rm -rf src/test/data/*.json.h +rm -f src/test/data/*.json.h rm -f src/bench/bench_bitcoin rm -f src/zcash-cli @@ -28,7 +28,7 @@ rm -f src/test/test_bitcoin find src -type f -and \( -name '*.Po' -or -name '*.Plo' -or -name '*.o' -or -name '*.a' -or -name '*.la' -or -name '*.lo' -or -name '*.lai' -or -name '*.pc' -or -name '.dirstamp' \) -delete find . -depth -path '*/.deps/*' -or \( -type d -and -name '.deps' \) -delete -cleanme() +clean_dep() { rm -rf "$1/autom4te.cache" rm -f "$1/build-aux/compile" @@ -56,13 +56,13 @@ cleanme() rm -f "$1/$2~" } -cleanme . src/config/bitcoin-config.h.in +clean_dep . src/config/bitcoin-config.h.in -cleanme src/secp256k1 src/libsecp256k1-config.h.in +clean_dep src/secp256k1 src/libsecp256k1-config.h.in rm -f src/secp256k1/src/ecmult_static_context.h rm -f src/secp256k1/src/libsecp256k1-config.h rm -f src/secp256k1/src/stamp-h1 -cleanme src/univalue univalue-config.h.in +clean_dep src/univalue univalue-config.h.in rm -f src/univalue/univalue-config.h rm -f src/univalue/stamp-h1 From 9f6278e305fbf7b16e9bc7f2559bf87628c40376 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Thu, 26 Mar 2020 13:41:48 +0000 Subject: [PATCH 4/8] Executables end with .exe on Windows. Signed-off-by: Daira Hopwood --- zcutil/clean.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/zcutil/clean.sh b/zcutil/clean.sh index 1d28141c2..0b13e21c2 100755 --- a/zcutil/clean.sh +++ b/zcutil/clean.sh @@ -18,16 +18,15 @@ rm -f qa/pull-tester/tests-config.sh rm -f src/test/data/*.json.h -rm -f src/bench/bench_bitcoin -rm -f src/zcash-cli -rm -f src/zcashd -rm -f src/zcash-gtest -rm -f src/zcash-tx -rm -f src/test/test_bitcoin find src -type f -and \( -name '*.Po' -or -name '*.Plo' -or -name '*.o' -or -name '*.a' -or -name '*.la' -or -name '*.lo' -or -name '*.lai' -or -name '*.pc' -or -name '.dirstamp' \) -delete find . -depth -path '*/.deps/*' -or \( -type d -and -name '.deps' \) -delete +clean_exe() +{ + rm -f "$1" "$1.exe" +} + clean_dep() { rm -rf "$1/autom4te.cache" @@ -56,6 +55,13 @@ clean_dep() rm -f "$1/$2~" } +clean_exe src/bench/bench_bitcoin +clean_exe src/zcash-cli +clean_exe src/zcashd +clean_exe src/zcash-gtest +clean_exe src/zcash-tx +clean_exe src/test/test_bitcoin + clean_dep . src/config/bitcoin-config.h.in clean_dep src/secp256k1 src/libsecp256k1-config.h.in From 457437ef05417ffbd36c3a929dc98325d4af4f1b Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Thu, 26 Mar 2020 13:44:06 +0000 Subject: [PATCH 5/8] Avoid spurious error messages when cleaning up directories. Signed-off-by: Daira Hopwood --- zcutil/clean.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/zcutil/clean.sh b/zcutil/clean.sh index 0b13e21c2..9456e2e6c 100755 --- a/zcutil/clean.sh +++ b/zcutil/clean.sh @@ -20,7 +20,11 @@ rm -f src/test/data/*.json.h find src -type f -and \( -name '*.Po' -or -name '*.Plo' -or -name '*.o' -or -name '*.a' -or -name '*.la' -or -name '*.lo' -or -name '*.lai' -or -name '*.pc' -or -name '.dirstamp' \) -delete -find . -depth -path '*/.deps/*' -or \( -type d -and -name '.deps' \) -delete +clean_dirs() +{ + find . -depth -path "*/$1/*" -delete + find . -type d -name "$1" -delete +} clean_exe() { @@ -55,6 +59,8 @@ clean_dep() rm -f "$1/$2~" } +clean_dirs .deps + clean_exe src/bench/bench_bitcoin clean_exe src/zcash-cli clean_exe src/zcashd From 6b8c0bc928188668f6cbea19edab831df9eb88d5 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Thu, 26 Mar 2020 13:44:50 +0000 Subject: [PATCH 6/8] Address review comments. Signed-off-by: Daira Hopwood --- zcutil/clean.sh | 28 +++++++++++++++++++++++++++- zcutil/distclean.sh | 6 ++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/zcutil/clean.sh b/zcutil/clean.sh index 9456e2e6c..7b54224ef 100755 --- a/zcutil/clean.sh +++ b/zcutil/clean.sh @@ -6,6 +6,10 @@ rm -f src/Makefile.in rm -f doc/man/Makefile rm -f doc/man/Makefile.in +rm -f .cargo/config +rm -f .cargo/.configured-for-online +rm -f .cargo/.configured-for-offline + rm -f src/config/stamp-h1 rm -f src/config/bitcoin-config.h rm -f src/obj/build.h @@ -17,9 +21,16 @@ rm -f qa/pull-tester/run-bitcoind-for-test.sh rm -f qa/pull-tester/tests-config.sh rm -f src/test/data/*.json.h +rm -f src/test/data/*.raw.h +rm -f src/fuzz.cpp + +rm -rf test_bitcoin.coverage/ zcash-gtest.coverage/ total.coverage/ + +rm -rf cache + +find src -type f -and \( -name '*.Po' -or -name '*.Plo' -or -name '*.o' -or -name '*.a' -or -name '*.la' -or -name '*.lo' -or -name '*.lai' -or -name '*.pc' -or -name '.dirstamp' -or -name '*.gcda' -or -name '*.gcno' -or -name '*.sage.py' -or -name '*.trs' \) -delete -find src -type f -and \( -name '*.Po' -or -name '*.Plo' -or -name '*.o' -or -name '*.a' -or -name '*.la' -or -name '*.lo' -or -name '*.lai' -or -name '*.pc' -or -name '.dirstamp' \) -delete clean_dirs() { find . -depth -path "*/$1/*" -delete @@ -60,6 +71,8 @@ clean_dep() } clean_dirs .deps +clean_dirs .libs +clean_dirs __pycache__ clean_exe src/bench/bench_bitcoin clean_exe src/zcash-cli @@ -68,13 +81,26 @@ clean_exe src/zcash-gtest clean_exe src/zcash-tx clean_exe src/test/test_bitcoin +clean_exe src/leveldb/db_bench +clean_exe src/leveldb/leveldbutil +rm -f src/leveldb/*_test src/leveldb/*_test.exe +rm -f src/leveldb/*.so src/leveldb/*.so.* + clean_dep . src/config/bitcoin-config.h.in clean_dep src/secp256k1 src/libsecp256k1-config.h.in rm -f src/secp256k1/src/ecmult_static_context.h rm -f src/secp256k1/src/libsecp256k1-config.h rm -f src/secp256k1/src/stamp-h1 +rm -f src/secp256k1/.so_locations +clean_exe src/secp256k1/tests +clean_exe src/secp256k1/exhaustive_tests +rm -f src/secp256k1/tests.log src/secp256k1/exhaustive-tests.log src/secp256k1/test-suite.log clean_dep src/univalue univalue-config.h.in rm -f src/univalue/univalue-config.h rm -f src/univalue/stamp-h1 +clean_exe src/univalue/test_json +clean_exe src/univalue/unitester +clean_exe src/univalue/no_nul +rm -f src/univalue/test/*.log diff --git a/zcutil/distclean.sh b/zcutil/distclean.sh index 822a8d963..674dc4b82 100755 --- a/zcutil/distclean.sh +++ b/zcutil/distclean.sh @@ -4,9 +4,11 @@ zcutil/clean.sh rm -rf depends/*-*-* +rm -rf depends/work rm -rf depends/built rm -rf depends/sources rm -rf target -rm -f .cargo/config -rm -f .cargo/.configured-for-offline +rm -rf afl-temp +rm -rf src/fuzzing/*/output + From 62142660b065e3230e761fbc2d9b526527ae748f Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Mon, 30 Mar 2020 15:06:14 +0100 Subject: [PATCH 7/8] Remove a redundant `rm -f` command. Signed-off-by: Daira Hopwood --- zcutil/clean.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zcutil/clean.sh b/zcutil/clean.sh index 7b54224ef..12b7fe9d0 100755 --- a/zcutil/clean.sh +++ b/zcutil/clean.sh @@ -14,15 +14,14 @@ rm -f src/config/stamp-h1 rm -f src/config/bitcoin-config.h rm -f src/obj/build.h rm -f src/leveldb/build_config.mk + rm -f src/test/buildenv.py -rm -f src/test/data/alertTests.raw.h +rm -f src/test/data/*.json.h +rm -f src/test/data/*.raw.h rm -f qa/pull-tester/run-bitcoind-for-test.sh rm -f qa/pull-tester/tests-config.sh -rm -f src/test/data/*.json.h -rm -f src/test/data/*.raw.h - rm -f src/fuzz.cpp rm -rf test_bitcoin.coverage/ zcash-gtest.coverage/ total.coverage/ From 47b05ab801a7eb418723181a151022b19f42bb77 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Wed, 15 Apr 2020 12:08:11 +0100 Subject: [PATCH 8/8] Address review comments: `target` and `depends/work` should be cleaned by clean.sh. Signed-off-by: Daira Hopwood --- zcutil/clean.sh | 2 ++ zcutil/distclean.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zcutil/clean.sh b/zcutil/clean.sh index 12b7fe9d0..57c00f74a 100755 --- a/zcutil/clean.sh +++ b/zcutil/clean.sh @@ -27,6 +27,8 @@ rm -f src/fuzz.cpp rm -rf test_bitcoin.coverage/ zcash-gtest.coverage/ total.coverage/ rm -rf cache +rm -rf target +rm -rf depends/work find src -type f -and \( -name '*.Po' -or -name '*.Plo' -or -name '*.o' -or -name '*.a' -or -name '*.la' -or -name '*.lo' -or -name '*.lai' -or -name '*.pc' -or -name '.dirstamp' -or -name '*.gcda' -or -name '*.gcno' -or -name '*.sage.py' -or -name '*.trs' \) -delete diff --git a/zcutil/distclean.sh b/zcutil/distclean.sh index 674dc4b82..acb5c1f4f 100755 --- a/zcutil/distclean.sh +++ b/zcutil/distclean.sh @@ -4,10 +4,8 @@ zcutil/clean.sh rm -rf depends/*-*-* -rm -rf depends/work rm -rf depends/built rm -rf depends/sources -rm -rf target rm -rf afl-temp rm -rf src/fuzzing/*/output