From 37fa94e01d34e288a9fb4666fb85266547a2bfe0 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Mon, 20 Apr 2020 11:36:17 -0600 Subject: [PATCH 1/2] Add Rust resources to distribution tarball. --- Makefile.am | 4 +++- src/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d2eb90192..7f32fc576 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,7 +155,9 @@ endif dist_bin_SCRIPTS = zcutil/fetch-params.sh dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh -EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/rpc-tests qa/zcash $(DIST_DOCS) $(BIN_CHECKS) +RUST_DIST = $(top_srcdir)/.cargo $(top_srcdir)/Cargo.toml $(top_srcdir)/Cargo.lock rust-toolchain + +EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/rpc-tests qa/zcash $(DIST_DOCS) $(BIN_CHECKS) $(RUST_DIST) install-exec-hook: mv $(DESTDIR)$(bindir)/fetch-params.sh $(DESTDIR)$(bindir)/zcash-fetch-params diff --git a/src/Makefile.am b/src/Makefile.am index 62f48495b..3b911af92 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -616,7 +616,7 @@ CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno */*.gcno wal DISTCLEANFILES = obj/build.h -EXTRA_DIST = leveldb +EXTRA_DIST = leveldb rust clean-local: rm -f $(top_srcdir)/.cargo/config $(top_srcdir)/.cargo/.configured-for-* From 08e6ed154c4753c8913409c993ee9b960cf0f540 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Mon, 20 Apr 2020 14:53:48 -0600 Subject: [PATCH 2/2] Add test_random.h to distribution tarball. --- src/Makefile.test.include | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 6e6a9072d..8798ee94b 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -99,6 +99,7 @@ BITCOIN_TESTS =\ test/streams_tests.cpp \ test/test_bitcoin.cpp \ test/test_bitcoin.h \ + test/test_random.h \ test/torcontrol_tests.cpp \ test/transaction_tests.cpp \ test/txvalidationcache_tests.cpp \