-
Notifications
You must be signed in to change notification settings - Fork 38.6k
Avoid interface keyword to fix windows gitian build
#12906
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
Conversation
Rename `interface` to `interfaces` Build failure reported by Chun Kuan Lee <[email protected]> bitcoin#10244 (comment) -BEGIN VERIFY SCRIPT- git mv src/interface src/interfaces ren() { git grep -l "$1" | xargs sed -i "s,$1,$2,g"; } ren interface/ interfaces/ ren interface:: interfaces:: ren BITCOIN_INTERFACE_ BITCOIN_INTERFACES_ ren "namespace interface" "namespace interfaces" -END VERIFY SCRIPT-
|
utACK Anyone have an idea why this didn't cause a problem in the Travis win build? |
I don't know the specific answer, but I guess there are just different headers or versions of headers used in the two builds. There is some information about the headers that |
|
Ah yes for COM, of course. |
|
Imo, a scripted diff should not (explicitly) modify the content of |
|
@laanwj I think travis win build does not build qt part |
Oh yes that could be true. Does this fix your build problem? |
Currently, if you rename files in a scripted diff or add new files, you are required to update the git index, otherwise the I actually think this is a good thing. Scripts that keep the git index up to date are easier to edit and manually verify since you can paste them into your shell and run normal git commit/diff commands afterwards without having to first manually trawl the working directory to discover new paths. If you really wanted to make the verifier automatically detect new paths, you could do it by adding a line like |
|
utACK 17780d6 |
|
Thanks for the clarification @ryanofsky |
|
Tested ACK 17780d6 |
|
Tested ACK 17780d6 |
|
Just going to merge this, since 17780d6 doesn't change the objdump for me locally. |
17780d6 scripted-diff: Avoid `interface` keyword to fix windows gitian build (Russell Yanofsky) Pull request description: Rename `interface` to `interfaces` Build failure reported by ken2812221 in #10244 (comment) Tree-SHA512: e02c97c728540f344202c13b036f9f63af23bd25e25ed7a5cfe9e2c2f201a12ff232cc94a93fbe37ef6fb6bf9e036fe62210ba798ecd30de191d09338754a8d0
…windows gitian build 17780d6 scripted-diff: Avoid `interface` keyword to fix windows gitian build (Russell Yanofsky) Pull request description: Rename `interface` to `interfaces` Build failure reported by ken2812221 in bitcoin#10244 (comment) Tree-SHA512: e02c97c728540f344202c13b036f9f63af23bd25e25ed7a5cfe9e2c2f201a12ff232cc94a93fbe37ef6fb6bf9e036fe62210ba798ecd30de191d09338754a8d0 -BEGIN VERIFY SCRIPT- git mv src/interface src/interfaces ren() { git grep -l "$1" | xargs sed -i "s,$1,$2,g"; } ren interface/ interfaces/ ren interface:: interfaces:: ren BITCOIN_INTERFACE_ BITCOIN_INTERFACES_ ren "namespace interface" "namespace interfaces" -END VERIFY SCRIPT-
backport: bitcoin#10244, bitcoin#18123, bitcoin#12906 + Parts of bitcoin#11403
Rename
interfacetointerfacesBuild failure reported by ken2812221 in #10244 (comment)