Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-12 19:20:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'rm_minisketch-28+k' into svg_icon-28+knots

Browse Source
This commit is contained in:
Luke Dashjr 2025-02-07 16:23:47 +00:00
commit f3aa488cfb
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/test/03_test_script.sh
View File

@ -143,7 +143,6 @@ du -sh "${PREVIOUS_RELEASES_DIR}"
if [[ $HOST = *-mingw32 ]]; then
# Generate all binaries, so that they can be wrapped
make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
make "$MAKEJOBS" -C src minisketch/test.exe VERBOSE=1
"${BASE_ROOT_DIR}/ci/test/wrap-wine.sh"
fi

7
contrib/guix/libexec/make_release_tarball.sh
View File

@ -14,7 +14,12 @@ set -ex
GIT_ARCHIVE="$1"
DISTNAME="$2"
git archive --prefix="${DISTNAME}/" HEAD | tar -xp
git archive --prefix="${DISTNAME}/" HEAD | tar -xp --exclude '*minisketch*'
# Generate correct build info file from git, before we lose git
GIT_BUILD_INFO="$(share/genbuild.sh /dev/stdout)"
sed 's/\/\/ No build information available/'"${GIT_BUILD_INFO}"'/' -i "${DISTNAME}/share/genbuild.sh"
cd "${DISTNAME}"
./autogen.sh

11
share/genbuild.sh
View File

@ -18,9 +18,14 @@ else
exit 1
fi
# This checks that we are actually part of the intended git repository, and not just getting info about some unrelated git repository that the code happens to be in a directory under
git_check_in_repo() {
! { git status --porcelain -uall --ignored "$@" 2>/dev/null || echo '??'; } | grep -q '?'
}
GIT_TAG=""
GIT_COMMIT=""
if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then
# clean 'dirty' status of touched files that haven't been modified
git diff >/dev/null 2>/dev/null
@ -40,7 +45,9 @@ if [ -n "$GIT_TAG" ]; then
elif [ -n "$GIT_COMMIT" ]; then
NEWINFO="#define BUILD_GIT_COMMIT \"$GIT_COMMIT\""
else
NEWINFO="// No build information available"
# NOTE: The NEWINFO line below this comment gets replaced by a string-match in contrib/guix/libexec/make_release_tarball.sh
# If changing it, update the script too!
NEWINFO='// No build information available'
fi
# only update build.h if necessary

4
src/Makefile.am
View File

@ -231,7 +231,6 @@ BITCOIN_CORE_H = \
node/mempool_persist_args.h \
node/miner.h \
node/mini_miner.h \
node/minisketchwrapper.h \
node/peerman_args.h \
node/protocol_version.h \
node/psbt.h \
@ -436,7 +435,6 @@ libbitcoin_node_a_SOURCES = \
node/mempool_persist_args.cpp \
node/miner.cpp \
node/mini_miner.cpp \
node/minisketchwrapper.cpp \
node/peerman_args.cpp \
node/psbt.cpp \
node/timeoffsets.cpp \
@ -1108,8 +1106,6 @@ endif
echo "};"; \
} > "$@.new" && mv -f "$@.new" "$@"
include Makefile.minisketch.include
if EMBEDDED_LEVELDB
include Makefile.crc32c.include
include Makefile.leveldb.include

2
src/Makefile.test.include
View File

@ -114,7 +114,6 @@ BITCOIN_TESTS =\
test/miner_tests.cpp \
test/miniminer_tests.cpp \
test/miniscript_tests.cpp \
test/minisketch_tests.cpp \
test/multisig_tests.cpp \
test/net_peer_connection_tests.cpp \
test/net_peer_eviction_tests.cpp \
@ -343,7 +342,6 @@ test_fuzz_fuzz_SOURCES = \
test/fuzz/merkleblock.cpp \
test/fuzz/message.cpp \
test/fuzz/miniscript.cpp \
test/fuzz/minisketch.cpp \
test/fuzz/mini_miner.cpp \
test/fuzz/muhash.cpp \
test/fuzz/multiplication_overflow.cpp \