Avoid interface keyword to fix windows gitian build #12906

1. 
   ryanofsky commented at 7:47 am on April 7, 2018: member

   Rename interface to interfaces

   Build failure reported by ken2812221 in #10244 (comment)

2. scripted-diff: Avoid `interface` keyword to fix windows gitian build

   Rename `interface` to `interfaces`
   
   Build failure reported by Chun Kuan Lee <ken2812221@gmail.com>
   https://github.com/bitcoin/bitcoin/pull/10244#issuecomment-379434756
   
   -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-

   17780d6f35
3. ryanofsky force-pushed on Apr 7, 2018
4. 
   laanwj commented at 8:36 am on April 7, 2018: member

   utACK

   Anyone have an idea why this didn’t cause a problem in the Travis win build?

5. 
   ryanofsky commented at 9:02 am on April 7, 2018: member

   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 #define interface struct at https://stackoverflow.com/questions/25234203/what-is-the-interface-keyword-in-msvc and https://social.msdn.microsoft.com/forums/vstudio/en-US/06bf1dea-1d20-4ec3-b9a1-3d673d7fcd8d/what-is-the-interface-keyword-in-native-c

6. fanquake added the label Windows on Apr 7, 2018
7. 
   laanwj commented at 10:48 am on April 7, 2018: member

   Ah yes for COM, of course. We could also avoid this by not including the windows headers except in platform-specific utility compilation units. But meh.
8. 
   MarcoFalke commented at 1:10 pm on April 7, 2018: member

   Imo, a scripted diff should not (explicitly) modify the content of .git. Mind removing the git from the first command?
9. 
   ken2812221 commented at 3:12 pm on April 7, 2018: contributor

   @laanwj I think travis win build does not build qt part
10. 
    laanwj commented at 4:28 pm on April 7, 2018: member

    @laanwj I think travis win build does not build qt part

    Oh yes that could be true.

    Does this fix your build problem?

11. 
    ryanofsky commented at 4:31 pm on April 7, 2018: member

    Imo, a scripted diff should not (explicitly) modify the content of .git. Mind removing the git from the first command?

    Currently, if you rename files in a scripted diff or add new files, you are required to update the git index, otherwise the git diff command which verifies the script will fail because it doesn’t see the new paths. (To confirm this you can check out the PR, amend git mv to mv and run contrib/devtools/commit-script-check.sh HEAD^..HEAD, which will fail.)

    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 git add -N $(git diff-tree --no-commit-id --diff-filter=A --name-only -r HEAD), but I think this would just be complicating it, and complicating manual verification and editing for no benefit.

12. 
    MarcoFalke commented at 4:33 pm on April 7, 2018: member

    utACK 17780d6f35a3951f649c3b7766b9283d9c18e39f
13. 
    MarcoFalke commented at 4:33 pm on April 7, 2018: member

    Thanks for the clarification @ryanofsky
14. 
    ken2812221 commented at 4:57 pm on April 7, 2018: contributor

    Tested ACK 17780d6
15. 
    MarcoFalke commented at 7:06 pm on April 7, 2018: member

    Tested ACK 17780d6f35a3951f649c3b7766b9283d9c18e39f
16. 
    MarcoFalke commented at 7:18 pm on April 7, 2018: member

    Just going to merge this, since 17780d6f35a3951f649c3b7766b9283d9c18e39f doesn’t change the objdump for me locally.
17. MarcoFalke merged this on Apr 7, 2018
18. MarcoFalke closed this on Apr 7, 2018

    ---

19. MarcoFalke referenced this in commit 048ac8326b on Apr 7, 2018
20. xdustinface referenced this in commit 3a8a0e1dc6 on Oct 1, 2020
21. xdustinface referenced this in commit bf15977228 on Oct 1, 2020
22. xdustinface referenced this in commit 18cc7fbe36 on Oct 2, 2020
23. xdustinface referenced this in commit a244af2d66 on Oct 2, 2020
24. xdustinface referenced this in commit 4e99da5e72 on Oct 5, 2020
25. xdustinface referenced this in commit eacac3d742 on Oct 5, 2020
26. xdustinface referenced this in commit cee8c151fa on Oct 14, 2020
27. UdjinM6 referenced this in commit 74f4d2a898 on Oct 14, 2020
28. DrahtBot locked this on Sep 8, 2021

Contributors
ryanofsky laanwj MarcoFalke ken2812221

Labels
Windows