-
Notifications
You must be signed in to change notification settings - Fork 36.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
scripted-diff: Avoid incompatibility with CMake AUTOUIC feature #25338
Conversation
Oh! What happens if we do |
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
Friendly ping @ryanofsky |
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.
Concept ACK
src/Makefile.am
Outdated
@@ -198,7 +198,7 @@ BITCOIN_CORE_H = \ | |||
node/minisketchwrapper.h \ | |||
node/psbt.h \ | |||
node/transaction.h \ | |||
node/ui_interface.h \ | |||
node/uiinterface.h \ |
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.
interface_ui.h
is a bit more readable
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.
Thanks! Updated.
-BEGIN VERIFY SCRIPT- sed -i "s|node/ui_interface|node/interface_ui|g" $(git grep -l "node/ui_interface" ./src) git mv src/node/ui_interface.cpp src/node/interface_ui.cpp git mv src/node/ui_interface.h src/node/interface_ui.h sed -i "s|BITCOIN_NODE_UI_INTERFACE_H|BITCOIN_NODE_INTERFACE_UI_H|g" src/node/interface_ui.h -END VERIFY SCRIPT-
I don't know, ~0 on this, I dislike the idea of having to rename source files to make the build system happy.
I would prefer a solution like that. |
cr ACK 018d70b New name is fine and I reviewed the scripted diff. No opinion on the build system stuff. |
You are right. I also prefer some kind of build system switchers. But they do not work for |
We already have build system code that special cases |
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.
Code review ACK 018d70b
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.
Code review ACK 018d70b
Small scripted-diff.
Working on migration from Autotools to CMake build system, I found that our current code base needs to be adjusted.
CMake allows to
When using this feature, statements like
#include "ui_<ui_base>.h"
are processed in a special way.The
node/ui_interface.h
unintentionally breaks this feature. Of course, it is possible to provide a list of source files to be excluded fromAUTOUIC
. But, unfortunately, this approach does not work for theqt/sendcoinsdialog.cpp
source file, where there are bothbitcoin/src/qt/sendcoinsdialog.cpp
Line 10 in b71d37d
bitcoin/src/qt/sendcoinsdialog.cpp
Line 24 in b71d37d