Summary: | [WinCairo] "build-webkit --wincairo" thinks you need WebKitSupportLibraries.zip | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Brent Fulgham <bfulgham> | ||||||||
Component: | Tools / Tests | Assignee: | Brent Fulgham <bfulgham> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | ||||||||||
Priority: | P2 | ||||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | PC | ||||||||||
OS: | Windows 7 | ||||||||||
Attachments: |
|
Description
Brent Fulgham
2011-04-18 11:20:55 PDT
Created attachment 90492 [details]
Patch
Created attachment 90493 [details]
Patch
Comment on attachment 90493 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90493&action=review > Tools/Scripts/build-webkit:-514 > } elsif (isAppleWinWebKit()) { > # Copy WebKitSupportLibrary to the correct location in WebKitLibraries so it can be found. > # Will fail if WebKitSupportLibrary.zip is not in source root. > - (system("perl Tools/Scripts/update-webkit-support-libs") == 0) or die; It's odd that isAppleWinWebKit returns true for WinCairo. It probably shouldn't. > Tools/Scripts/update-webkit:101 > } elsif (isAppleWinWebKit()) { Ditto. :) > Tools/Scripts/webkitdirs.pm:212 > + $configuration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin()); Perhaps you should move this out of the block. You never want to build the Release or Debug configurations if you've specified the WinCairo flag. Why is isCygwin important here? Comment on attachment 90493 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90493&action=review >> Tools/Scripts/build-webkit:-514 >> - (system("perl Tools/Scripts/update-webkit-support-libs") == 0) or die; > > It's odd that isAppleWinWebKit returns true for WinCairo. It probably shouldn't. Yes, that's probably true. WinCairo piggybacks off of the isAppleWinWebKit for most of its functionality. Changing all of these places would expand the scope of this change considerably. >> Tools/Scripts/update-webkit:101 >> } elsif (isAppleWinWebKit()) { > > Ditto. :) Ditto! :-) >> Tools/Scripts/webkitdirs.pm:212 >> + $configuration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin()); > > Perhaps you should move this out of the block. You never want to build the Release or Debug configurations if you've specified the WinCairo flag. Why is isCygwin important here? That's a good point. I was only thinking about the default case, which is where I ran into the problem. I'll change that. Created attachment 90668 [details]
Revised per mrobinson's comments
Comment on attachment 90668 [details]
Revised per mrobinson's comments
Great!
Landed in http://trac.webkit.org/changeset/84601 |