aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/devtools/README.md6
-rwxr-xr-xcontrib/devtools/optimize-pngs.py76
-rwxr-xr-xcontrib/gitian-descriptors/assign_DISTNAME12
-rw-r--r--contrib/gitian-descriptors/gitian-linux.yml12
-rw-r--r--contrib/gitian-descriptors/gitian-osx.yml12
-rw-r--r--contrib/gitian-descriptors/gitian-win.yml15
-rwxr-xr-xcontrib/gitian-descriptors/make_git_archive20
-rw-r--r--contrib/guix/README.md1
-rwxr-xr-xcontrib/guix/guix-build.sh1
-rw-r--r--contrib/guix/libexec/build.sh37
-rw-r--r--contrib/guix/manifest.scm3
-rw-r--r--contrib/valgrind.supp13
12 files changed, 60 insertions, 148 deletions
diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index f5533719c0..bdff7a84b0 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -89,12 +89,6 @@ example:
BUILDDIR=$PWD/build contrib/devtools/gen-manpages.sh
```
-optimize-pngs.py
-================
-
-A script to optimize png files in the bitcoin
-repository (requires pngcrush).
-
security-check.py and test-security-check.py
============================================
diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py
deleted file mode 100755
index e9481dbbcf..0000000000
--- a/contrib/devtools/optimize-pngs.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2014-2018 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-'''
-Run this script every time you change one of the png files. Using pngcrush, it will optimize the png files, remove various color profiles, remove ancillary chunks (alla) and text chunks (text).
-#pngcrush -brute -ow -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem alla -rem text
-'''
-import os
-import sys
-import subprocess
-import hashlib
-from PIL import Image # pip3 install Pillow
-
-def file_hash(filename):
- '''Return hash of raw file contents'''
- with open(filename, 'rb') as f:
- return hashlib.sha256(f.read()).hexdigest()
-
-def content_hash(filename):
- '''Return hash of RGBA contents of image'''
- i = Image.open(filename)
- i = i.convert('RGBA')
- data = i.tobytes()
- return hashlib.sha256(data).hexdigest()
-
-pngcrush = 'pngcrush'
-git = 'git'
-folders = ["src/qt/res/movies", "src/qt/res/icons", "share/pixmaps"]
-basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel'], universal_newlines=True, encoding='utf8').rstrip('\n')
-totalSaveBytes = 0
-noHashChange = True
-
-outputArray = []
-for folder in folders:
- absFolder=os.path.join(basePath, folder)
- for file in os.listdir(absFolder):
- extension = os.path.splitext(file)[1]
- if extension.lower() == '.png':
- print("optimizing {}...".format(file), end =' ')
- file_path = os.path.join(absFolder, file)
- fileMetaMap = {'file' : file, 'osize': os.path.getsize(file_path), 'sha256Old' : file_hash(file_path)}
- fileMetaMap['contentHashPre'] = content_hash(file_path)
-
- try:
- subprocess.call([pngcrush, "-brute", "-ow", "-rem", "gAMA", "-rem", "cHRM", "-rem", "iCCP", "-rem", "sRGB", "-rem", "alla", "-rem", "text", file_path],
- stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
- except:
- print("pngcrush is not installed, aborting...")
- sys.exit(0)
-
- #verify
- if "Not a PNG file" in subprocess.check_output([pngcrush, "-n", "-v", file_path], stderr=subprocess.STDOUT, universal_newlines=True, encoding='utf8'):
- print("PNG file "+file+" is corrupted after crushing, check out pngcursh version")
- sys.exit(1)
-
- fileMetaMap['sha256New'] = file_hash(file_path)
- fileMetaMap['contentHashPost'] = content_hash(file_path)
-
- if fileMetaMap['contentHashPre'] != fileMetaMap['contentHashPost']:
- print("Image contents of PNG file {} before and after crushing don't match".format(file))
- sys.exit(1)
-
- fileMetaMap['psize'] = os.path.getsize(file_path)
- outputArray.append(fileMetaMap)
- print("done")
-
-print("summary:\n+++++++++++++++++")
-for fileDict in outputArray:
- oldHash = fileDict['sha256Old']
- newHash = fileDict['sha256New']
- totalSaveBytes += fileDict['osize'] - fileDict['psize']
- noHashChange = noHashChange and (oldHash == newHash)
- print(fileDict['file']+"\n size diff from: "+str(fileDict['osize'])+" to: "+str(fileDict['psize'])+"\n old sha256: "+oldHash+"\n new sha256: "+newHash+"\n")
-
-print("completed. Checksum stable: "+str(noHashChange)+". Total reduction: "+str(totalSaveBytes)+" bytes")
diff --git a/contrib/gitian-descriptors/assign_DISTNAME b/contrib/gitian-descriptors/assign_DISTNAME
new file mode 100755
index 0000000000..a2ca768aaa
--- /dev/null
+++ b/contrib/gitian-descriptors/assign_DISTNAME
@@ -0,0 +1,12 @@
+# Copyright (c) 2020 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# A helper script to be sourced into the gitian descriptors
+
+if RECENT_TAG="$(git describe --exact-match HEAD)"; then
+ VERSION="${RECENT_TAG#v}"
+else
+ VERSION="$(git rev-parse --short=12 HEAD)"
+fi
+DISTNAME="bitcoin-${VERSION}"
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index f421372e10..0ed1e16f7e 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -140,9 +140,15 @@ script: |
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
export PATH=${WRAP_DIR}:${PATH}
- # Create the git archive, and define DISTNAME and GIT_ARCHIVE variables.
- # shellcheck source=contrib/gitian-descriptors/make_git_archive
- source contrib/gitian-descriptors/make_git_archive
+ # Define DISTNAME variable.
+ # shellcheck source=contrib/gitian-descriptors/assign_DISTNAME
+ source contrib/gitian-descriptors/assign_DISTNAME
+
+ GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz"
+
+ # Create the source tarball
+ mkdir -p "$(dirname "$GIT_ARCHIVE")"
+ git archive --output="$GIT_ARCHIVE" HEAD
ORIGPATH="$PATH"
# Extract the git archive into a dir for each host and build
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 82f8f194fc..bbae7201e5 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -103,9 +103,15 @@ script: |
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
export PATH=${WRAP_DIR}:${PATH}
- # Create the git archive, and define DISTNAME and GIT_ARCHIVE variables.
- # shellcheck source=contrib/gitian-descriptors/make_git_archive
- source contrib/gitian-descriptors/make_git_archive
+ # Define DISTNAME variable.
+ # shellcheck source=contrib/gitian-descriptors/assign_DISTNAME
+ source contrib/gitian-descriptors/assign_DISTNAME
+
+ GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz"
+
+ # Create the source tarball
+ mkdir -p "$(dirname "$GIT_ARCHIVE")"
+ git archive --output="$GIT_ARCHIVE" HEAD
ORIGPATH="$PATH"
# Extract the git archive into a dir for each host and build
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 54ad68a2a3..d05b6d426d 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -108,9 +108,15 @@ script: |
create_per-host_compiler_wrapper "${REFERENCE_DATETIME}"
export PATH=${WRAP_DIR}:${PATH}
- # Create the git archive, and define DISTNAME and GIT_ARCHIVE variables.
- # shellcheck source=contrib/gitian-descriptors/make_git_archive
- source contrib/gitian-descriptors/make_git_archive
+ # Define DISTNAME variable.
+ # shellcheck source=contrib/gitian-descriptors/assign_DISTNAME
+ source contrib/gitian-descriptors/assign_DISTNAME
+
+ GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz"
+
+ # Create the source tarball
+ mkdir -p "$(dirname "$GIT_ARCHIVE")"
+ git archive --output="$GIT_ARCHIVE" HEAD
ORIGPATH="$PATH"
# Extract the git archive into a dir for each host and build
@@ -127,9 +133,8 @@ script: |
make ${MAKEOPTS}
make ${MAKEOPTS} -C src check-security
make ${MAKEOPTS} -C src check-symbols
- make deploy
+ make deploy BITCOIN_WIN_INSTALLER="${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
make install DESTDIR=${INSTALLPATH}
- cp -f ./bitcoin-*-win64-setup-unsigned.exe ${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe
cd installed
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
find . -name "lib*.la" -delete
diff --git a/contrib/gitian-descriptors/make_git_archive b/contrib/gitian-descriptors/make_git_archive
deleted file mode 100755
index d922c94c60..0000000000
--- a/contrib/gitian-descriptors/make_git_archive
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2020 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
-# A helper script to be sourced into the gitian descriptors
-
-mkdir -p ${OUTDIR}/src
-RECENT_TAG=$(git describe --abbrev=0 HEAD)
-if [ $RECENT_TAG = $(git describe HEAD) ]; then
- if [[ $RECENT_TAG == v* ]]; then
- VERSION=${RECENT_TAG:1}
- else
- VERSION=$RECENT_TAG
- fi
-else
- VERSION=$(git rev-parse --short HEAD)
-fi
-DISTNAME=bitcoin-${VERSION}
-GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz"
-git archive --output=$GIT_ARCHIVE HEAD
diff --git a/contrib/guix/README.md b/contrib/guix/README.md
index 9f99b36f88..8ce8cb97a0 100644
--- a/contrib/guix/README.md
+++ b/contrib/guix/README.md
@@ -13,7 +13,6 @@ We achieve bootstrappability by using Guix as a functional package manager.
Conservatively, a x86_64 machine with:
-- 2 or more logical cores
- 4GB of free disk space on the partition that /gnu/store will reside in
- 24GB of free disk space on the partition that the Bitcoin Core git repository
resides in
diff --git a/contrib/guix/guix-build.sh b/contrib/guix/guix-build.sh
index e20b2a048d..11d2c8b867 100755
--- a/contrib/guix/guix-build.sh
+++ b/contrib/guix/guix-build.sh
@@ -105,6 +105,7 @@ for host in ${HOSTS=x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv
--pure \
--no-cwd \
--share="$PWD"=/bitcoin \
+ --expose="$(git rev-parse --git-common-dir)" \
${SOURCES_PATH:+--share="$SOURCES_PATH"} \
${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \
-- env HOST="$host" \
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 550b1b8f40..01f4518c73 100644
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -141,19 +141,17 @@ make -C depends --jobs="$MAX_JOBS" HOST="$HOST" \
# Source Tarball Building #
###########################
-# Create the source tarball and move it to "${OUTDIR}/src" if not already there
-if [ -z "$(find "${OUTDIR}/src" -name 'bitcoin-*.tar.gz')" ]; then
- ./autogen.sh
- env CONFIG_SITE="${BASEPREFIX}/${HOST}/share/config.site" ./configure --prefix=/
- make dist GZIP_ENV='-9n' ${V:+V=1}
- mkdir -p "${OUTDIR}/src"
- mv "$(find "${PWD}" -name 'bitcoin-*.tar.gz')" "${OUTDIR}/src/"
-fi
+# Define DISTNAME variable.
+# shellcheck source=contrib/gitian-descriptors/assign_DISTNAME
+source contrib/gitian-descriptors/assign_DISTNAME
-# Determine the full path to our source tarball
-SOURCEDIST="$(find "${OUTDIR}/src" -name 'bitcoin-*.tar.gz')"
-# Determine our distribution name (e.g. bitcoin-0.18.0)
-DISTNAME="$(basename "$SOURCEDIST" '.tar.gz')"
+GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz"
+
+# Create the source tarball if not already there
+if [ ! -e "$GIT_ARCHIVE" ]; then
+ mkdir -p "$(dirname "$GIT_ARCHIVE")"
+ git archive --output="$GIT_ARCHIVE" HEAD
+fi
###########################
# Binary Tarball Building #
@@ -187,7 +185,9 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
cd "$DISTSRC"
# Extract the source tarball
- tar --strip-components=1 -xf "${SOURCEDIST}"
+ tar -xf "${GIT_ARCHIVE}"
+
+ ./autogen.sh
# Configure this DISTSRC for $HOST
# shellcheck disable=SC2086
@@ -220,7 +220,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
# Make the os-specific installers
case "$HOST" in
*mingw*)
- make deploy ${V:+V=1}
+ make deploy ${V:+V=1} BITCOIN_WIN_INSTALLER="${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
;;
esac
@@ -232,11 +232,6 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
# Install built Bitcoin Core to $INSTALLPATH
make install DESTDIR="${INSTALLPATH}" ${V:+V=1}
- case "$HOST" in
- *mingw*)
- cp -f --target-directory="$OUTDIR" ./*-setup-unsigned.exe
- ;;
- esac
(
cd installed
@@ -264,7 +259,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
cp "${DISTSRC}/doc/README_windows.txt" "${DISTNAME}/readme.txt"
;;
*linux*)
- cp "${DISTSRC}/doc/README.md" "${DISTNAME}/"
+ cp "${DISTSRC}/README.md" "${DISTNAME}/"
;;
esac
@@ -307,7 +302,7 @@ case "$HOST" in
(
cd ./windeploy
mkdir unsigned
- cp --target-directory=unsigned/ "$OUTDIR"/bitcoin-*-setup-unsigned.exe
+ cp --target-directory=unsigned/ "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
find . -print0 \
| sort --zero-terminated \
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 86c1a8d27f..5e011ea184 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -17,6 +17,7 @@
(gnu packages pkg-config)
(gnu packages python)
(gnu packages shells)
+ (gnu packages version-control)
(guix build-system gnu)
(guix build-system trivial)
(guix gexp)
@@ -181,6 +182,8 @@ chain for " target " development."))
;; Scripting
perl
python-3.7
+ ;; Git
+ git
;; Native gcc 9 toolchain targeting glibc 2.27
(make-gcc-toolchain gcc-9 glibc-2.27))
(let ((target (getenv "HOST")))
diff --git a/contrib/valgrind.supp b/contrib/valgrind.supp
index 744b8ee70f..f232bb62c2 100644
--- a/contrib/valgrind.supp
+++ b/contrib/valgrind.supp
@@ -184,16 +184,3 @@
...
fun:_ZN5BCLog6Logger12StartLoggingEv
}
-{
- Suppress BCLog::Logger::StartLogging() still reachable memory warning
- Memcheck:Leak
- match-leak-kinds: reachable
- fun:malloc
- ...
- fun:_ZN5BCLog6Logger12StartLoggingEv
-}
-{
- Suppress rest_blockhash_by_height Conditional jump or move depends on uninitialised value(s)
- Memcheck:Cond
- fun:_ZL24rest_blockhash_by_heightP11HTTPRequestRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
-}
generated by cgit v1.2.3 (git 2.26.2) at 2024-10-10 00:24:29 +0000