117255 2013-06-05 07:42:39 -0700 [WinCairo] Fix build-webkit to build WinCairo under VS2010. 2013-06-06 07:42:12 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Unspecified RESOLVED FIXED P2 Normal --- 0 peavo webkit-unassigned bfulgham commit-queue dbates oldest_to_newest 897414 0 peavo 2013-06-05 07:42:39 -0700 The WinCairo build fails because the configuration names has changed in the VS2010 project, and needs to be updated in the scripts. 897419 1 203851 peavo 2013-06-05 07:51:29 -0700 Created attachment 203851 Patch 897439 2 203851 dbates 2013-06-05 09:16:11 -0700 Comment on attachment 203851 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203851&action=review This patch looks straightforward to me. r=me > Tools/ChangeLog:3 > + [WinCairo] Build failure. Do we know when the build began failing? From briefly looking through SVN history it looks like the WinCairo broken during the transition from VS2005 to VS2010. Maybe a more appropriate bug title would be "Fix build-webkit to build WinCairo under VS2010"? 897440 3 dbates 2013-06-05 09:17:36 -0700 (In reply to comment #2) > > Tools/ChangeLog:3 > > + [WinCairo] Build failure. > > Do we know when the build began failing? From briefly looking through SVN history it looks like the WinCairo broken during the transition from VS2005 to VS2010. Maybe a more appropriate bug title would be "Fix build-webkit to build WinCairo under VS2010"? "WinCairo broken during" => "WinCairo build has been broken since" 897495 4 peavo 2013-06-05 11:44:01 -0700 (In reply to comment #2) > (From update of attachment 203851 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=203851&action=review > > This patch looks straightforward to me. > > r=me > > > Tools/ChangeLog:3 > > + [WinCairo] Build failure. > > Do we know when the build began failing? From briefly looking through SVN history it looks like the WinCairo broken during the transition from VS2005 to VS2010. Maybe a more appropriate bug title would be "Fix build-webkit to build WinCairo under VS2010"? I'm not sure exactly when the WinCairo build started to fail. 897512 5 203851 dbates 2013-06-05 12:29:41 -0700 Comment on attachment 203851 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203851&action=review >>> Tools/ChangeLog:3 >>> + [WinCairo] Build failure. >> >> Do we know when the build began failing? From briefly looking through SVN history it looks like the WinCairo broken during the transition from VS2005 to VS2010. Maybe a more appropriate bug title would be "Fix build-webkit to build WinCairo under VS2010"? > > I'm not sure exactly when the WinCairo build started to fail. OK. Please update the bug title in the ChangeLog entry before landing this patch. 897664 6 203910 peavo 2013-06-06 00:18:10 -0700 Created attachment 203910 Patch 897665 7 peavo 2013-06-06 00:20:11 -0700 (In reply to comment #5) > > OK. Please update the bug title in the ChangeLog entry before landing this patch. Updated the title in the ChangeLog. 897770 8 203910 dbates 2013-06-06 07:20:20 -0700 Comment on attachment 203910 Patch Thanks peavo for updating the patch. r=me 897772 9 peavo 2013-06-06 07:27:05 -0700 (In reply to comment #8) > (From update of attachment 203910 [details]) > Thanks peavo for updating the patch. > r=me Thanks for the review :) 897780 10 203910 commit-queue 2013-06-06 07:42:09 -0700 Comment on attachment 203910 Patch Clearing flags on attachment: 203910 Committed r151271: <http://trac.webkit.org/changeset/151271> 897781 11 commit-queue 2013-06-06 07:42:12 -0700 All reviewed patches have been landed. Closing bug. 203851 2013-06-05 07:51:29 -0700 2013-06-06 00:18:02 -0700 Patch bug-117255-20130605164949.patch text/plain 2208 peavo SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MTIyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDEzLTA2LTA1ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2su Y29tPgorCisgICAgICAgIFtXaW5DYWlyb10gQnVpbGQgZmFpbHVyZS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzI1NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5lZWQgdG8gdXBkYXRlIGNvbmZpZ3Vy YXRpb24gbmFtZXMgYWNjb3JkaW5nIHRvIHNvbHV0aW9uIGZpbGUuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVDb25maWd1cmF0aW9uKToKKyAg ICAgICAgKGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24pOgorCiAyMDEzLTA2LTA1ICBEb21p bmlrIFLDtnR0c2NoZXMgIDxkb21pbmlrLnJvdHRzY2hlc0BpbnRlbC5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCBuYW1lIGZpeCBhZnRlciByMTUwNjYyCkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShy ZXZpc2lvbiAxNTExOTgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcg Y29weSkKQEAgLTI3Nyw4ICsyNzcsOCBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbgogICAg IH0KIAogICAgIGlmICgkY29uZmlndXJhdGlvbiAmJiBpc1dpbkNhaXJvKCkpIHsKLSAgICAgICAg dW5sZXNzICgkY29uZmlndXJhdGlvbiA9fiAvX0NhaXJvX0NGTGl0ZSQvKSB7Ci0gICAgICAgICAg ICAkY29uZmlndXJhdGlvbiAuPSAiX0NhaXJvX0NGTGl0ZSI7CisgICAgICAgIHVubGVzcyAoJGNv bmZpZ3VyYXRpb24gPX4gL19XaW5DYWlybyQvKSB7CisgICAgICAgICAgICAkY29uZmlndXJhdGlv biAuPSAiX1dpbkNhaXJvIjsKICAgICAgICAgfQogICAgIH0KIH0KQEAgLTYxNCwxOSArNjE0LDE5 IEBAIHN1YiBkZXRlcm1pbmVQYXNzZWRDb25maWd1cmF0aW9uCiAgICAgICAgIGlmICgkb3B0ID1+ IC9eLS1kZWJ1ZyQvaSkgewogICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7CiAgICAg ICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJEZWJ1ZyI7Ci0gICAgICAgICAgICAkcGFz c2VkQ29uZmlndXJhdGlvbiAuPSAiX0NhaXJvX0NGTGl0ZSIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBp c0N5Z3dpbigpKTsKKyAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fp cm8iIGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KICAgICAgICAgaWYgKCRvcHQgPX4gL14tLXJlbGVhc2UkL2kpIHsKICAgICAg ICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3Vy YXRpb24gPSAiUmVsZWFzZSI7Ci0gICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAi X0NhaXJvX0NGTGl0ZSIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dpbigpKTsKKyAgICAgICAg ICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fpcm8iIGlmIChpc1dpbkNhaXJvKCkg JiYgaXNDeWd3aW4oKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAg aWYgKCRvcHQgPX4gL14tLXByb2ZpbChlfGluZykkL2kpIHsKICAgICAgICAgICAgIHNwbGljZShA QVJHViwgJGksIDEpOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiUHJvZmls aW5nIjsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfQ2Fpcm9fQ0ZMaXRl IiBpZiAoaXNXaW5DYWlybygpICYmIGlzQ3lnd2luKCkpOworICAgICAgICAgICAgJHBhc3NlZENv bmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dpbigp KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0K 203910 2013-06-06 00:18:10 -0700 2013-06-06 07:42:09 -0700 Patch bug-117255-20130606091628.patch text/plain 2242 peavo SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MTIyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDEzLTA2LTA1ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2su Y29tPgorCisgICAgICAgIFtXaW5DYWlyb10gRml4IGJ1aWxkLXdlYmtpdCB0byBidWlsZCBXaW5D YWlybyB1bmRlciBWUzIwMTAuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTcyNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBOZWVkIHRvIHVwZGF0ZSBjb25maWd1cmF0aW9uIG5hbWVzIGFjY29yZGluZyB0 byBzb2x1dGlvbiBmaWxlLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoZGV0ZXJtaW5lQ29uZmlndXJhdGlvbik6CisgICAgICAgIChkZXRlcm1pbmVQYXNzZWRD b25maWd1cmF0aW9uKToKKwogMjAxMy0wNi0wNSAgRG9taW5payBSw7Z0dHNjaGVzICA8ZG9taW5p ay5yb3R0c2NoZXNAaW50ZWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgbmFtZSBmaXggYWZ0 ZXIgcjE1MDY2MgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMTUxMTk4KQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0yNzcsOCArMjc3LDgg QEAgc3ViIGRldGVybWluZUNvbmZpZ3VyYXRpb24KICAgICB9CiAKICAgICBpZiAoJGNvbmZpZ3Vy YXRpb24gJiYgaXNXaW5DYWlybygpKSB7Ci0gICAgICAgIHVubGVzcyAoJGNvbmZpZ3VyYXRpb24g PX4gL19DYWlyb19DRkxpdGUkLykgewotICAgICAgICAgICAgJGNvbmZpZ3VyYXRpb24gLj0gIl9D YWlyb19DRkxpdGUiOworICAgICAgICB1bmxlc3MgKCRjb25maWd1cmF0aW9uID1+IC9fV2luQ2Fp cm8kLykgeworICAgICAgICAgICAgJGNvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyI7CiAgICAg ICAgIH0KICAgICB9CiB9CkBAIC02MTQsMTkgKzYxNCwxOSBAQCBzdWIgZGV0ZXJtaW5lUGFzc2Vk Q29uZmlndXJhdGlvbgogICAgICAgICBpZiAoJG9wdCA9fiAvXi0tZGVidWckL2kpIHsKICAgICAg ICAgICAgIHNwbGljZShAQVJHViwgJGksIDEpOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3Vy YXRpb24gPSAiRGVidWciOwotICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9D YWlyb19DRkxpdGUiIGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7CisgICAgICAgICAg ICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAiX1dpbkNhaXJvIiBpZiAoaXNXaW5DYWlybygpICYm IGlzQ3lnd2luKCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlm ICgkb3B0ID1+IC9eLS1yZWxlYXNlJC9pKSB7CiAgICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRp LCAxKTsKICAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uID0gIlJlbGVhc2UiOwotICAg ICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9DYWlyb19DRkxpdGUiIGlmIChpc1dp bkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7CisgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlv biAuPSAiX1dpbkNhaXJvIiBpZiAoaXNXaW5DYWlybygpICYmIGlzQ3lnd2luKCkpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmICgkb3B0ID1+IC9eLS1wcm9maWwo ZXxpbmcpJC9pKSB7CiAgICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKICAgICAgICAg ICAgICRwYXNzZWRDb25maWd1cmF0aW9uID0gIlByb2ZpbGluZyI7Ci0gICAgICAgICAgICAkcGFz c2VkQ29uZmlndXJhdGlvbiAuPSAiX0NhaXJvX0NGTGl0ZSIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBp c0N5Z3dpbigpKTsKKyAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fp cm8iIGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KICAgICB9Cg==