Bug 117853

Summary: WebGL files not included in Windows build (take 2)
Product: WebKit Reporter: Alex Christensen <achristensen>
Component: WebGLAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: bfulgham, buildbot, commit-queue, dino, eflews.bot, gtk-ews, gyuyoung.kim, noam, rego+ews, rniwa, webkit-ews, xan.lopez
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch
none
Patch
none
Patch
none
Patch none

Description Alex Christensen 2013-06-20 16:52:30 PDT
https://bugs.webkit.org/show_bug.cgi?id=117809 was rolled out in r151770 because it broke the Windows build after all.  This patch is trying to do the same thing, that is, include the WebGL source files in the Windows build.  This time I copy the necessary headers and fix a syntax error in LoopBlinnShader.cpp that has been broken and unused for a while.
Comment 1 Alex Christensen 2013-06-20 17:00:25 PDT
Created attachment 205129 [details]
Patch
Comment 2 Build Bot 2013-06-20 20:18:14 PDT
Comment on attachment 205129 [details]
Patch

Attachment 205129 [details] did not pass win-ews (win):
Output: http://webkit-queues.appspot.com/results/884381
Comment 3 Brent Fulgham 2013-06-21 09:52:15 PDT
Comment on attachment 205129 [details]
Patch

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

Looks good.  I'm going to try building it locally.

> Source/WebCore/WebCore.vcxproj/WebCore.vcxproj:148
> +    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSEXTDrawBuffers.cpp">

I hate how Visual Studio creates all this solution/project file churn.
Comment 4 Alex Christensen 2013-06-21 09:59:42 PDT
Created attachment 205195 [details]
Patch
Comment 5 Brent Fulgham 2013-06-21 10:52:57 PDT
Comment on attachment 205195 [details]
Patch

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

> Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd:7
> +xcopy %WEBKIT_SOURCE%\ThirdParty\ANGLE\include %CONFIGURATIONBUILDDIR%\include /s

You should put both path arguments to xcopy in quotes so that the build doesn't break if someone uses a path with spaces in it.
Comment 6 Alex Christensen 2013-06-21 10:57:27 PDT
Created attachment 205199 [details]
Patch
Comment 7 Alex Christensen 2013-06-21 11:21:32 PDT
Created attachment 205202 [details]
Patch
Comment 8 Build Bot 2013-06-21 11:25:09 PDT
Comment on attachment 205202 [details]
Patch

Attachment 205202 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/921887
Comment 9 kov's GTK+ EWS bot 2013-06-21 11:27:54 PDT
Comment on attachment 205202 [details]
Patch

Attachment 205202 [details] did not pass gtk-ews (gtk):
Output: http://webkit-queues.appspot.com/results/956414
Comment 10 Early Warning System Bot 2013-06-21 11:28:44 PDT
Comment on attachment 205202 [details]
Patch

Attachment 205202 [details] did not pass qt-wk2-ews (qt-wk2):
Output: http://webkit-queues.appspot.com/results/956415
Comment 11 Early Warning System Bot 2013-06-21 11:28:50 PDT
Comment on attachment 205202 [details]
Patch

Attachment 205202 [details] did not pass qt-ews (qt):
Output: http://webkit-queues.appspot.com/results/961144
Comment 12 EFL EWS Bot 2013-06-21 11:34:14 PDT
Comment on attachment 205202 [details]
Patch

Attachment 205202 [details] did not pass efl-ews (efl):
Output: http://webkit-queues.appspot.com/results/937703
Comment 13 Build Bot 2013-06-21 11:59:21 PDT
Comment on attachment 205202 [details]
Patch

Attachment 205202 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/960184
Comment 14 Alex Christensen 2013-06-21 13:07:14 PDT
Created attachment 205209 [details]
Patch
Comment 15 Brent Fulgham 2013-06-21 13:16:43 PDT
Comment on attachment 205209 [details]
Patch

Looks good!
Comment 16 Alex Christensen 2013-06-21 13:23:24 PDT
I'm going to wait until the Windows bot turns green, then I'll cq+ it
Comment 17 WebKit Commit Bot 2013-06-21 13:57:49 PDT
Comment on attachment 205209 [details]
Patch

Clearing flags on attachment: 205209

Committed r151854: <http://trac.webkit.org/changeset/151854>
Comment 18 WebKit Commit Bot 2013-06-21 13:57:53 PDT
All reviewed patches have been landed.  Closing bug.