104434 2012-12-08 00:19:43 -0800 Make ninja the default build system for build-webkit --chromium on linux 2013-02-25 07:48:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 104731 105498 105671 110731 106737 106836 1 eric eric abarth dbates dpranke evan ilevy michelangelo peter podivilov scottmg thakis webkit.review.bot oldest_to_newest 786449 0 eric 2012-12-08 00:19:43 -0800 Make ninja the default build system for build-webkit --chromium 786450 1 178344 eric 2012-12-08 00:22:45 -0800 Created attachment 178344 Patch 786452 2 178344 eric 2012-12-08 00:34:07 -0800 Comment on attachment 178344 Patch I've emailed webkit-dev to give folks a chance to scream if they're Chromium contributors and anti-ninja for whatever reason. I'll land this on Tuesday, once I give folks at least one work-day to reply. 786460 3 178344 dbates 2012-12-08 01:14:14 -0800 Comment on attachment 178344 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178344&action=review The patch looks good to me. I noticed some very minor spelling nits. As you mentioned in comment 2, we should wait until next week to land this patch so as to give people an opportunity to digest the webkit-dev email and provide feedback. > Tools/ChangeLog:3 > + Make ninja the default build system for build-webkit --chromium Nit: ninja => Ninja The word "ninja" appears five more times as a proper noun in this patch. > Tools/ChangeLog:9 > + as their default build system instead of the native Xcode/VisualStudio/Make. Nit: VisualStudio => Visual Studio > Tools/ChangeLog:10 > + This change makes ninja the default for developers as well as all chromium webkit bots. Nit: chromium => Chromium 787326 4 peter 2012-12-10 07:41:27 -0800 For Chromium for Android, one additional change is required. In the following code in webkitdirs.pm (around line 2520): ====== $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean); } elsif (isChromiumNinja() && !isChromiumAndroid()) { $result = buildChromiumNinja("all", $clean, @options); } elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake()) { ====== The !isChromiumAndroid() check forces Ninja off for build-webkit. It should be fine to remove that :). 787947 5 178688 eric 2012-12-10 19:10:27 -0800 Created attachment 178688 Patch 787948 6 eric 2012-12-10 19:13:59 -0800 I'll press the cq+ button in the morning if I don't here any further complaints from non-PSTers before then. I'll send a note to webkit-dev when I do and will be around to work out any acidental build breakages. 788797 7 178688 eric 2012-12-11 14:21:50 -0800 Comment on attachment 178688 Patch Bombs away! 788813 8 eric 2012-12-11 14:37:13 -0800 CCing current Chromium/WebKit gardeners. I'm here to resolve any issues should they arrise. 788869 9 178688 eric 2012-12-11 15:34:53 -0800 Comment on attachment 178688 Patch Clearing flags on attachment: 178688 Committed r137371: <http://trac.webkit.org/changeset/137371> 788870 10 eric 2012-12-11 15:34:57 -0800 All reviewed patches have been landed. Closing bug. 788879 11 webkit.review.bot 2012-12-11 15:45:44 -0800 Re-opened since this is blocked by bug 104731 788882 12 eric 2012-12-11 15:46:24 -0800 Reverted r137371 for reason: Various scripts are not ready for out/ as the build directory, this can't work as written. Committed r137375: <http://trac.webkit.org/changeset/137375> 795504 13 dpranke 2012-12-20 09:46:24 -0800 Note that it doesn't look like ninja is currently working in a webkit checkout, so we don't want this to be the default on windows yet. Hopefully I'll find more time to debug this today. 795510 14 thakis 2012-12-20 09:54:06 -0800 (In reply to comment #13) > Note that it doesn't look like ninja is currently working in a webkit checkout, so we don't want this to be the default on windows yet. Hopefully I'll find more time to debug this today. If ninja isn't working on windows, no DumpRenderTree.exe will be created on windows, and this change is harmless on windows. 795524 15 dpranke 2012-12-20 10:04:02 -0800 (In reply to comment #14) > (In reply to comment #13) > > Note that it doesn't look like ninja is currently working in a webkit checkout, so we don't want this to be the default on windows yet. Hopefully I'll find more time to debug this today. > > If ninja isn't working on windows, no DumpRenderTree.exe will be created on windows, and this change is harmless on windows. Huh? Right now build-webkit --chromium on windows will successfully compile using msvs; with this change we'll use ninja and the build will fail. 795527 16 thakis 2012-12-20 10:04:55 -0800 (In reply to comment #15) > (In reply to comment #14) > > (In reply to comment #13) > > > Note that it doesn't look like ninja is currently working in a webkit checkout, so we don't want this to be the default on windows yet. Hopefully I'll find more time to debug this today. > > > > If ninja isn't working on windows, no DumpRenderTree.exe will be created on windows, and this change is harmless on windows. > > Huh? Right now build-webkit --chromium on windows will successfully compile using msvs; with this change we'll use ninja and the build will fail. Oh sorry, I thought this was the nrwt bug. Nevermind. 795756 17 thakis 2012-12-20 13:42:48 -0800 With bug 105498 fixed, I think this is ready for another try, at least on linux and mac. 805903 18 182476 thakis 2013-01-12 16:57:03 -0800 Created attachment 182476 Patch 805904 19 thakis 2013-01-12 16:57:38 -0800 Let's try this, on linux first where ninja and make have the same output directory. 805912 20 182476 eric 2013-01-12 17:37:21 -0800 Comment on attachment 182476 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182476&action=review OK. > Tools/Scripts/update-webkit:50 > +my $useNinja = $^O eq "linux"; Does this affect non-chromium? 805913 21 182476 thakis 2013-01-12 17:41:49 -0800 Comment on attachment 182476 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182476&action=review Thanks! >> Tools/Scripts/update-webkit:50 >> +my $useNinja = $^O eq "linux"; > > Does this affect non-chromium? It will set the environment variable GYP_GENERATORS to "ninja" for all ports. I would think that this has no effect for the other ports. 805916 22 182476 webkit.review.bot 2013-01-12 18:09:54 -0800 Comment on attachment 182476 Patch Clearing flags on attachment: 182476 Committed r139557: <http://trac.webkit.org/changeset/139557> 805917 23 webkit.review.bot 2013-01-12 18:09:59 -0800 All reviewed patches have been landed. Closing bug. 805918 24 thakis 2013-01-12 18:21:27 -0800 Turns out this didn't change anything on the bots, because Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg says: class InstallChromiumDependencies(shell.ShellCommand): name = "gclient" description = ["updating chromium dependencies"] descriptionDone = ["updated chromium dependencies"] command = ["perl", "./Tools/Scripts/update-webkit-chromium", "--force"] So the bots always run update-webkit-chromium directly, while we changed update-webkit. 805919 25 thakis 2013-01-12 18:24:26 -0800 (In reply to comment #24) > Turns out this didn't change anything on the bots, because Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg says: > > class InstallChromiumDependencies(shell.ShellCommand): > name = "gclient" > description = ["updating chromium dependencies"] > descriptionDone = ["updated chromium dependencies"] > command = ["perl", "./Tools/Scripts/update-webkit-chromium", "--force"] > > > So the bots always run update-webkit-chromium directly, while we changed update-webkit. This was added in bug 31442 by yaar@, who's no longer working on chromium. Mark Rowe pointed out that calling update-webkit --chromium might be a better idea on the review; not sure why that wasn't done. 805922 26 182478 thakis 2013-01-12 19:11:28 -0800 Created attachment 182478 Patch 805924 27 182478 eric 2013-01-12 19:40:49 -0800 Comment on attachment 182478 Patch OK. 805927 28 182478 webkit.review.bot 2013-01-12 20:32:04 -0800 Comment on attachment 182478 Patch Clearing flags on attachment: 182478 Committed r139559: <http://trac.webkit.org/changeset/139559> 805928 29 webkit.review.bot 2013-01-12 20:32:09 -0800 All reviewed patches have been landed. Closing bug. 805939 30 thakis 2013-01-12 23:51:22 -0800 Let's make this bug about linux. I filed bug 106737 for mac. 805984 31 dpranke 2013-01-13 10:20:25 -0800 (In reply to comment #25) > (In reply to comment #24) > > Turns out this didn't change anything on the bots, because Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg says: > > > > class InstallChromiumDependencies(shell.ShellCommand): > > name = "gclient" > > description = ["updating chromium dependencies"] > > descriptionDone = ["updated chromium dependencies"] > > command = ["perl", "./Tools/Scripts/update-webkit-chromium", "--force"] > > > > > > So the bots always run update-webkit-chromium directly, while we changed update-webkit. > > This was added in bug 31442 by yaar@, who's no longer working on chromium. Mark Rowe pointed out that calling update-webkit --chromium might be a better idea on the review; not sure why that wasn't done. I''ve seen cases where calling update-webkit --chromium doesn't work on windows (it fails to fork the subprocess); I can't recall at the moment if this is win32, msys, or cygwin, and I always figured it was something in my local setup but I haven't dug into it. Perhaps yaar was seeing something similar. 178344 2012-12-08 00:22:45 -0800 2012-12-10 19:10:24 -0800 Patch bug-104434-20121208002008.patch text/plain 2425 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MDE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTNlMmUwNTJlZDA1MzI1ZWMyNGY0NDBlNzljZTdkZWM1 ZGQyZTRiNi4uOThkNjU4NWNlNzNjMjcwMmQzNzE5MjQ3YmQyMzIxZDY4OWEyNmM3OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTEyLTA4ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAg ICBNYWtlIG5pbmphIHRoZSBkZWZhdWx0IGJ1aWxkIHN5c3RlbSBmb3IgYnVpbGQtd2Via2l0IC0t Y2hyb21pdW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwNDQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFzIGZhciBhcyBJIGNhbiB0ZWxsLCBtb3N0IENocm9taXVtIGRldmVsb3BlcnMgYXJlIG5vdyB1 c2luZyBuaW5qYQorICAgICAgICBhcyB0aGVpciBkZWZhdWx0IGJ1aWxkIHN5c3RlbSBpbnN0ZWFk IG9mIHRoZSBuYXRpdmUgWGNvZGUvVmlzdWFsU3R1ZGlvL01ha2UuCisgICAgICAgIFRoaXMgY2hh bmdlIG1ha2VzIG5pbmphIHRoZSBkZWZhdWx0IGZvciBkZXZlbG9wZXJzIGFzIHdlbGwgYXMgYWxs IGNocm9taXVtIHdlYmtpdCBib3RzLgorCisgICAgICAgIERldmVsb3BlcnMgY2FuIHBhc3MgLS1u by1uaW5qYSB0byBnZXQgdGhlIHBsYXRmb3JtLW5hdGl2ZSBidWlsZHN5c3RlbSBpbnN0ZWFkIG9m IG5pbmphLgorICAgICAgICBJdCdzIHBvc3NpYmxlIHdlIG1heSB3aXNoIHRvIG1ha2UgdGhpcyBh IHBlci1wbGF0Zm9ybSBkZWZhdWx0LCBhbmQgaGF2ZQorICAgICAgICBuaW5qYSBvbmx5IGJlIHRo ZSBkZWZhdWx0IGZvciBNYWMvTGludXguICBXZSdsbCBzb2xpY2l0IGZlZWRiYWNrIGZyb20gdGhl CisgICAgICAgIGNvbW11bml0eSBiZWZvcmUgY29tbWl0dGluZy4KKworICAgICAgICAqIFNjcmlw dHMvdXBkYXRlLXdlYmtpdDoKKwogMjAxMi0xMi0wNyAgU2NvdHQgVmlvbGV0ICA8c2t5QGNocm9t aXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSBsaW51eCB0aGVtZSByZWxhdGVk IGZpbGVzIGFuZCBzd2l0Y2ggdG8gZGVmYXVsdApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy91 cGRhdGUtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CmluZGV4IDZiYTgwNDRm NDg4ZGU1ZTFlNWMzNzJiZGZiN2E0ZTA2NDg0MjkxMmYuLjkyNDkzYjVmZjJiZjAxNjBmMTY4NmZi YjI2MzBlNzUzNzE3MTA3ZWMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dAorKysgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKQEAgLTQ3LDcgKzQ3LDcgQEAgbXkg JHF1aWV0ID0gJyc7CiBteSAkc2hvd0hlbHA7CiBteSAkdXNlR1lQID0gMDsKIG15ICR1c2VNYWtl ID0gMDsKLW15ICR1c2VOaW5qYSA9IDA7CitteSAkdXNlTmluamEgPSAxOwogCiBkZXRlcm1pbmVJ c0Nocm9taXVtKCk7CiBkZXRlcm1pbmVJc0Nocm9taXVtQW5kcm9pZCgpOwpAQCAtNjEsNyArNjEs NyBAQCBteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdldE9wdGlvbnMoCiAgICAgJ3F8cXVpZXQnID0+ IFwkcXVpZXQsCiAgICAgJ2d5cCcgPT4gXCR1c2VHWVAsCiAgICAgJ21ha2UnID0+IFwkdXNlTWFr ZSwKLSAgICAnbmluamEnID0+IFwkdXNlTmluamEsCisgICAgJ25pbmphIScgPT4gXCR1c2VOaW5q YSwKICk7IAogCiBpZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkgewpAQCAtNjks NyArNjksNyBAQCBpZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkgewogVXNhZ2U6 IEB7WyBiYXNlbmFtZSgkMCkgXX0gW29wdGlvbnNdCiAgIC0tY2hyb21pdW0gICAgICAgICAgYWxz byB1cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0CiAgIC0tbWFrZSAgICAg ICAgICAgICAgZ2VuZXJhdGUgdGhlIE1ha2VmaWxlLWJhc2VkIGJ1aWxkIHN5c3RlbSAoQ2hyb21p dW0gb25seSkKLSAgLS1uaW5qYSAgICAgICAgICAgICBnZW5lcmF0ZSB0aGUgbmluamEtYmFzZWQg YnVpbGQgc3lzdGVtIChDaHJvbWl1bSBvbmx5KQorICAtLW5vLW5pbmphICAgICAgICAgIGdlbmVy YXRlIHRoZSBwbGF0Zm9ybS1uYXRpdmUgYnVpbGQgc3lzdGVtIGluc3RlYWQgb2YgbmluamEgKENo cm9taXVtIG9ubHkpCiAgIC0tY2hyb21pdW0tYW5kcm9pZCAgYWxzbyB1cGRhdGUgZGVwZW5kZW5j aWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lkCiAgIC1ofC0taGVscCAgICAgICAg ICAgc2hvdyB0aGUgaGVscCBtZXNzYWdlCiAgIC1xfC0tcXVpZXQgICAgICAgICAgcGFzcyAtcSB0 byBzdm4gdXBkYXRlIGZvciBxdWlldCB1cGRhdGVzCg== 178688 2012-12-10 19:10:27 -0800 2013-01-12 16:57:00 -0800 Patch bug-104434-20121210190758.patch text/plain 3254 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MjM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWQ1NzNjZGQ3MGJlZWY5NWEzYzgxNjQxZmFjYjRhNzEy MTM0NjkzNC4uN2MyMDNhMmMwZDBhNzZiZDZlMjdkOWRkZTQwMDJlNjE4ZmNkNWQ1NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEyLTEyLTEwICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAg ICBNYWtlIE5pbmphIHRoZSBkZWZhdWx0IGJ1aWxkIHN5c3RlbSBmb3IgYnVpbGQtd2Via2l0IC0t Y2hyb21pdW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwNDQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IERhbmllbCBCYXRlcy4KKworICAgICAgICBB cyBmYXIgYXMgSSBjYW4gdGVsbCwgbW9zdCBDaHJvbWl1bSBkZXZlbG9wZXJzIGFyZSBub3cgdXNp bmcgTmluamEKKyAgICAgICAgYXMgdGhlaXIgZGVmYXVsdCBidWlsZCBzeXN0ZW0gaW5zdGVhZCBv ZiB0aGUgbmF0aXZlIFhjb2RlL1Zpc3VhbCBTdHVkaW8vTWFrZS4KKyAgICAgICAgVGhpcyBjaGFu Z2UgbWFrZXMgTmluamEgdGhlIGRlZmF1bHQgZm9yIGRldmVsb3BlcnMgYXMgd2VsbCBhcyBhbGwg Q2hyb21pdW0gd2Via2l0IGJvdHMuCisKKyAgICAgICAgRGV2ZWxvcGVycyBjYW4gcGFzcyAtLW5v LW5pbmphIHRvIGdldCB0aGUgcGxhdGZvcm0tbmF0aXZlIGJ1aWxkc3lzdGVtIGluc3RlYWQgb2Yg TmluamEuCisgICAgICAgIEl0J3MgcG9zc2libGUgd2UgbWF5IHdpc2ggdG8gbWFrZSB0aGlzIGEg cGVyLXBsYXRmb3JtIGRlZmF1bHQsIGFuZCBoYXZlCisgICAgICAgIE5pbmphIG9ubHkgYmUgdGhl IGRlZmF1bHQgZm9yIE1hYy9MaW51eC4KKworICAgICAgICBUaGVyZSB3YXMgYSB0aHJlYWQgb24g d2Via2l0LWRldiBkaXNjdXNzaW5nIHRoaXMgY2hhbmdlOgorICAgICAgICBodHRwOi8vbGlzdHMu d2Via2l0Lm9yZy9waXBlcm1haWwvd2Via2l0LWRldi8yMDEyLURlY2VtYmVyLzAyMzExMy5odG1s CisKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQ6CisKIDIwMTItMTItMTAgIERpcmsg UHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgY2hhbmdlIC0tbm8tbGF1 bmNoLXNhZmFyaSB0byAtLW5vLXNob3ctcmVzdWx0cyBpbiBzY3JpcHRzCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQK aW5kZXggNmJhODA0NGY0ODhkZTVlMWU1YzM3MmJkZmI3YTRlMDY0ODQyOTEyZi4uOTI0OTNiNWZm MmJmMDE2MGYxNjg2ZmJiMjYzMGU3NTM3MTcxMDdlYyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdApAQCAtNDcs NyArNDcsNyBAQCBteSAkcXVpZXQgPSAnJzsKIG15ICRzaG93SGVscDsKIG15ICR1c2VHWVAgPSAw OwogbXkgJHVzZU1ha2UgPSAwOwotbXkgJHVzZU5pbmphID0gMDsKK215ICR1c2VOaW5qYSA9IDE7 CiAKIGRldGVybWluZUlzQ2hyb21pdW0oKTsKIGRldGVybWluZUlzQ2hyb21pdW1BbmRyb2lkKCk7 CkBAIC02MSw3ICs2MSw3IEBAIG15ICRnZXRPcHRpb25zUmVzdWx0ID0gR2V0T3B0aW9ucygKICAg ICAncXxxdWlldCcgPT4gXCRxdWlldCwKICAgICAnZ3lwJyA9PiBcJHVzZUdZUCwKICAgICAnbWFr ZScgPT4gXCR1c2VNYWtlLAotICAgICduaW5qYScgPT4gXCR1c2VOaW5qYSwKKyAgICAnbmluamEh JyA9PiBcJHVzZU5pbmphLAogKTsgCiAKIGlmICghJGdldE9wdGlvbnNSZXN1bHQgfHwgJHNob3dI ZWxwKSB7CkBAIC02OSw3ICs2OSw3IEBAIGlmICghJGdldE9wdGlvbnNSZXN1bHQgfHwgJHNob3dI ZWxwKSB7CiBVc2FnZTogQHtbIGJhc2VuYW1lKCQwKSBdfSBbb3B0aW9uc10KICAgLS1jaHJvbWl1 bSAgICAgICAgICBhbHNvIHVwZGF0ZSBkZXBlbmRlbmNpZXMgb2YgdGhlIGNocm9taXVtIHBvcnQK ICAgLS1tYWtlICAgICAgICAgICAgICBnZW5lcmF0ZSB0aGUgTWFrZWZpbGUtYmFzZWQgYnVpbGQg c3lzdGVtIChDaHJvbWl1bSBvbmx5KQotICAtLW5pbmphICAgICAgICAgICAgIGdlbmVyYXRlIHRo ZSBuaW5qYS1iYXNlZCBidWlsZCBzeXN0ZW0gKENocm9taXVtIG9ubHkpCisgIC0tbm8tbmluamEg ICAgICAgICAgZ2VuZXJhdGUgdGhlIHBsYXRmb3JtLW5hdGl2ZSBidWlsZCBzeXN0ZW0gaW5zdGVh ZCBvZiBuaW5qYSAoQ2hyb21pdW0gb25seSkKICAgLS1jaHJvbWl1bS1hbmRyb2lkICBhbHNvIHVw ZGF0ZSBkZXBlbmRlbmNpZXMgb2YgdGhlIGNocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQKICAgLWh8 LS1oZWxwICAgICAgICAgICBzaG93IHRoZSBoZWxwIG1lc3NhZ2UKICAgLXF8LS1xdWlldCAgICAg ICAgICBwYXNzIC1xIHRvIHN2biB1cGRhdGUgZm9yIHF1aWV0IHVwZGF0ZXMKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQppbmRleCA5YWJkMjM4YjUyMDBlYjY2OTQxZjI4OTcxOGZkMDY1NjIwNDg2OTY4Li4xYmNjYTgx NDgxYzRlYTNmODRiMjBiYTBhODQyOWJkNjA3ZGEzZDQ3IDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0y NTIwLDcgKzI1MjAsNyBAQCBzdWIgYnVpbGRDaHJvbWl1bSgkQCkKICAgICB9IGVsc2lmIChpc0N5 Z3dpbigpIHx8IGlzV2luZG93cygpKSB7CiAgICAgICAgICMgV2luZG93cyBidWlsZCAtIGJ1aWxk cyB0aGUgcm9vdCB2aXN1YWwgc3R1ZGlvIHNvbHV0aW9uLgogICAgICAgICAkcmVzdWx0ID0gYnVp bGRDaHJvbWl1bVZpc3VhbFN0dWRpb1Byb2plY3QoIlNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQWxs LnNsbiIsICRjbGVhbik7Ci0gICAgfSBlbHNpZiAoaXNDaHJvbWl1bU5pbmphKCkgJiYgIWlzQ2hy b21pdW1BbmRyb2lkKCkpIHsKKyAgICB9IGVsc2lmIChpc0Nocm9taXVtTmluamEoKSkgewogICAg ICAgICAkcmVzdWx0ID0gYnVpbGRDaHJvbWl1bU5pbmphKCJhbGwiLCAkY2xlYW4sIEBvcHRpb25z KTsKICAgICB9IGVsc2lmIChpc0xpbnV4KCkgfHwgaXNDaHJvbWl1bUFuZHJvaWQoKSB8fCBpc0No cm9taXVtTWFjTWFrZSgpKSB7CiAgICAgICAgICMgTGludXggYnVpbGQgLSBidWlsZCB1c2luZyBt YWtlLgo= 182476 2013-01-12 16:57:03 -0800 2013-01-12 19:11:25 -0800 Patch bug-104434-20130112165404.patch text/plain 1864 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MzIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTU4YTQ1YTdkMjNhMTBlNDk5ZDIyNTFhYzUzYjE3NGIx NTUwODJlYS4uOTVlYjA4Zjg3NjZmMjdiYzE1N2RiMzE4MzIxMjc0MTAwOTBjMWE1YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDEzLTAxLTEyICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KKworICAg ICAgICBNYWtlIG5pbmphIHRoZSBkZWZhdWx0IGJ1aWxkIHN5c3RlbSBvbiBMaW51eCBmb3IgYnVp bGQtd2Via2l0IC0tY2hyb21pdW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNDQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0OgorCiAyMDEzLTAxLTEwICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBB ZGQgc3VwcG9ydCBmb3IgbG9hZGluZyB3ZWIgcHJvY2VzcyBleHRlbnNpb25zCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJr aXQKaW5kZXggNmJhODA0NGY0ODhkZTVlMWU1YzM3MmJkZmI3YTRlMDY0ODQyOTEyZi4uM2NhYmVl NDg2ODI0ODczMzFkYjUyNmEwYWJkMmJhNzE3MGM1NGNmMSAxMDA3NTUKLS0tIGEvVG9vbHMvU2Ny aXB0cy91cGRhdGUtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdApAQCAt NDcsNyArNDcsNyBAQCBteSAkcXVpZXQgPSAnJzsKIG15ICRzaG93SGVscDsKIG15ICR1c2VHWVAg PSAwOwogbXkgJHVzZU1ha2UgPSAwOwotbXkgJHVzZU5pbmphID0gMDsKK215ICR1c2VOaW5qYSA9 ICReTyBlcSAibGludXgiOwogCiBkZXRlcm1pbmVJc0Nocm9taXVtKCk7CiBkZXRlcm1pbmVJc0No cm9taXVtQW5kcm9pZCgpOwpAQCAtNjEsNyArNjEsNyBAQCBteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9 IEdldE9wdGlvbnMoCiAgICAgJ3F8cXVpZXQnID0+IFwkcXVpZXQsCiAgICAgJ2d5cCcgPT4gXCR1 c2VHWVAsCiAgICAgJ21ha2UnID0+IFwkdXNlTWFrZSwKLSAgICAnbmluamEnID0+IFwkdXNlTmlu amEsCisgICAgJ25pbmphIScgPT4gXCR1c2VOaW5qYSwKICk7IAogCiBpZiAoISRnZXRPcHRpb25z UmVzdWx0IHx8ICRzaG93SGVscCkgewpAQCAtNjksNyArNjksNyBAQCBpZiAoISRnZXRPcHRpb25z UmVzdWx0IHx8ICRzaG93SGVscCkgewogVXNhZ2U6IEB7WyBiYXNlbmFtZSgkMCkgXX0gW29wdGlv bnNdCiAgIC0tY2hyb21pdW0gICAgICAgICAgYWxzbyB1cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRo ZSBjaHJvbWl1bSBwb3J0CiAgIC0tbWFrZSAgICAgICAgICAgICAgZ2VuZXJhdGUgdGhlIE1ha2Vm aWxlLWJhc2VkIGJ1aWxkIHN5c3RlbSAoQ2hyb21pdW0gb25seSkKLSAgLS1uaW5qYSAgICAgICAg ICAgICBnZW5lcmF0ZSB0aGUgbmluamEtYmFzZWQgYnVpbGQgc3lzdGVtIChDaHJvbWl1bSBvbmx5 KQorICAtLVtuby1dbmluamEgICAgICAgIGdlbmVyYXRlIHRoZSBuaW5qYS1iYXNlZCBidWlsZCBz eXN0ZW0gKENocm9taXVtIG9ubHkpCiAgIC0tY2hyb21pdW0tYW5kcm9pZCAgYWxzbyB1cGRhdGUg ZGVwZW5kZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lkCiAgIC1ofC0taGVs cCAgICAgICAgICAgc2hvdyB0aGUgaGVscCBtZXNzYWdlCiAgIC1xfC0tcXVpZXQgICAgICAgICAg cGFzcyAtcSB0byBzdm4gdXBkYXRlIGZvciBxdWlldCB1cGRhdGVzCg== 182478 2013-01-12 19:11:28 -0800 2013-01-12 20:32:04 -0800 Patch bug-104434-20130112190830.patch text/plain 3188 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NTU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGU1NWY2YzZhNzc1NWM2ZWZlYjFmOTkxODA5YjY2Nzg3 OGMwODkwNy4uZWI3NTM5OWQ1OTA3YmZlYWNhN2YxNjZhZWNhOTMyODI2ODU1YTA4MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2 IEBACiAyMDEzLTAxLTEyICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KIAorICAg ICAgICBVc2UgbmluamEgYnkgZGVmYXVsdCBvbiBMaW51eCBmb3IgYnVpbGQtd2Via2l0IC0tY2hy b21pdW0sIGJvdCBlZGl0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDQ0MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICByMTM5NTU3IGNoYW5nZWQgdXBkYXRlLXdlYmtpdCB0byBwaWNrIG5pbmphIGJ5 IGRlZmF1bHQgb24gbGludXgsIGJ1dAorICAgICAgICB0aGUgYm90cyBydW4gdXBkYXRlLXdlYmtp dC1jaHJvbWl1bSBkaXJlY3RseSBzbyB0aGV5IGRpZG4ndCBzZWUgdGhpcy4KKyAgICAgICAgTW92 ZSB0aGUgZGVmYXVsdCBmb3IgbmluamEgaW50byB1cGRhdGUtd2Via2l0LWNocm9taXVtIHNvIHRo YXQgaXQncworICAgICAgICBwaWNrZWQgdXAgYnkgdGhlIGJvdHMsIGFuZCBsZXQgdXBkYXRlLXdl YmtpdCBmb3J3YXJkIG5vbi1kZWZhdWx0CisgICAgICAgIG9wdGlvbnMgdG8gdGhlcmUuCisKKyAg ICAgICAgVGhpcyB3YXksIHRoZSBkZWZhdWx0IGlzIGluIG9uZSBwbGFjZSBvbmx5IGFuZCBib3Ro IGRldmVsb3BlcnMgKHdobworICAgICAgICB1c3VhbGx5IHVzZSB1cGRhdGUtd2Via2l0IHdoaWNo IHRoZW4gc2hlbGxzIG91dCB0bworICAgICAgICB1cGRhdC13ZWJraXQtY2hyb21pdW0pIGFuZCBi b3RzICh3aGljaCB1c2UgdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQorICAgICAgICBkaXJlY3RseSkg c2VlIHRoZSBzYW1lIGJlaGF2aW9yLgorCisgICAgICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0 OgorICAgICAgICAqIFNjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bToKKworMjAxMy0wMS0x MiAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgTWFrZSBuaW5q YSB0aGUgZGVmYXVsdCBidWlsZCBzeXN0ZW0gb24gTGludXggZm9yIGJ1aWxkLXdlYmtpdCAtLWNo cm9taXVtCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDQ0MzQKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0IGIvVG9vbHMv U2NyaXB0cy91cGRhdGUtd2Via2l0CmluZGV4IDNjYWJlZTQ4NjgyNDg3MzMxZGI1MjZhMGFiZDJi YTcxNzBjNTRjZjEuLmQwZDFhZmVkYTYwNWE3NjRmZmU4MGE5NzFlZWFiZTg1ZDdmZWM4ZmMgMTAw NzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRz L3VwZGF0ZS13ZWJraXQKQEAgLTQ3LDcgKzQ3LDcgQEAgbXkgJHF1aWV0ID0gJyc7CiBteSAkc2hv d0hlbHA7CiBteSAkdXNlR1lQID0gMDsKIG15ICR1c2VNYWtlID0gMDsKLW15ICR1c2VOaW5qYSA9 ICReTyBlcSAibGludXgiOworbXkgJHVzZU5pbmphID0gLTE7ICMgLTE6IExldCB1cGRhdGUtd2Vi a2l0LWNocm9taXVtIHBpY2sgdGhlIGRlZmF1bHQuCiAKIGRldGVybWluZUlzQ2hyb21pdW0oKTsK IGRldGVybWluZUlzQ2hyb21pdW1BbmRyb2lkKCk7CkBAIC04Miw5ICs4Miw2IEBAIF9fRU5EX18K IGlmICgkdXNlTWFrZSkgewogICAgICRFTlZ7IkdZUF9HRU5FUkFUT1JTIn0gPSAibWFrZSI7CiB9 Ci1pZiAoJHVzZU5pbmphKSB7Ci0gICAgJEVOVnsiR1lQX0dFTkVSQVRPUlMifSA9ICJuaW5qYSI7 Ci19CiAKIG15IEBzdm5PcHRpb25zID0gKCk7CiBwdXNoIEBzdm5PcHRpb25zLCAnLXEnIGlmICRx dWlldDsKQEAgLTEwNSw2ICsxMDIsOCBAQCBpZiAoLWQgIi4uL0ludGVybmFsIikgewogICAgIG15 IEBjaHJvbWl1bVVwZGF0ZUFyZ3MgPSAoInBlcmwiLCAiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Vi a2l0LWNocm9taXVtIik7CiAgICAgcHVzaCBAY2hyb21pdW1VcGRhdGVBcmdzLCAiLS1jaHJvbWl1 bS1hbmRyb2lkIiBpZiBpc0Nocm9taXVtQW5kcm9pZCgpOwogICAgIHB1c2ggQGNocm9taXVtVXBk YXRlQXJncywgIi0tZm9yY2UiIGlmIGZvcmNlQ2hyb21pdW1VcGRhdGUoKTsKKyAgICBwdXNoIEBj aHJvbWl1bVVwZGF0ZUFyZ3MsICItLW5pbmphIiBpZiAkdXNlTmluamEgPT0gMTsKKyAgICBwdXNo IEBjaHJvbWl1bVVwZGF0ZUFyZ3MsICItLW5vLW5pbmphIiBpZiAkdXNlTmluamEgPT0gMDsKICAg ICBzeXN0ZW0oQGNocm9taXVtVXBkYXRlQXJncykgPT0gMCBvciBkaWUgJCE7CiB9IGVsc2lmIChp c0FwcGxlV2luV2ViS2l0KCkpIHsKICAgICBzeXN0ZW0oInBlcmwiLCAiVG9vbHMvU2NyaXB0cy91 cGRhdGUtd2Via2l0LWF1eGlsaWFyeS1saWJzIikgPT0gMCBvciBkaWU7CmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0gYi9Ub29scy9TY3JpcHRzL3VwZGF0 ZS13ZWJraXQtY2hyb21pdW0KaW5kZXggYjIxZDA5ZWM1NWJhMzFlYzg2ZGY2NzMyMGUyMmJiZmZh MWM1ODEyOC4uOTQ0YTc0Nzk4MjJlYTc3YTE0MjdiNGMyODQxZjNlZjFjYzcyNzIxNSAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtCisrKyBiL1Rvb2xzL1Nj cmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQpAQCAtNjYsMTAgKzY2LDE3IEBAIGlmIChpc0No cm9taXVtQW5kcm9pZCgpKSB7CiB9CiAKIG15ICRmb3JjZSA9IDA7CitteSAkdXNlTmluamEgPSAk Xk8gZXEgImxpbnV4IjsKKwogR2V0T3B0aW9ucygKICAgJ2ZvcmNlJyA9PiBcJGZvcmNlLAorICAn bmluamEhJyA9PiBcJHVzZU5pbmphLAogKTsKIAoraWYgKCR1c2VOaW5qYSkgeworICAgICRFTlZ7 IkdZUF9HRU5FUkFUT1JTIn0gPSAibmluamEiOworfQorCiAjIEV4ZWN1dGUgZ2NsaWVudCBzeW5j LgogcHJpbnQgIlVwZGF0aW5nIGNocm9taXVtIHBvcnQgZGVwZW5kZW5jaWVzIHVzaW5nIGdjbGll bnQuLi5cbiI7CiBteSBAZ2NsaWVudEFyZ3MgPSAoJGdjbGllbnRQYXRoLCAic3luYyIpOwo=