-
Notifications
You must be signed in to change notification settings - Fork 2k
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
daira
wants to merge
14
commits into
zcash:master
Choose a base branch
from
daira:cleanup-zcash-strings
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit bitcoin/bitcoin@d5f4683)
Zcash: Applies to 2015 for Zcash purposes. (cherry picked from commit bitcoin/bitcoin@1a6c67c)
(cherry picked from commit bitcoin/bitcoin@de619a3)
…e name This helps avoid accidental removal of upstream copyright names (cherry picked from commit bitcoin/bitcoin@917b1d0)
(cherry picked from commit bitcoin/bitcoin@3cae140)
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)
…ctly (cherry picked from commit bitcoin/bitcoin@cc2095e)
…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
added
the
C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
label
Jan 4, 2024
daira
commented
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); |
There was a problem hiding this comment.
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #6813
depends on #6812 (I will rebase and catch any remaining uses of
PRODUCT_NAME
that should be changed toDAEMON_NAME
when that merges).