Bug 152564 – [CMake] Rearrange new gamepad files with deprecated files

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Gyuyoung Kim]

New gamepad files have been commented out in CMakeLists.txt so far. This patch rearrange the files with deprecated files using ENABLE_GAMEPAD.

[Gyuyoung Kim]

Created attachment 267938 [details]
Patch

[Gyuyoung Kim]

Created attachment 267940 [details]
Patch

[Alex Christensen]

Comment on attachment 267940 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=267940&action=review

> Source/WebCore/CMakeLists.txt:3244
> +    # FIXME: These were causing name conflicts on Mac, and the Gamepad API is not finished yet.

This is probably not needed any more. That was to explain why I just commented out the files, but this clearly separated them in a way that's obvious what's going on.

[Gyuyoung Kim]

Created attachment 267941 [details]
Patch for landing

[Gyuyoung Kim]

(In reply to comment #3)
> Comment on attachment 267940 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=267940&action=review
> 
> > Source/WebCore/CMakeLists.txt:3244
> > +    # FIXME: These were causing name conflicts on Mac, and the Gamepad API is not finished yet.
> 
> This is probably not needed any more. That was to explain why I just
> commented out the files, but this clearly separated them in a way that's
> obvious what's going on.

ok, let's remove it.

[WebKit Commit Bot]

Comment on attachment 267941 [details]
Patch for landing

Clearing flags on attachment: 267941

Committed r194424: <http://trac.webkit.org/changeset/194424>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[David Kilzer (:ddkilzer)]

This appears to have broken the Windows Debug builds:

<https://build.webkit.org/builders/Apple%20Win%20Debug%20(Build)?numbuilds=50>

I'm not sure, but my guess is that we've exceeded a command-line character limit due to the sheer number of include (/I) switches and path lengths.  I'm not sure how to fix this, though.

First broken build:
<https://build.webkit.org/builders/Apple%20Win%20Debug%20%28Build%29/builds/92684>

[Alex Christensen]

I'm trying a clean build.  Hopefully that will magically fix everything.

[Alex Christensen]

No magic this time, but http://trac.webkit.org/changeset/194434 fixed it.  Turns out we only need a few parameters to assemble this super-simple file.  Thanks for the heads-up, David!