152959 2016-01-10 09:47:34 -0800 [webkitdirs] Use CMake to determine architecture on isCMakeBuild() 2016-01-11 17:30:29 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 annulen webkit-unassigned achristensen bfulgham commit-queue dbates gyuyoung.kim lforschler mcatanzaro oldest_to_newest 1154223 0 annulen 2016-01-10 09:47:34 -0800 Use isCMakeBuild() condition instead of isEfl() || isGtk() 1154229 1 268653 annulen 2016-01-10 10:32:31 -0800 Created attachment 268653 Patch 1154231 2 268655 annulen 2016-01-10 10:34:44 -0800 Created attachment 268655 Patch 1154240 3 268655 bfulgham 2016-01-10 11:28:53 -0800 Comment on attachment 268655 Patch I think this looks good. I would like Alex to double-check, but if the Windows EWW passes I think it's appropriate to land this. 1154309 4 gyuyoung.kim 2016-01-10 21:21:13 -0800 (In reply to comment #3) > Comment on attachment 268655 [details] > Patch > > I think this looks good. I would like Alex to double-check, but if the > Windows EWW passes I think it's appropriate to land this. LGTM too. 1154360 5 268655 gyuyoung.kim 2016-01-11 06:15:42 -0800 Comment on attachment 268655 Patch This patch passes win-ews which is built using cmake. I think this change is fine for win port as well. 1154363 6 268655 commit-queue 2016-01-11 07:01:54 -0800 Comment on attachment 268655 Patch Clearing flags on attachment: 268655 Committed r194849: <http://trac.webkit.org/changeset/194849> 1154364 7 commit-queue 2016-01-11 07:01:59 -0800 All reviewed patches have been landed. Closing bug. 1154453 8 268655 achristensen 2016-01-11 12:48:21 -0800 Comment on attachment 268655 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268655&action=review > Tools/Scripts/webkitdirs.pm:342 > $host_processor = `cmake --system-information | grep CMAKE_SYSTEM_PROCESSOR`; We must not be running this on Windows. I don't think we require grep to be installed. If this doesn't break anything, then I guess it can stay, but I don't think this was a beneficial change. 1154461 9 268655 annulen 2016-01-11 13:09:37 -0800 Comment on attachment 268655 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268655&action=review >> Tools/Scripts/webkitdirs.pm:342 >> $host_processor = `cmake --system-information | grep CMAKE_SYSTEM_PROCESSOR`; > > We must not be running this on Windows. I don't think we require grep to be installed. If this doesn't break anything, then I guess it can stay, but I don't think this was a beneficial change. If you want, I can fix it to avoid grep invocation, with pure perl. 1154465 10 achristensen 2016-01-11 13:16:06 -0800 (In reply to comment #9) > If you want, I can fix it to avoid grep invocation, with pure perl. Perl is definitely a requirement. That would be nice, although I'm not sure what if anything that would fix. 1154466 11 bfulgham 2016-01-11 13:17:35 -0800 (In reply to comment #9) > Comment on attachment 268655 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=268655&action=review > > >> Tools/Scripts/webkitdirs.pm:342 > >> $host_processor = `cmake --system-information | grep CMAKE_SYSTEM_PROCESSOR`; > > > > We must not be running this on Windows. I don't think we require grep to be installed. If this doesn't break anything, then I guess it can stay, but I don't think this was a beneficial change. > > If you want, I can fix it to avoid grep invocation, with pure perl. Yes -- we must be running this and just not noticing the failure. Or, Cygwin 'grep' is getting used. We'd like to move off of Cygwin in the future, so making this a pure Perl implementation would be much better. Could you do that as a separate bug, though? 1154519 12 mcatanzaro 2016-01-11 15:48:21 -0800 One good solution would be to change this condition to: isCMakeBuild() && !isWindows() 1154571 13 268655 gyuyoung.kim 2016-01-11 17:25:36 -0800 Comment on attachment 268655 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268655&action=review >>>> Tools/Scripts/webkitdirs.pm:342 >>>> $host_processor = `cmake --system-information | grep CMAKE_SYSTEM_PROCESSOR`; >>> >>> We must not be running this on Windows. I don't think we require grep to be installed. If this doesn't break anything, then I guess it can stay, but I don't think this was a beneficial change. >> >> If you want, I can fix it to avoid grep invocation, with pure perl. > > Yes -- we must be running this and just not noticing the failure. Or, Cygwin 'grep' is getting used. We'd like to move off of Cygwin in the future, so making this a pure Perl implementation would be much better. > > Could you do that as a separate bug, though? I thought that win port is using Cygwin. Sorry for missing the plan. Anyway I just file a new bug for this instead - https://bugs.webkit.org/show_bug.cgi?id=152998. 1154572 14 achristensen 2016-01-11 17:27:43 -0800 (In reply to comment #13) > I thought that win port is using Cygwin. Sorry for missing the plan. No problem. Most of our builders do use Cygwin, but we don't require it and we're trying to (slowly) move away from using it. The WinCairo bot doesn't use Cygwin. 1154573 15 gyuyoung.kim 2016-01-11 17:30:29 -0800 (In reply to comment #14) > (In reply to comment #13) > > I thought that win port is using Cygwin. Sorry for missing the plan. > No problem. Most of our builders do use Cygwin, but we don't require it and > we're trying to (slowly) move away from using it. The WinCairo bot doesn't > use Cygwin. I see. I will support the plan as well. 268653 2016-01-10 10:32:31 -0800 2016-01-10 10:34:37 -0800 Patch bug-152959-20160110213159.patch text/plain 2254 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0ODI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDNlNThlNGI1ZWJkMDcyZDE1NjA1ZTk1NGM1MTk3Y2U4 MDZmNjUzZS4uYmZlY2E1MjBhNWY4YTFkNzg1ZTdiYWI5M2JjMWI0NWMxMWMyNTk0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE2LTAxLTEwICBLb25zdGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4K KworICAgICAgICBbd2Via2l0ZGlyc10gVHJ5IGFyY2ggYW5kIHVuYW1lIGNvbW1hbmRzIG9uIG5v bi13aW5kb3dzIE9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTI5NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSaWdodCBub3csIGRldGVybWluZUFyY2hpdGVjdHVyZSgpICB1c2VzIGBhcmNoYCBhbmQg YHVuYW1lIC1tYAorICAgICAgICBjb21tYW5kcyB0byBkZXRlcm1pbmUgYXJjaGl0ZWN0dXJlIGlu IGNhc2Ugb2YgY29uZGl0aW9uIChpc0d0aygpIHx8CisgICAgICAgIGlzQXBwbGVNYWNXZWJLaXQo KSB8fCBpc0VmbCgpKSBpcyB0cnVlLiBUaGlzIHNob3VsZCBiZSAhYW55V2luZG93cygpCisgICAg ICAgIGluc3RlYWQsIGJlY2F1c2UgdGhpcyBjb2RlIGlzIGFwcGxpY2FibGUgdG8gYW55IG5vbi13 aW5kb3dzIE9TIFdlYktpdAorICAgICAgICBzdXBwb3J0cyAoZXZlbiBIYWlrdSB3aGljaCBvbmNl IHdhcyBzdXBwb3J0ZWQgaXMgbW9kZXJhdGVseQorICAgICAgICBQT1NJWC1jb21wbGlhbnQgYW5k IGhhcyB1bmFtZSBjb21tYW5kKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToK KyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6CisKIDIwMTYtMDEtMDggIEFha2FzaCBK YWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIHJ1bi13ZWJraXQtdGVzdHMg bWlzLWNvdW50cyB0b3RhbHMgd2hlbiB0aGVyZSBhcmUgb3RoZXIgY3Jhc2hlcwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IDcwNjk4MGMyMDZiZmNkNWNmOTNlM2U4MzcwZWYwNWM4OTAwNDRiNzEuLmU5YzY0 M2ViMGMwZTE1ZWQ5MGEyZGFkMzEyZGMzNDI4ODEzOGQwYTEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAg LTM0NywxNiArMzQ3LDE4IEBAIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKICAgICAgICAgfQog ICAgIH0KIAotICAgIGlmICghJGFyY2hpdGVjdHVyZSAmJiAoaXNHdGsoKSB8fCBpc0FwcGxlTWFj V2ViS2l0KCkgfHwgaXNFZmwoKSkpIHsKLSAgICAgICAgIyBGYWxsIGJhY2sgdG8gb3V0cHV0IG9m IGBhcmNoJywgaWYgaXQgaXMgcHJlc2VudC4KLSAgICAgICAgJGFyY2hpdGVjdHVyZSA9IGBhcmNo YDsKLSAgICAgICAgY2hvbXAgJGFyY2hpdGVjdHVyZTsKLSAgICB9CisgICAgaWYgKCFhbnlXaW5k b3dzKCkpIHsKKyAgICAgICAgaWYgKCEkYXJjaGl0ZWN0dXJlKSB7CisgICAgICAgICAgICAjIEZh bGwgYmFjayB0byBvdXRwdXQgb2YgYGFyY2gnLCBpZiBpdCBpcyBwcmVzZW50LgorICAgICAgICAg ICAgJGFyY2hpdGVjdHVyZSA9IGBhcmNoYDsKKyAgICAgICAgICAgIGNob21wICRhcmNoaXRlY3R1 cmU7CisgICAgICAgIH0KIAotICAgIGlmICghJGFyY2hpdGVjdHVyZSAmJiAoaXNHdGsoKSB8fCBp c0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNFZmwoKSkpIHsKLSAgICAgICAgIyBGYWxsIGJhY2sgdG8g b3V0cHV0IG9mIGB1bmFtZSAtbScsIGlmIGl0IGlzIHByZXNlbnQuCi0gICAgICAgICRhcmNoaXRl Y3R1cmUgPSBgdW5hbWUgLW1gOwotICAgICAgICBjaG9tcCAkYXJjaGl0ZWN0dXJlOworICAgICAg ICBpZiAoISRhcmNoaXRlY3R1cmUpIHsKKyAgICAgICAgICAgICMgRmFsbCBiYWNrIHRvIG91dHB1 dCBvZiBgdW5hbWUgLW0nLCBpZiBpdCBpcyBwcmVzZW50LgorICAgICAgICAgICAgJGFyY2hpdGVj dHVyZSA9IGB1bmFtZSAtbWA7CisgICAgICAgICAgICBjaG9tcCAkYXJjaGl0ZWN0dXJlOworICAg ICAgICB9CiAgICAgfQogCiAgICAgJGFyY2hpdGVjdHVyZSA9ICd4ODZfNjQnIGlmICgkYXJjaGl0 ZWN0dXJlID1+IC9hbWQ2NC8gJiYgaXNCU0QoKSk7Cg== 268655 2016-01-10 10:34:44 -0800 2016-01-11 07:01:54 -0800 Patch bug-152959-20160110213411.patch text/plain 1323 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0ODI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmZlY2E1MjBhNWY4YTFkNzg1ZTdiYWI5M2JjMWI0NWMx MWMyNTk0ZS4uMmMyOWQ3M2U4NDFjNjk1NTRhMmE0ZjM1NjY0MzhkYzg4MDc0MmYwYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1 IEBACiAyMDE2LTAxLTEwICBLb25zdGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4K IAorICAgICAgICBbd2Via2l0ZGlyc10gVXNlIENNYWtlIHRvIGRldGVybWluZSBhcmNoaXRlY3R1 cmUgb24gaXNDTWFrZUJ1aWxkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1Mjk1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoZGV0ZXJtaW5l QXJjaGl0ZWN0dXJlKToKKworMjAxNi0wMS0xMCAgS29uc3RhbnRpbiBUb2thcmV2ICA8YW5udWxl bkB5YW5kZXgucnU+CisKICAgICAgICAgW3dlYmtpdGRpcnNdIFRyeSBhcmNoIGFuZCB1bmFtZSBj b21tYW5kcyBvbiBub24td2luZG93cyBPUwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTUyOTU4CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBlOWM2NDNlYjBj MGUxNWVkOTBhMmRhZDMxMmRjMzQyODgxMzhkMGExLi4zYTQ3ZWExOWZiNzRkMzAwNTMyZmUxM2Nk YWJiNDM3ZmIxZGYxOTRkIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0K KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0zMzcsNyArMzM3LDcgQEAgc3Vi IGRldGVybWluZUFyY2hpdGVjdHVyZQogICAgICAgICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSAn YXJtdjcnOwogICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgfSBlbHNpZiAoaXNFZmwoKSB8 fCBpc0d0aygpKSB7CisgICAgfSBlbHNpZiAoaXNDTWFrZUJ1aWxkKCkpIHsKICAgICAgICAgbXkg JGhvc3RfcHJvY2Vzc29yID0gIiI7CiAgICAgICAgICRob3N0X3Byb2Nlc3NvciA9IGBjbWFrZSAt LXN5c3RlbS1pbmZvcm1hdGlvbiB8IGdyZXAgQ01BS0VfU1lTVEVNX1BST0NFU1NPUmA7CiAgICAg ICAgIGlmICgkaG9zdF9wcm9jZXNzb3IgPX4gbS9eQ01BS0VfU1lTVEVNX1BST0NFU1NPUiBcIihb XiJdKylcIi8pIHsK