Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use constants in place of "Zcash" and executable names #6814

Draft
wants to merge 14 commits into
base: master
Choose a base branch
from

Conversation

daira
Copy link
Contributor

@daira daira commented Jan 4, 2024

fixes #6813
depends on #6812 (I will rebase and catch any remaining uses of PRODUCT_NAME that should be changed to DAEMON_NAME when that merges).

luke-jr and others added 14 commits January 3, 2024 15:28
Zcash: Applies to 2015 for Zcash purposes.

(cherry picked from commit bitcoin/bitcoin@1a6c67c)
…e name

This helps avoid accidental removal of upstream copyright names

(cherry picked from commit bitcoin/bitcoin@917b1d0)
Zcash: We don't have `share/setup.nsi.in` anymore, but this will ensure
that any uses of `@PACKAGE_URL@` in future will be substituted.

(cherry picked from commit bitcoin/bitcoin@29598e4)
…ons so it gets passed to extract-strings correctly

(cherry picked from commit bitcoin/bitcoin@cddffaf)
…add a second line to copyrights in -version, About dialog, and splash screen

(cherry picked from commit bitcoin/bitcoin@027fdb8)
The old configure.ac did not work for a copyright holders string
containing commas due to insufficient quoting.  The new one allows this.
While this is, of course, not of direct consequence to the current code
(where the string is "Bitcoin Core"), it should still be fixed now that
the string is actually factored out.

(cherry picked from commit bitcoin/bitcoin@72fd008)
This was added in 386efb7 to
address spammy Clang warnings when building with ccache.

The issue was addressed in ccache 3.2
(https://bugzilla.samba.org/show_bug.cgi?id=8118, Nov 2014),
and from a look at all major distros, it's only Debian Jessie
that has a version of ccache older than that (3.1).

Therefore I think it's acceptable to drop this workaround, and
re-enable warnings for unused driver arguments (when compiling
using Clang).

(cherry picked from commit bitcoin/bitcoin@a029805)
MinGW Clang complains about `-mthreads` as an unused option.
See msys2/MINGW-packages#9850
…ames:

* PACKAGE_NAME = "Zcash"
* DAEMON_NAME = "zcashd"
* WALLET_TOOL_NAME = "zcashd-wallet-tool"
* CLI_NAME = "zcash-cli"
* TX_UTILITY_NAME = "zcash-tx"

Also clean up a few instances of "Zcash" that should have been "zcashd" or
"ZEC".

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
@daira daira added the C-cleanup Category: PRs that clean code up or issues documenting cleanup. label Jan 4, 2024
@@ -678,7 +678,7 @@ void ThreadShowMetricsScreen()
// Explain how to exit
std::cout << "[";
#ifdef WIN32
std::cout << _("'zcash-cli.exe stop' to exit");
std::cout << strprintf(_("'%s.exe stop' to exit"), CLI_NAME);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: the .exe is unnecessary; it's added implicitly for Windows commands.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup.
Projects
None yet
6 participants