Bug 152564

Summary: [CMake] Rearrange new gamepad files with deprecated files
Product: WebKit Reporter: Gyuyoung Kim <gyuyoung.kim>
Component: New BugsAssignee: Gyuyoung Kim <gyuyoung.kim>
Status: RESOLVED FIXED    
Severity: Normal CC: achristensen, ap, bfulgham, commit-queue, ddkilzer, ryanhaddad
Priority: P2    
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch
none
Patch for landing none

Description Gyuyoung Kim 2015-12-26 19:11:48 PST
New gamepad files have been commented out in CMakeLists.txt so far. This patch rearrange the files with deprecated files using ENABLE_GAMEPAD.
Comment 1 Gyuyoung Kim 2015-12-26 19:14:52 PST
Created attachment 267938 [details]
Patch
Comment 2 Gyuyoung Kim 2015-12-26 21:24:03 PST
Created attachment 267940 [details]
Patch
Comment 3 Alex Christensen 2015-12-26 21:34:28 PST
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.
Comment 4 Gyuyoung Kim 2015-12-26 21:41:42 PST
Created attachment 267941 [details]
Patch for landing
Comment 5 Gyuyoung Kim 2015-12-26 21:56:04 PST
(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.
Comment 6 WebKit Commit Bot 2015-12-26 22:35:22 PST
Comment on attachment 267941 [details]
Patch for landing

Clearing flags on attachment: 267941

Committed r194424: <http://trac.webkit.org/changeset/194424>
Comment 7 WebKit Commit Bot 2015-12-26 22:35:25 PST
All reviewed patches have been landed.  Closing bug.
Comment 8 David Kilzer (:ddkilzer) 2015-12-28 10:55:03 PST
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>
Comment 9 Alex Christensen 2015-12-28 12:29:00 PST
I'm trying a clean build.  Hopefully that will magically fix everything.
Comment 10 Alex Christensen 2015-12-28 22:02:45 PST
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!