refactor

2026-02-18 22:10:35 -08:00
parent 6be262164d
commit c89f018967
1 changed files with 106 additions and 66 deletions
@@ -1,12 +1,15 @@
 # Copyright (c) 2013-2016 The Bitcoin Core developers
+# Copyright (c) 2026 Agrarian Developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

 ACLOCAL_AMFLAGS = -I build-aux/m4
+
 SUBDIRS = src
 if ENABLE_MAN
 SUBDIRS += doc/man
 endif
+
 .PHONY: deploy FORCE

 export PYTHONPATH
@@ -16,60 +19,73 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libbitcoinconsensus.pc
 endif

-BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
-BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
-BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
-BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
+BITCOIND_BIN = $(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
+BITCOIN_QT_BIN = $(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
+BITCOIN_CLI_BIN = $(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
+BITCOIN_WIN_INSTALLER = $(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)

 empty :=
 space := $(empty) $(empty)

-OSX_APP=Agrarian-Qt.app
+OSX_APP = Agrarian-Qt.app
 OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
 OSX_DMG = $(OSX_VOLNAME).dmg
-OSX_BACKGROUND_SVG=background.svg
-OSX_BACKGROUND_IMAGE=background.tiff
-OSX_BACKGROUND_IMAGE_DPIS=36 72
-OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
-OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
-OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
-OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
-OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
+OSX_BACKGROUND_SVG = background.svg
+OSX_BACKGROUND_IMAGE = background.tiff
+OSX_BACKGROUND_IMAGE_DPIS = 36 72
+OSX_DSSTORE_GEN = $(top_srcdir)/contrib/macdeploy/custom_dsstore.py
+OSX_DEPLOY_SCRIPT = $(top_srcdir)/contrib/macdeploy/macdeployqtplus
+OSX_FANCY_PLIST = $(top_srcdir)/contrib/macdeploy/fancy.plist
+OSX_INSTALLER_ICONS = $(top_srcdir)/src/qt/res/icons/bitcoin.icns
+OSX_PLIST = $(top_builddir)/share/qt/Info.plist # not installed
 OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW

 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
-DIST_CONTRIB = $(top_srcdir)/contrib/agrarian-cli.bash-completion \
-	       $(top_srcdir)/contrib/agrarian-tx.bash-completion \
-	       $(top_srcdir)/contrib/agrariand.bash-completion \
-           $(top_srcdir)/contrib/init \
-           $(top_srcdir)/contrib/install_db4.sh
+
+DIST_CONTRIB = \
+  $(top_srcdir)/contrib/agrarian-cli.bash-completion \
+  $(top_srcdir)/contrib/agrarian-tx.bash-completion \
+  $(top_srcdir)/contrib/agrariand.bash-completion \
+  $(top_srcdir)/contrib/init \
+  $(top_srcdir)/contrib/install_db4.sh

 DIST_SHARE = \
-           $(top_srcdir)/share/genbuild.sh \
-           $(top_srcdir)/share/rpcauth
+  $(top_srcdir)/share/genbuild.sh \
+  $(top_srcdir)/share/rpcauth

-BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
-           $(top_srcdir)/contrib/devtools/security-check.py
+BIN_CHECKS = \
+  $(top_srcdir)/contrib/devtools/symbol-check.py \
+  $(top_srcdir)/contrib/devtools/security-check.py

-WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/agrarian.ico \
+WINDOWS_PACKAGING = \
+  $(top_srcdir)/share/pixmaps/agrarian.ico \
  $(top_srcdir)/share/pixmaps/nsis-header.bmp \
  $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
  $(top_srcdir)/doc/README_windows.txt

-LINUX_PACKAGING = $(top_srcdir)/share/pixmaps/agrarian16.xpm \
+LINUX_PACKAGING = \
+  $(top_srcdir)/share/pixmaps/agrarian16.xpm \
  $(top_srcdir)/share/pixmaps/agrarian32.xpm \
  $(top_srcdir)/share/pixmaps/agrarian128.png

-OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
+OSX_PACKAGING = \
+  $(OSX_DEPLOY_SCRIPT) \
+  $(OSX_FANCY_PLIST) \
+  $(OSX_INSTALLER_ICONS) \
  $(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_SVG) \
  $(OSX_DSSTORE_GEN) \
  $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
  $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh

-COVERAGE_INFO = baseline.info \
-  test_agrarian_filtered.info total_coverage.info \
-  baseline_filtered.info functional_test.info functional_test_filtered.info \
-  test_agrarian_coverage.info test_agrarian.info
+COVERAGE_INFO = \
+  baseline.info \
+  test_agrarian_filtered.info \
+  total_coverage.info \
+  baseline_filtered.info \
+  functional_test.info \
+  functional_test_filtered.info \
+  test_agrarian_coverage.info \
+  test_agrarian.info

 dist-hook:
 	-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
@@ -101,34 +117,46 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)

 $(OSX_APP)/Contents/MacOS/Agrarian-Qt: all-recursive
 	$(MKDIR_P) $(@D)
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $(BITCOIN_QT_BIN) $@
+	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $@

 $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
 	$(MKDIR_P) $(@D)
 	echo '{	CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@

-OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
-  $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
-  $(OSX_APP)/Contents/MacOS/Agrarian-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
+OSX_APP_BUILT = \
+  $(OSX_APP)/Contents/PkgInfo \
+  $(OSX_APP)/Contents/Resources/empty.lproj \
+  $(OSX_APP)/Contents/Resources/bitcoin.icns \
+  $(OSX_APP)/Contents/Info.plist \
+  $(OSX_APP)/Contents/MacOS/Agrarian-Qt \
+  $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings

 osx_volname:
 	echo $(OSX_VOLNAME) >$@

 if BUILD_DARWIN
+
 $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) $(OSX_BACKGROUND_IMAGE)
 	$(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME)

 $(OSX_BACKGROUND_IMAGE).png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
 	sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 36 -p 36 -o $@
+
 $(OSX_BACKGROUND_IMAGE)@2x.png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
 	sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 72 -p 72 -o $@
+
 $(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE).png $(OSX_BACKGROUND_IMAGE)@2x.png
 	tiffutil -cathidpicheck $^ -out $@

 deploydir: $(OSX_DMG)
+
 else
-APP_DIST_DIR=$(top_builddir)/dist
-APP_DIST_EXTRAS=$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE) $(APP_DIST_DIR)/.DS_Store $(APP_DIST_DIR)/Applications
+
+APP_DIST_DIR = $(top_builddir)/dist
+APP_DIST_EXTRAS = \
+  $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE) \
+  $(APP_DIST_DIR)/.DS_Store \
+  $(APP_DIST_DIR)/Applications

 $(APP_DIST_DIR)/Applications:
 	@rm -f $@
@@ -141,7 +169,9 @@ $(OSX_DMG): $(APP_DIST_EXTRAS)

 dpi%.$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_SVG)
 	sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d $* -p $* | $(IMAGEMAGICK_CONVERT) - $@
+
 OSX_BACKGROUND_IMAGE_DPIFILES := $(foreach dpi,$(OSX_BACKGROUND_IMAGE_DPIS),dpi$(dpi).$(OSX_BACKGROUND_IMAGE))
+
 $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIFILES)
 	$(MKDIR_P) $(@D)
 	$(TIFFCP) -c none $(OSX_BACKGROUND_IMAGE_DPIFILES) $@
@@ -150,15 +180,17 @@ $(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
 	$(PYTHON) $< "$@" "$(OSX_VOLNAME)"

 $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Agrarian-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
-	INSTALLNAMETOOL=$(INSTALLNAMETOOL)  OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
+	INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2

 deploydir: $(APP_DIST_EXTRAS)
+
 endif

 if TARGET_DARWIN
 appbundle: $(OSX_APP_BUILT)
 deploy: $(OSX_DMG)
 endif
+
 if TARGET_WINDOWS
 deploy: $(BITCOIN_WIN_INSTALLER)
 endif
@@ -173,7 +205,13 @@ $(BITCOIN_CLI_BIN): FORCE
 	$(MAKE) -C src $(@F)

 if USE_LCOV
-LCOV_FILTER_PATTERN=-p "/usr/include/" -p "/usr/lib/" -p "src/leveldb/" -p "src/univalue" -p "src/secp256k1"
+
+LCOV_FILTER_PATTERN = \
+  -p "/usr/include/" \
+  -p "/usr/lib/" \
+  -p "src/leveldb/" \
+  -p "src/univalue" \
+  -p "src/secp256k1"

 baseline.info:
 	$(LCOV) -c -i -d $(abs_builddir)/src -o $@
@@ -206,7 +244,7 @@ test_agrarian_coverage.info: baseline_filtered.info test_agrarian_filtered.info
 total_coverage.info: test_agrarian_filtered.info functional_test_filtered.info
 	$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_agrarian_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt

-test_agrarian.coverage/.dirstamp:  test_agrarian_coverage.info
+test_agrarian.coverage/.dirstamp: test_agrarian_coverage.info
 	$(GENHTML) -s $(LCOV_OPTS) $< -o $(@D)
 	@touch $@

@@ -216,36 +254,39 @@ total.coverage/.dirstamp: total_coverage.info

 cov: test_agrarian.coverage/.dirstamp total.coverage/.dirstamp

-endif
+endif # USE_LCOV

 dist_noinst_SCRIPTS = autogen.sh

-EXTRA_DIST = $(DIST_SHARE) $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(LINUX_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
-
-EXTRA_DIST += \
-    test/functional
-
-EXTRA_DIST += \
-    test/util/bitcoin-util-test.py \
-    test/util/data/bitcoin-util-test.json \
-    test/util/data/blanktxv1.hex \
-    test/util/data/blanktxv1.json \
-    test/util/data/tt-delin1-out.hex \
-    test/util/data/tt-delin1-out.json \
-    test/util/data/tt-delout1-out.hex \
-    test/util/data/tt-delout1-out.json \
-    test/util/data/tt-locktime317000-out.hex \
-    test/util/data/tt-locktime317000-out.json \
-    test/util/data/tx394b54bb.hex \
-    test/util/data/txcreate1.hex \
-    test/util/data/txcreate1.json \
-    test/util/data/txcreate2.hex \
-    test/util/data/txcreate2.json \
-    test/util/data/txcreatescript1.hex \
-    test/util/data/txcreatescript1.json \
-    test/util/data/txcreatesign.hex \
-    test/util/data/txcreatesign.json \
-    test/util/rpcauth-test.py
+EXTRA_DIST = \
+  $(DIST_SHARE) \
+  $(DIST_CONTRIB) \
+  $(DIST_DOCS) \
+  $(WINDOWS_PACKAGING) \
+  $(LINUX_PACKAGING) \
+  $(OSX_PACKAGING) \
+  $(BIN_CHECKS) \
+  test/functional \
+  test/util/bitcoin-util-test.py \
+  test/util/data/bitcoin-util-test.json \
+  test/util/data/blanktxv1.hex \
+  test/util/data/blanktxv1.json \
+  test/util/data/tt-delin1-out.hex \
+  test/util/data/tt-delin1-out.json \
+  test/util/data/tt-delout1-out.hex \
+  test/util/data/tt-delout1-out.json \
+  test/util/data/tt-locktime317000-out.hex \
+  test/util/data/tt-locktime317000-out.json \
+  test/util/data/tx394b54bb.hex \
+  test/util/data/txcreate1.hex \
+  test/util/data/txcreate1.json \
+  test/util/data/txcreate2.hex \
+  test/util/data/txcreate2.json \
+  test/util/data/txcreatescript1.hex \
+  test/util/data/txcreatescript1.json \
+  test/util/data/txcreatesign.hex \
+  test/util/data/txcreatesign.json \
+  test/util/rpcauth-test.py

 CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)

@@ -271,4 +312,3 @@ clean-docs:
 clean-local: clean-docs
 	rm -rf coverage_percent.txt test_agrarian.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
 	rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__
-