147169 2015-07-21 15:55:55 -0700 Switch WinCairo build to use CMake 2015-07-23 10:28:53 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen commit-queue dbates ossy oldest_to_newest 1111099 0 achristensen 2015-07-21 15:55:55 -0700 It works well enough to automate and find out what goes wrong. We can polish it more once we have a bot that builds WebKit on Windows with CMake. Still needing to be done: 1) Make WebCore's derived sources parallel and not run every time we build anything in WebCore. 2) Get all the features working. WebGL will be especially tricky because that will require a CMake build system for ANGLE that is quite different. 3) Get testing working. 1111101 1 257213 achristensen 2015-07-21 16:05:25 -0700 Created attachment 257213 Patch 1111138 2 257213 achristensen 2015-07-21 17:19:12 -0700 Comment on attachment 257213 Patch I moved most of this to https://bugs.webkit.org/show_bug.cgi?id=147174 I'll do the switch after that lands. 1111339 3 257281 achristensen 2015-07-22 10:31:53 -0700 Created attachment 257281 Patch 1111342 4 257281 bfulgham 2015-07-22 10:48:58 -0700 Comment on attachment 257281 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257281&action=review Looks great! r=me, but please correct the spacing on that concatenation operator. > Tools/Scripts/build-webkit:264 > + $result = buildVisualStudioProject("WebKitBuild/".configuration()."/WebKit.sln", $clean); I think you should have spaces around the concatenation operator (.) 1111354 5 achristensen 2015-07-22 11:16:13 -0700 http://trac.webkit.org/changeset/187169 1111598 6 ossy 2015-07-22 23:29:29 -0700 (In reply to comment #5) > http://trac.webkit.org/changeset/187169 It broke the Apple Windows build. Don't you watch the bots when you land patches? 1111658 7 achristensen 2015-07-23 10:28:53 -0700 I did not in this case. I should have. Fix committed to http://trac.webkit.org/changeset/187235 257213 2015-07-21 16:05:25 -0700 2015-07-22 10:31:52 -0700 Patch bug-147169-20150721160411.patch text/plain 11329 achristensen SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDE4NzEz MSkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA3 LTIxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgU3dpdGNoIFdpbkNhaXJvIGJ1aWxkIHRvIHVzZSBDTWFrZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzE2OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNXaW5k b3dzLmNtYWtlOgorICAgICAgICBBZGRlZCBvcHRpb25zIEkgcmVtb3ZlZCBpbiByMTg3MDIyLiBU aGV5IGFyZSBpbmRlZWQgbmVlZGVkLgorICAgICAgICAqIFNvdXJjZS9jbWFrZS9XZWJLaXRGUy5j bWFrZToKKyAgICAgICAgTWFrZSBEZXJpdmVkU291cmNlcy9XZWJLaXQgaWYgV0sxIGlzIGVuYWJs ZWQuCisKIDIwMTUtMDctMjAgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXN1cnJlY3QgQ01ha2UgYnVpbGQgb24gV2luZG93cy4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cJKHJldmlzaW9uIDE4NzEzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE1LTA3LTIxICBBbGV4IENocmlzdGVu c2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3dpdGNoIFdpbkNhaXJv IGJ1aWxkIHRvIHVzZSBDTWFrZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0NzE2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcGxhdGZvcm0vd2luL1dpbmRvd3NUb3VjaC5oOgorICAgICAgICBSZW1v dmUgdW5uZWVkZWQgZGVjbGFyYXRpb25zIHRoYXQgYXJlIGluIHdpbnVzZXIuaC4KKwogMjAxNS0w Ny0yMSAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1dHRAYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1NdIEtleWJvYXJkIGJvbGQvaXRhbGljL3VuZGVybGluZSBrZXlzIGRvbid0IGhpZ2hsaWdodCBh ZnRlciBiZWluZwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1dpbmRvd3NUb3Vj aC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XaW5kb3dzVG91 Y2guaAkocmV2aXNpb24gMTg3MTMxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1dp bmRvd3NUb3VjaC5oCSh3b3JraW5nIGNvcHkpCkBAIC03MSw0MiArNzEsNCBAQAogI2RlZmluZSBH Q19QUkVTU0FORFRBUCAweDAwMDAwMDAxCiAjZGVmaW5lIEdDX1JPTExPVkVSIEdDX1BSRVNTQU5E VEFQCiAKLS8vIEdFU1RVUkVJTkZPIHN0cnVjdCBkZWZpbml0aW9uCi10eXBlZGVmIHN0cnVjdCB0 YWdHRVNUVVJFSU5GTyB7Ci0gICAgVUlOVCBjYlNpemU7ICAgICAgICAgICAgICAgICAgICAvLyBz aXplLCBpbiBieXRlcywgb2YgdGhpcyBzdHJ1Y3R1cmUgKGluY2x1ZGluZyB2YXJpYWJsZSBsZW5n dGggQXJncyBmaWVsZCkKLSAgICBEV09SRCBkd0ZsYWdzOyAgICAgICAgICAgICAgICAgIC8vIHNl ZSBHRl8qIGZsYWdzCi0gICAgRFdPUkQgZHdJRDsgICAgICAgICAgICAgICAgICAgICAvLyBnZXN0 dXJlIElELCBzZWUgR0lEXyogZGVmaW5lcwotICAgIEhXTkQgaHduZFRhcmdldDsgICAgICAgICAg ICAgICAgLy8gaGFuZGxlIHRvIHdpbmRvdyB0YXJnZXRlZCBieSB0aGlzIGdlc3R1cmUKLSAgICBQ T0lOVFMgcHRzTG9jYXRpb247ICAgICAgICAgICAgIC8vIGN1cnJlbnQgbG9jYXRpb24gb2YgdGhp cyBnZXN0dXJlCi0gICAgRFdPUkQgZHdJbnN0YW5jZUlEOyAgICAgICAgICAgICAvLyBpbnRlcm5h bGx5IHVzZWQKLSAgICBEV09SRCBkd1NlcXVlbmNlSUQ7ICAgICAgICAgICAgIC8vIGludGVybmFs bHkgdXNlZAotICAgIFVMT05HTE9ORyB1bGxBcmd1bWVudHM7ICAgICAgICAgLy8gYXJndW1lbnRz IGZvciBnZXN0dXJlcyB3aG9zZSBhcmd1bWVudHMgZml0IGluIDggQllURVMKLSAgICBVSU5UIGNi RXh0cmFBcmdzOyAgICAgICAgICAgICAgIC8vIHNpemUsIGluIGJ5dGVzLCBvZiBleHRyYSBhcmd1 bWVudHMsIGlmIGFueSwgdGhhdCBhY2NvbXBhbnkgdGhpcyBnZXN0dXJlCi19IEdFU1RVUkVJTkZP LCAqUEdFU1RVUkVJTkZPOwotdHlwZWRlZiBHRVNUVVJFSU5GTyBjb25zdCAqIFBDR0VTVFVSRUlO Rk87Ci0KLS8vIEdFU1RVUkVDT05GSUcgc3RydWN0IGRlZmludGlvbgotdHlwZWRlZiBzdHJ1Y3Qg dGFnR0VTVFVSRUNPTkZJRyB7Ci0gICAgRFdPUkQgZHdJRDsgICAgICAgICAgICAgICAgICAgICAv LyBnZXN0dXJlIElECi0gICAgRFdPUkQgZHdXYW50OyAgICAgICAgICAgICAgICAgICAvLyBzZXR0 aW5ncyByZWxhdGVkIHRvIGdlc3R1cmUgSUQgdGhhdCBhcmUgdG8gYmUgdHVybmVkIG9uCi0gICAg RFdPUkQgZHdCbG9jazsgICAgICAgICAgICAgICAgICAvLyBzZXR0aW5ncyByZWxhdGVkIHRvIGdl c3R1cmUgSUQgdGhhdCBhcmUgdG8gYmUgdHVybmVkIG9mZgotfSBHRVNUVVJFQ09ORklHLCAqUEdF U1RVUkVDT05GSUc7Ci0KLS8qCi0gKiBHZXN0dXJlIG5vdGlmaWNhdGlvbiBzdHJ1Y3R1cmUKLSAq ICAgLSBUaGUgV01fR0VTVFVSRU5PVElGWSBtZXNzYWdlIGxQYXJhbSBjb250YWlucyBhIHBvaW50 ZXIgdG8gdGhpcyBzdHJ1Y3R1cmUuCi0gKiAgIC0gVGhlIFdNX0dFU1RVUkVOT1RJRlkgbWVzc2Fn ZSBub3RpZmllcyBhIHdpbmRvdyB0aGF0IGdlc3R1cmUgcmVjb2duaXRpb24gaXMKLSAqICAgICBp biBwcm9ncmVzcyBhbmQgYSBnZXN0dXJlIHdpbGwgYmUgZ2VuZXJhdGVkIGlmIG9uZSBpcyByZWNv Z25pemVkIHVuZGVyIHRoZQotICogICAgIGN1cnJlbnQgZ2VzdHVyZSBzZXR0aW5ncy4KLSAqLwot dHlwZWRlZiBzdHJ1Y3QgdGFnR0VTVFVSRU5PVElGWVNUUlVDVCB7Ci0gICAgVUlOVCBjYlNpemU7 ICAgICAgICAgICAgICAgICAgICAvLyBzaXplLCBpbiBieXRlcywgb2YgdGhpcyBzdHJ1Y3R1cmUK LSAgICBEV09SRCBkd0ZsYWdzOyAgICAgICAgICAgICAgICAgIC8vIHVudXNlZAotICAgIEhXTkQg aHduZFRhcmdldDsgICAgICAgICAgICAgICAgLy8gaGFuZGxlIHRvIHdpbmRvdyB0YXJnZXRlZCBi eSB0aGUgZ2VzdHVyZQotICAgIFBPSU5UUyBwdHNMb2NhdGlvbjsgICAgICAgICAgICAgLy8gc3Rh cnRpbmcgbG9jYXRpb24KLSAgICBEV09SRCBkd0luc3RhbmNlSUQ7ICAgICAgICAgICAgIC8vIGlu dGVybmFsbHkgdXNlZAotfSBHRVNUVVJFTk9USUZZU1RSVUNULCAqUEdFU1RVUkVOT1RJRllTVFJV Q1Q7Ci0KLURFQ0xBUkVfSEFORExFKEhHRVNUVVJFSU5GTyk7Ci0KICNlbmRpZgpJbmRleDogU291 cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2lu L0NoYW5nZUxvZwkocmV2aXNpb24gMTg3MTMxKQorKysgU291cmNlL1dlYktpdC93aW4vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMDctMjEgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBTd2l0Y2ggV2lu Q2Fpcm8gYnVpbGQgdG8gdXNlIENNYWtlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgSW5jbHVkZSB3aW51c2Vy LmggdG8gaGF2ZSBkZWZpbml0aW9ucyBvZiB0b3VjaC1yZWxhdGVkIHN0cnVjdHVyZXMgbGlrZSB0 YWdHRVNUVVJFSU5GTy4KKwogMjAxNS0wNy0yMSAgUGVyIEFybmUgVm9sbGFuICA8cGVhdm9Ab3V0 bG9vay5jb20+CiAKICAgICAgICAgV2luTGF1bmNoZXIgZG9lcyBub3Qgc3RhcnQgb24gV2luWFAu CkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gMTg3MTMxKQorKysgU291cmNlL1dl YktpdC93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5NSw2ICsxOTUsNyBAQAog I2luY2x1ZGUgPG9sZWFjYy5oPgogI2luY2x1ZGUgPHdjaGFyLmg+CiAjaW5jbHVkZSA8d2luZG93 c3guaD4KKyNpbmNsdWRlIDx3aW51c2VyLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNp bmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQ29u Y2F0ZW5hdGUuaD4KSW5kZXg6IFNvdXJjZS9jbWFrZS9PcHRpb25zV2luZG93cy5jbWFrZQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvY21ha2UvT3B0aW9uc1dpbmRvd3MuY21ha2UJKHJldmlzaW9uIDE4 NzEzMSkKKysrIFNvdXJjZS9jbWFrZS9PcHRpb25zV2luZG93cy5jbWFrZQkod29ya2luZyBjb3B5 KQpAQCAtMjEsNiArMjEsOCBAQCBpZiAoTVNWQykKICAgICAgICAgL3dkNDcwNiAvd2Q0ODAwIC93 ZDQ4MTkgL3dkNDk1MSAvd2Q0OTUyIC93ZDQ5OTYgL3dkNjAxMSAvd2Q2MDMxIC93ZDYyMTEgL3dk NjI0NiAvd2Q2MjU1IC93ZDYzODcKICAgICAgICAgL01QCiAgICAgKQorICAgIHN0cmluZyhSRUdF WCBSRVBMQUNFICIvRUhbYS16XSsiICIiIENNQUtFX0NYWF9GTEFHUyAke0NNQUtFX0NYWF9GTEFH U30pICMgRGlzYWJsZSBDKysgZXhjZXB0aW9ucworICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIv R1IiICIiIENNQUtFX0NYWF9GTEFHUyAke0NNQUtFX0NYWF9GTEFHU30pICMgRGlzYWJsZSBSVFRJ CiBlbmRpZiAoKQogCiBzZXQoUE9SVCBXaW4pCkluZGV4OiBTb3VyY2UvY21ha2UvV2ViS2l0RlMu Y21ha2UKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL2NtYWtlL1dlYktpdEZTLmNtYWtlCShyZXZpc2lv biAxODcxMzEpCisrKyBTb3VyY2UvY21ha2UvV2ViS2l0RlMuY21ha2UJKHdvcmtpbmcgY29weSkK QEAgLTEzLDQgKzEzLDUgQEAgZW5kaWYgKCkKIAogaWYgKEVOQUJMRV9XRUJLSVQpCiAgICAgZmls ZShNQUtFX0RJUkVDVE9SWSAke0RFUklWRURfU09VUkNFU19XRUJLSVRMRUdBQ1lfRElSfSkKKyAg ICBmaWxlKE1BS0VfRElSRUNUT1JZICR7REVSSVZFRF9TT1VSQ0VTX1dFQktJVF9ESVJ9KQogZW5k aWYgKCkKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VM b2cJKHJldmlzaW9uIDE4NzEzMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDIyIEBACisyMDE1LTA3LTIxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3dpdGNoIFdpbkNhaXJvIGJ1aWxkIHRvIHVzZSBD TWFrZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NzE2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog Q01ha2VMaXN0cy50eHQ6CisgICAgICAgIERpc2FibGUgYnVpbGRpbmcgRHVtcFJlbmRlclRyZWUg d2l0aCBDTWFrZSBmb3Igbm93LgorICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGRldGVybWluZUNvbmZpZ3Vy YXRpb24pOgorICAgICAgICAoZGV0ZXJtaW5lQXJjaGl0ZWN0dXJlKToKKyAgICAgICAgKGRldGVy bWluZVBhc3NlZENvbmZpZ3VyYXRpb24pOgorICAgICAgICAocGFzc2VkQ29uZmlndXJhdGlvbik6 CisgICAgICAgIEJ1aWxkIFdpbkNhaXJvIHdpdGggQ01ha2UgYnkgZ2VuZXJhdGluZyBXZWJLaXQu c2xuIHdpdGggLURQT1JUPVdpbkNhaXJvIGFuZCB1c2luZyB0aGUgUmVsZWFzZSBjb25maWd1cmF0 aW9uLgorICAgICAgICAqIFdpbkxhdW5jaGVyL0NNYWtlTGlzdHMudHh0OgorICAgICAgICBSZW5h bWUgV2luTGF1bmNoZXJMYXVuY2hlciB0byBXaW5MYXVuY2hlci4KKwogMjAxNS0wNy0yMSAgRmls aXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeGVkIFZNIHBvb2wgYWxs b2NhdGlvbiBzaG91bGQgaGF2ZSBhIHJlc2VydmUgZm9yIGFsbG9jYXRpb25zIHRoYXQgY2Fubm90 IGZhaWwKSW5kZXg6IFRvb2xzL0NNYWtlTGlzdHMudHh0Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NN YWtlTGlzdHMudHh0CShyZXZpc2lvbiAxODcxMzEpCisrKyBUb29scy9DTWFrZUxpc3RzLnR4dAko d29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsNyBAQCBlbHNlaWYgKCIke1BPUlR9IiBTVFJFUVVB TCAiR1RLIikKIGVuZGlmICgpCiAKIGlmIChXSU4zMikKLSAgICBhZGRfc3ViZGlyZWN0b3J5KER1 bXBSZW5kZXJUcmVlKQorI0ZJWE1FOiBHZXQgRHVtcFJlbmRlclRyZWUgd29ya2luZyB3aXRoIENN YWtlLgogICAgIGFkZF9zdWJkaXJlY3RvcnkoV2luTGF1bmNoZXIpCiBlbmRpZiAoKQogCkluZGV4 OiBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L2J1aWxkLXdlYmtpdAkocmV2aXNpb24gMTg3MTMxKQorKysgVG9vbHMvU2NyaXB0cy9idWlsZC13 ZWJraXQJKHdvcmtpbmcgY29weSkKQEAgLTI1OCwxNiArMjU4LDIyIEBAIGZvciBteSAkZGlyIChA cHJvamVjdHMpIHsKICAgICAgICAgfQogICAgICAgICAkcmVzdWx0ID0gYnVpbGRYQ29kZVByb2pl Y3QoJHByb2plY3RQYXRoLCAkY2xlYW4sIEBsb2NhbF9vcHRpb25zLCBAQVJHVik7CiAgICAgfSBl bHNpZiAoaXNBcHBsZVdpbldlYktpdCgpIHx8IGlzV2luQ2Fpcm8oKSkgewotICAgICAgICBpZiAo JHByb2plY3QgZXEgIldlYktpdCIpIHsKKyAgICAgICAgaWYgKGlzV2luQ2Fpcm8oKSkgeworICAg ICAgICAgICAgY2hkaXJXZWJLaXQoKTsKKyAgICAgICAgICAgIG1rZGlyKCJXZWJLaXRCdWlsZENN YWtlIik7CisgICAgICAgICAgICBjaGRpcigiV2ViS2l0QnVpbGRDTWFrZSIpOworICAgICAgICAg ICAgc3lzdGVtKCJjbWFrZSAuLiAtRFBPUlQ9V2luQ2Fpcm8iKTsKKyAgICAgICAgICAgICRyZXN1 bHQgPSBidWlsZFZpc3VhbFN0dWRpb1Byb2plY3QoIldlYktpdC5zbG4iLCAkY2xlYW4pOworICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgbXkgJHdlYmtpdFNvbHV0aW9uUGF0aCA9ICJXZWJL aXQudmN4cHJvai9XZWJLaXQuc2xuIjsKICAgICAgICAgICAgICRyZXN1bHQgPSBidWlsZFZpc3Vh bFN0dWRpb1Byb2plY3QoJHdlYmtpdFNvbHV0aW9uUGF0aCwgJGNsZWFuKTsKKyAgICAgICAgfQor ICAgICAgICBpZiAodXNpbmdWaXN1YWxTdHVkaW9FeHByZXNzKCkpIHsKKyAgICAgICAgICAgICMg VmlzdWFsIFN0dWRpbyBFeHByZXNzIGlzIHNvIGxhbWUgaXQgY2FuJ3Qgc3Rkb3V0IGJ1aWxkIGZh aWx1cmVzLgorICAgICAgICAgICAgIyBTbyB3ZSBmaW5kIGl0cyBsb2dzIGFuZCBkdW1wIHRoZW0g dG8gdGhlIGNvbnNvbGUgb3Vyc2VsdmVzLgogICAgICAgICAgICAgbXkgJHZzQ29uZmlndXJhdGlv biA9IGNvbmZpZ3VyYXRpb24oKTsKLSAgICAgICAgICAgIGlmICh1c2luZ1Zpc3VhbFN0dWRpb0V4 cHJlc3MoKSkgewotICAgICAgICAgICAgICAgICMgVmlzdWFsIFN0dWRpbyBFeHByZXNzIGlzIHNv IGxhbWUgaXQgY2FuJ3Qgc3Rkb3V0IGJ1aWxkIGZhaWx1cmVzLgotICAgICAgICAgICAgICAgICMg U28gd2UgZmluZCBpdHMgbG9ncyBhbmQgZHVtcCB0aGVtIHRvIHRoZSBjb25zb2xlIG91cnNlbHZl cy4KLSAgICAgICAgICAgICAgICBvcGVuKG15ICRPVVRQVVRfSEFORExFLCAnPCcsICIkYmFzZVBy b2R1Y3REaXIvJHZzQ29uZmlndXJhdGlvbi9CdWlsZE91dHB1dC5odG0iKSBvciBkaWUgIkNvdWxk IG5vdCBvcGVuIGJ1aWxkIGxvZyBmaWxlIGF0ICRiYXNlUHJvZHVjdERpci8kdnNDb25maWd1cmF0 aW9uL0J1aWxkT3V0cHV0Lmh0bSI7Ci0gICAgICAgICAgICAgICAgcHJpbnQgd2hpbGUgKDwkT1VU UFVUX0hBTkRMRT4pOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgb3BlbihteSAkT1VUUFVU X0hBTkRMRSwgJzwnLCAiJGJhc2VQcm9kdWN0RGlyLyR2c0NvbmZpZ3VyYXRpb24vQnVpbGRPdXRw dXQuaHRtIikgb3IgZGllICJDb3VsZCBub3Qgb3BlbiBidWlsZCBsb2cgZmlsZSBhdCAkYmFzZVBy b2R1Y3REaXIvJHZzQ29uZmlndXJhdGlvbi9CdWlsZE91dHB1dC5odG0iOworICAgICAgICAgICAg cHJpbnQgd2hpbGUgKDwkT1VUUFVUX0hBTkRMRT4pOwogICAgICAgICB9CiAgICAgfQogICAgICMg VmFyaW91cyBidWlsZCogY2FsbHMgYWJvdmUgbWF5IGNoYW5nZSB0aGUgQ1dELgpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbQkocmV2aXNpb24gMTg3MTMxKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCSh3b3JraW5nIGNvcHkpCkBAIC0yOTIsMTIgKzI5Miw2IEBAIHN1YiBkZXRlcm1pbmVDb25m aWd1cmF0aW9uCiAgICAgfSBlbHNlIHsKICAgICAgICAgJGNvbmZpZ3VyYXRpb24gPSAiUmVsZWFz ZSI7CiAgICAgfQotCi0gICAgaWYgKCRjb25maWd1cmF0aW9uICYmIGlzV2luQ2Fpcm8oKSkgewot ICAgICAgICB1bmxlc3MgKCRjb25maWd1cmF0aW9uID1+IC9fV2luQ2Fpcm8kLykgewotICAgICAg ICAgICAgJGNvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyI7Ci0gICAgICAgIH0KLSAgICB9CiB9 CiAKIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKQEAgLTcxNSw4ICs3MDksNiBAQCBzdWIgZGV0 ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbgogICAgIH0gZWxzaWYgKGNoZWNrRm9yQXJndW1lbnRB bmRSZW1vdmVGcm9tQVJHVigiLS1wcm9maWxlIikgfHwgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92 ZUZyb21BUkdWKCItLXByb2ZpbGluZyIpKSB7CiAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9u ID0gIlByb2ZpbGluZyI7CiAgICAgfQotCi0gICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9X aW5DYWlybyIgaWYgKGRlZmluZWQoJHBhc3NlZENvbmZpZ3VyYXRpb24pICYmIGlzV2luQ2Fpcm8o KSk7CiB9CiAKIHN1YiBwYXNzZWRDb25maWd1cmF0aW9uCkluZGV4OiBUb29scy9XaW5MYXVuY2hl ci9DTWFrZUxpc3RzLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XaW5MYXVuY2hlci9DTWFrZUxp c3RzLnR4dAkocmV2aXNpb24gMTg3MTMxKQorKysgVG9vbHMvV2luTGF1bmNoZXIvQ01ha2VMaXN0 cy50eHQJKHdvcmtpbmcgY29weSkKQEAgLTM4LDEzICszOCwxNiBAQCBzZXQoV2luTGF1bmNoZXJf TElCUkFSSUVTCiAKIHNldChDTUFLRV9FWEVfTElOS0VSX0ZMQUdTICIke0NNQUtFX0VYRV9MSU5L RVJfRkxBR1N9IC9FTlRSWTp3V2luTWFpbkNSVFN0YXJ0dXAiKQogCi1hZGRfZGVmaW5pdGlvbnMo LURfVU5JQ09ERSAtRFdJTl9DQUlSTykKK2lmICgke1dURl9QTEFURk9STV9XSU5fQ0FJUk99KQor ICAgIGFkZF9kZWZpbml0aW9ucygtRFdJTl9DQUlSTykKK2VuZGlmICgpCithZGRfZGVmaW5pdGlv bnMoLURfVU5JQ09ERSkKIGluY2x1ZGVfZGlyZWN0b3JpZXMoJHtXaW5MYXVuY2hlcl9JTkNMVURF X0RJUkVDVE9SSUVTfSkKLWFkZF9saWJyYXJ5KFdpbkxhdW5jaGVyIFNIQVJFRCAke1dpbkxhdW5j aGVyX1NPVVJDRVN9KQotdGFyZ2V0X2xpbmtfbGlicmFyaWVzKFdpbkxhdW5jaGVyICR7V2luTGF1 bmNoZXJfTElCUkFSSUVTfSkKLXNldF90YXJnZXRfcHJvcGVydGllcyhXaW5MYXVuY2hlciBQUk9Q RVJUSUVTIEZPTERFUiAiVG9vbHMiKQorYWRkX2xpYnJhcnkoV2luTGF1bmNoZXJMaWIgU0hBUkVE ICR7V2luTGF1bmNoZXJfU09VUkNFU30pCit0YXJnZXRfbGlua19saWJyYXJpZXMoV2luTGF1bmNo ZXJMaWIgJHtXaW5MYXVuY2hlcl9MSUJSQVJJRVN9KQorc2V0X3RhcmdldF9wcm9wZXJ0aWVzKFdp bkxhdW5jaGVyTGliIFBST1BFUlRJRVMgRk9MREVSICJUb29scyIpCiAKLWFkZF9leGVjdXRhYmxl KFdpbkxhdW5jaGVyTGF1bmNoZXIgV0lOMzIgJHtUT09MU19ESVJ9L3dpbi9ETExMYXVuY2hlci9E TExMYXVuY2hlck1haW4uY3BwIFdpbkxhdW5jaGVyLnZjeHByb2ovV2luTGF1bmNoZXIucmMpCi10 YXJnZXRfbGlua19saWJyYXJpZXMoV2luTGF1bmNoZXJMYXVuY2hlciBzaGx3YXBpKQotc2V0X3Rh cmdldF9wcm9wZXJ0aWVzKFdpbkxhdW5jaGVyTGF1bmNoZXIgUFJPUEVSVElFUyBGT0xERVIgIlRv b2xzIikKLXNldF90YXJnZXRfcHJvcGVydGllcyhXaW5MYXVuY2hlckxhdW5jaGVyIFBST1BFUlRJ RVMgT1VUUFVUX05BTUUgIldpbkxhdW5jaGVyIikKK2FkZF9leGVjdXRhYmxlKFdpbkxhdW5jaGVy IFdJTjMyICR7VE9PTFNfRElSfS93aW4vRExMTGF1bmNoZXIvRExMTGF1bmNoZXJNYWluLmNwcCBX aW5MYXVuY2hlci52Y3hwcm9qL1dpbkxhdW5jaGVyLnJjKQordGFyZ2V0X2xpbmtfbGlicmFyaWVz KFdpbkxhdW5jaGVyIHNobHdhcGkpCitzZXRfdGFyZ2V0X3Byb3BlcnRpZXMoV2luTGF1bmNoZXIg UFJPUEVSVElFUyBGT0xERVIgIlRvb2xzIikKK3NldF90YXJnZXRfcHJvcGVydGllcyhXaW5MYXVu Y2hlciBQUk9QRVJUSUVTIE9VVFBVVF9OQU1FICJXaW5MYXVuY2hlciIpCg== 257281 2015-07-22 10:31:53 -0700 2015-07-22 10:48:58 -0700 Patch bug-147169-20150722103039.patch text/plain 4385 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NzE2NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE1LTA3LTIyICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgU3dpdGNoIFdpbkNhaXJvIGJ1aWxkIHRvIHVzZSBDTWFrZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzE2OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy9idWlsZC13ZWJraXQ6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAg ICAoZGV0ZXJtaW5lQ29uZmlndXJhdGlvbik6CisgICAgICAgIChkZXRlcm1pbmVBcmNoaXRlY3R1 cmUpOgorICAgICAgICAoZGV0ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbik6CisgICAgICAgIChw YXNzZWRDb25maWd1cmF0aW9uKToKKyAgICAgICAgKGpoYnVpbGRXcmFwcGVyUHJlZml4SWZOZWVk ZWQpOgorICAgICAgICAoZ2VuZXJhdGVCdWlsZFN5c3RlbUZyb21DTWFrZVByb2plY3QpOgorICAg ICAgICBJdCdzIENNYWtlIHRpbWUhICBXZSBub3cgdXNlIHRoZSBDTWFrZSBmaWxlcyB0byBnZW5l cmF0ZSBhIHNvbHV0aW9uIGluIFdlYktpdEJ1aWxkL1JlbGVhc2UvV2ViS2l0LnNsbiBhbmQgYnVp bGQgdGhhdC4KKwogMjAxNS0wNy0yMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBxdWlya3MgaW4gQ01ha2UgYnVpbGQgb24gTWFjIGFu ZCBXaW5kb3dzCkluZGV4OiBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkocmV2aXNpb24gMTg3MTYwKQorKysgVG9vbHMv U2NyaXB0cy9idWlsZC13ZWJraXQJKHdvcmtpbmcgY29weSkKQEAgLTI1OCwxNiArMjU4LDIwIEBA IGZvciBteSAkZGlyIChAcHJvamVjdHMpIHsKICAgICAgICAgfQogICAgICAgICAkcmVzdWx0ID0g YnVpbGRYQ29kZVByb2plY3QoJHByb2plY3RQYXRoLCAkY2xlYW4sIEBsb2NhbF9vcHRpb25zLCBA QVJHVik7CiAgICAgfSBlbHNpZiAoaXNBcHBsZVdpbldlYktpdCgpIHx8IGlzV2luQ2Fpcm8oKSkg ewotICAgICAgICBpZiAoJHByb2plY3QgZXEgIldlYktpdCIpIHsKKyAgICAgICAgaWYgKGlzV2lu Q2Fpcm8oKSkgeworICAgICAgICAgICAgY2hkaXJXZWJLaXQoKTsKKyAgICAgICAgICAgIGdlbmVy YXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0KCJXaW5DYWlybyIpOworICAgICAgICAgICAg JHJlc3VsdCA9IGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdCgiV2ViS2l0QnVpbGQvIi5jb25maWd1 cmF0aW9uKCkuIi9XZWJLaXQuc2xuIiwgJGNsZWFuKTsKKyAgICAgICAgfSBlbHNlIHsKICAgICAg ICAgICAgIG15ICR3ZWJraXRTb2x1dGlvblBhdGggPSAiV2ViS2l0LnZjeHByb2ovV2ViS2l0LnNs biI7CiAgICAgICAgICAgICAkcmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCR3ZWJr aXRTb2x1dGlvblBhdGgsICRjbGVhbik7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHVzaW5nVmlz dWFsU3R1ZGlvRXhwcmVzcygpKSB7CisgICAgICAgICAgICAjIFZpc3VhbCBTdHVkaW8gRXhwcmVz cyBpcyBzbyBsYW1lIGl0IGNhbid0IHN0ZG91dCBidWlsZCBmYWlsdXJlcy4KKyAgICAgICAgICAg ICMgU28gd2UgZmluZCBpdHMgbG9ncyBhbmQgZHVtcCB0aGVtIHRvIHRoZSBjb25zb2xlIG91cnNl bHZlcy4KICAgICAgICAgICAgIG15ICR2c0NvbmZpZ3VyYXRpb24gPSBjb25maWd1cmF0aW9uKCk7 Ci0gICAgICAgICAgICBpZiAodXNpbmdWaXN1YWxTdHVkaW9FeHByZXNzKCkpIHsKLSAgICAgICAg ICAgICAgICAjIFZpc3VhbCBTdHVkaW8gRXhwcmVzcyBpcyBzbyBsYW1lIGl0IGNhbid0IHN0ZG91 dCBidWlsZCBmYWlsdXJlcy4KLSAgICAgICAgICAgICAgICAjIFNvIHdlIGZpbmQgaXRzIGxvZ3Mg YW5kIGR1bXAgdGhlbSB0byB0aGUgY29uc29sZSBvdXJzZWx2ZXMuCi0gICAgICAgICAgICAgICAg b3BlbihteSAkT1VUUFVUX0hBTkRMRSwgJzwnLCAiJGJhc2VQcm9kdWN0RGlyLyR2c0NvbmZpZ3Vy YXRpb24vQnVpbGRPdXRwdXQuaHRtIikgb3IgZGllICJDb3VsZCBub3Qgb3BlbiBidWlsZCBsb2cg ZmlsZSBhdCAkYmFzZVByb2R1Y3REaXIvJHZzQ29uZmlndXJhdGlvbi9CdWlsZE91dHB1dC5odG0i OwotICAgICAgICAgICAgICAgIHByaW50IHdoaWxlICg8JE9VVFBVVF9IQU5ETEU+KTsKLSAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIG9wZW4obXkgJE9VVFBVVF9IQU5ETEUsICc8JywgIiRiYXNl UHJvZHVjdERpci8kdnNDb25maWd1cmF0aW9uL0J1aWxkT3V0cHV0Lmh0bSIpIG9yIGRpZSAiQ291 bGQgbm90IG9wZW4gYnVpbGQgbG9nIGZpbGUgYXQgJGJhc2VQcm9kdWN0RGlyLyR2c0NvbmZpZ3Vy YXRpb24vQnVpbGRPdXRwdXQuaHRtIjsKKyAgICAgICAgICAgIHByaW50IHdoaWxlICg8JE9VVFBV VF9IQU5ETEU+KTsKICAgICAgICAgfQogICAgIH0KICAgICAjIFZhcmlvdXMgYnVpbGQqIGNhbGxz IGFib3ZlIG1heSBjaGFuZ2UgdGhlIENXRC4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9u IDE4NzE2MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpA QCAtMjkyLDEyICsyOTIsNiBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbgogICAgIH0gZWxz ZSB7CiAgICAgICAgICRjb25maWd1cmF0aW9uID0gIlJlbGVhc2UiOwogICAgIH0KLQotICAgIGlm ICgkY29uZmlndXJhdGlvbiAmJiBpc1dpbkNhaXJvKCkpIHsKLSAgICAgICAgdW5sZXNzICgkY29u ZmlndXJhdGlvbiA9fiAvX1dpbkNhaXJvJC8pIHsKLSAgICAgICAgICAgICRjb25maWd1cmF0aW9u IC49ICJfV2luQ2Fpcm8iOwotICAgICAgICB9Ci0gICAgfQogfQogCiBzdWIgZGV0ZXJtaW5lQXJj aGl0ZWN0dXJlCkBAIC03MTUsOCArNzA5LDYgQEAgc3ViIGRldGVybWluZVBhc3NlZENvbmZpZ3Vy YXRpb24KICAgICB9IGVsc2lmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0t cHJvZmlsZSIpIHx8IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1wcm9maWxp bmciKSkgewogICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJQcm9maWxpbmciOwogICAg IH0KLQotICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fpcm8iIGlmIChkZWZpbmVk KCRwYXNzZWRDb25maWd1cmF0aW9uKSAmJiBpc1dpbkNhaXJvKCkpOwogfQogCiBzdWIgcGFzc2Vk Q29uZmlndXJhdGlvbgpAQCAtMTcyNSw2ICsxNzE3LDkgQEAgc3ViIGlzQ2FjaGVkQXJndW1lbnRm aWxlT3V0T2ZEYXRlKCRAKQogCiBzdWIgamhidWlsZFdyYXBwZXJQcmVmaXhJZk5lZWRlZCgpCiB7 CisgICAgaWYgKGlzV2luZG93cygpKSB7CisgICAgICAgIHJldHVybiAoKTsKKyAgICB9CiAgICAg aWYgKC1lIGdldEpoYnVpbGRQYXRoKCkpIHsKICAgICAgICAgbXkgQHByZWZpeCA9IChGaWxlOjpT cGVjLT5jYXRmaWxlKHNvdXJjZURpcigpLCAiVG9vbHMiLCAiamhidWlsZCIsICJqaGJ1aWxkLXdy YXBwZXIiKSk7CiAgICAgICAgIGlmIChpc0VmbCgpKSB7CkBAIC0xODYzLDcgKzE4NTgsNyBAQCBz dWIgZ2VuZXJhdGVCdWlsZFN5c3RlbUZyb21DTWFrZVByb2plY3QKICAgICAjIENvbXBpbGVyIG9w dGlvbnMgdG8ga2VlcCBmbG9hdGluZyBwb2ludCB2YWx1ZXMgY29uc2lzdGVudAogICAgICMgYmV0 d2VlbiAzMi1iaXQgYW5kIDY0LWJpdCBhcmNoaXRlY3R1cmVzLgogICAgIGRldGVybWluZUFyY2hp dGVjdHVyZSgpOwotICAgIGlmICgkYXJjaGl0ZWN0dXJlIG5lICJ4ODZfNjQiICYmICFpc0FSTSgp ICYmICFpc0Nyb3NzQ29tcGlsYXRpb24oKSkgeworICAgIGlmICgkYXJjaGl0ZWN0dXJlIG5lICJ4 ODZfNjQiICYmICFpc0FSTSgpICYmICFpc0Nyb3NzQ29tcGlsYXRpb24oKSAmJiAhaXNXaW5kb3dz KCkpIHsKICAgICAgICAgJEVOVnsnQ1hYRkxBR1MnfSA9ICItbWFyY2g9cGVudGl1bTQgLW1zc2Uy IC1tZnBtYXRoPXNzZSAiIC4gKCRFTlZ7J0NYWEZMQUdTJ30gfHwgIiIpOwogICAgIH0KIAo=