44979 2010-08-31 13:40:03 -0700 build-webkit: Add support for CMake build system 2010-09-20 19:07:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 leandro leandro commit-queue darin kenneth mrobinson paroga zoltan oldest_to_newest 272328 0 leandro 2010-08-31 13:40:03 -0700 build-webkit: Add support for CMake build system 272331 1 66096 leandro 2010-08-31 13:42:30 -0700 Created attachment 66096 Patch 272341 2 paroga 2010-08-31 13:56:04 -0700 I think you should also use cmake to build the files. This enables other port (with no make, eg. VisualStudio) to use buildCMakeProject too. 272356 3 leandro 2010-08-31 14:07:57 -0700 (In reply to comment #2) > I think you should also use cmake to build the files. > This enables other port (with no make, eg. VisualStudio) to use > buildCMakeProject too. OK, that's a good idea. I'll just wait for some reviewer to point out anything else I should take care of and submit another patch fixing everything in one go. 276111 4 tonikitoo 2010-09-08 15:29:43 -0700 (In reply to comment #3) > (In reply to comment #2) > > I think you should also use cmake to build the files. > > This enables other port (with no make, eg. VisualStudio) to use > > buildCMakeProject too. > > OK, that's a good idea. I'll just wait for some reviewer to point out anything else I should take care of and submit another patch fixing everything in one go. Please, if you are going to submit a new patch with new contents anyways, please do it. 278019 5 kenneth 2010-09-13 00:09:40 -0700 Looks fine to me. Darin can you have a look at the perl code? 278036 6 zoltan 2010-09-13 00:44:50 -0700 It looks okay for me. 278223 7 66096 darin 2010-09-13 08:21:13 -0700 Comment on attachment 66096 Patch Seems fine. I am sad to see all these options where you have to say what port to build, but I guess that battle was lost long ago. 278841 8 66096 leandro 2010-09-14 05:43:29 -0700 Comment on attachment 66096 Patch Forgot to cq? the patch :) 278861 9 66096 commit-queue 2010-09-14 06:47:20 -0700 Comment on attachment 66096 Patch Rejecting patch 66096 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Darin Adler', u'--force']" exit_code: 1 Parsed 3 diffs from patch file(s). patching file WebKitTools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKitTools/Scripts/build-webkit Hunk #1 succeeded at 106 (offset 1 line). Hunk #2 FAILED at 247. Hunk #3 succeeded at 432 (offset 8 lines). 1 out of 3 hunks FAILED -- saving rejects to file WebKitTools/Scripts/build-webkit.rej patching file WebKitTools/Scripts/webkitdirs.pm Hunk #1 succeeded at 1408 (offset 1 line). Full output: http://queues.webkit.org/results/4019005 281883 10 68152 leandro 2010-09-20 16:15:56 -0700 Created attachment 68152 Patch 281884 11 68152 leandro 2010-09-20 16:16:50 -0700 Comment on attachment 68152 Patch This patch has been already reviewed bug failed to apply. Submitting a new version. 282025 12 68152 commit-queue 2010-09-20 19:07:27 -0700 Comment on attachment 68152 Patch Clearing flags on attachment: 68152 Committed r67911: <http://trac.webkit.org/changeset/67911> 282026 13 commit-queue 2010-09-20 19:07:33 -0700 All reviewed patches have been landed. Closing bug. 66096 2010-08-31 13:42:30 -0700 2010-09-20 16:15:48 -0700 Patch bug-44979-20100831174755.patch text/plain 5531 leandro SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY2NTI2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDgtMzEgIExlYW5kcm8gUGVyZWlyYSAg PGxlYW5kcm9AcHJvZnVzaW9uLm1vYmk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgYnVpbGQtd2Via2l0OiBBZGQgc3VwcG9ydCBmb3IgQ01ha2UgYnVp bGQgc3lzdGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00NDk3OQorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6IEFkZCAiLS1lZmwiIGNv bW1hbmQtbGluZSBvcHRpb24gdG8gYnVpbGQgdGhlCisgICAgICAgIEVGTCBwb3J0IG9mIFdlYktp dC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06IERlZmluZSBidWlsZENNYWtlUHJv amVjdCgpIGFuZAorICAgICAgICBidWlsZEVmbENNYWtlUHJvamVjdCgpIHN1YnJvdXRpbmVzLgor CiAyMDEwLTA4LTMxICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13 ZWJraXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQJKHJl dmlzaW9uIDY2NTI2KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQJKHdvcmtp bmcgY29weSkKQEAgLTEwNSw3ICsxMDUsNyBAQCBteSBAZmVhdHVyZXMgPSAoCiAgICAgICBkZWZp bmUgPT4gIkVOQUJMRV9FVkVOVFNPVVJDRSIsIGRlZmF1bHQgPT4gMSwgdmFsdWUgPT4gXCRldmVu dHNvdXJjZVN1cHBvcnQgfSwKIAogICAgIHsgb3B0aW9uID0+ICJmaWx0ZXJzIiwgZGVzYyA9PiAi VG9nZ2xlIEZpbHRlcnMgc3VwcG9ydCIsCi0gICAgICBkZWZpbmUgPT4gIkVOQUJMRV9GSUxURVJT IiwgZGVmYXVsdCA9PiAoaXNBcHBsZVdlYktpdCgpIHx8IGlzR3RrKCkgfHwgaXNRdCgpKSwgdmFs dWUgPT4gXCRmaWx0ZXJzU3VwcG9ydCB9LAorICAgICAgZGVmaW5lID0+ICJFTkFCTEVfRklMVEVS UyIsIGRlZmF1bHQgPT4gKGlzQXBwbGVXZWJLaXQoKSB8fCBpc0d0aygpIHx8IGlzUXQoKSB8fCBp c0VmbCgpKSwgdmFsdWUgPT4gXCRmaWx0ZXJzU3VwcG9ydCB9LAogCiAgICAgeyBvcHRpb24gPT4g Imdlb2xvY2F0aW9uIiwgZGVzYyA9PiAiVG9nZ2xlIEdlb2xvY2F0aW9uIHN1cHBvcnQiLAogICAg ICAgZGVmaW5lID0+ICJFTkFCTEVfR0VPTE9DQVRJT04iLCBkZWZhdWx0ID0+IChpc0FwcGxlV2Vi S2l0KCkgfHwgaXNHdGsoKSksIHZhbHVlID0+IFwkZ2VvbG9jYXRpb25TdXBwb3J0IH0sCkBAIC0y NDYsMTIgKzI0NiwxMyBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0 CiAgIC0tY2hyb21pdW0gICAgICAgICAgICAgICAgICAgICAgICBCdWlsZCB0aGUgQ2hyb21pdW0g cG9ydCBvbiBNYWMvV2luL0xpbnV4CiAgIC0tZ3RrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBCdWlsZCB0aGUgR1RLKyBwb3J0CiAgIC0tcXQgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBCdWlsZCB0aGUgUXQgcG9ydAorICAtLWVmbCAgICAgICAgICAgICAgICAgICAgICAgICAgICAg QnVpbGQgdGhlIEVGTCBwb3J0CiAgIC0taW5zcGVjdG9yLWZyb250ZW5kICAgICAgICAgICAgICBD b3B5IGNoYW5nZXMgdG8gdGhlIGluc3BlY3RvciBmcm9udC1lbmQgZmlsZXMgdG8gdGhlIGJ1aWxk IGRpcmVjdG9yeQogCiAgIC0taW5zdGFsbC1oZWFkZXJzPTxwYXRoPiAgICAgICAgICBTZXQgaW5z dGFsbGF0aW9uIHBhdGggZm9yIHRoZSBoZWFkZXJzIChRdCBvbmx5KQogICAtLWluc3RhbGwtbGli cz08cGF0aD4gICAgICAgICAgICAgU2V0IGluc3RhbGxhdGlvbiBwYXRoIGZvciB0aGUgbGlicmFy aWVzIChRdCBvbmx5KQogCi0gIC0tcHJlZml4PTxwYXRoPiAgICAgICAgICAgICAgICAgICBTZXQg aW5zdGFsbGF0aW9uIHByZWZpeCB0byB0aGUgZ2l2ZW4gcGF0aCAoR3RrIG9ubHkpCisgIC0tcHJl Zml4PTxwYXRoPiAgICAgICAgICAgICAgICAgICBTZXQgaW5zdGFsbGF0aW9uIHByZWZpeCB0byB0 aGUgZ2l2ZW4gcGF0aCAoR3RrL0VmbCBvbmx5KQogICAtLW1ha2VhcmdzPTxhcmd1bWVudHM+ICAg ICAgICAgICAgT3B0aW9uYWwgTWFrZWZpbGUgZmxhZ3MKIAogICAtLW1pbmltYWwgICAgICAgICAg ICAgICAgICAgICAgICAgTm8gb3B0aW9uYWwgZmVhdHVyZXMsIHVubGVzcyBleHBsaWNpdGx5IGVu YWJsZWQuCkBAIC00MjMsNiArNDI0LDIyIEBAIGlmIChpc0Nocm9taXVtKCkpIHsKICAgICBleGl0 IGV4aXRTdGF0dXMoJHJlc3VsdCkgaWYgZXhpdFN0YXR1cygkcmVzdWx0KTsKIH0KIAoraWYgKGlz RWZsKCkpIHsKKyAgICBAb3B0aW9ucyA9ICgpOworICAgIEBwcm9qZWN0cyA9ICgpOworICAgIGZv cmVhY2ggKEBmZWF0dXJlcykgeworICAgICAgICBteSAkZmVhdHVyZU5hbWUgPSAkXy0+e2RlZmlu ZX07CisgICAgICAgIGlmICgkZmVhdHVyZU5hbWUpIHsKKyAgICAgICAgICAgIG15ICRmZWF0dXJl RW5hYmxlZCA9ICR7JF8tPnt2YWx1ZX19ID8gIk9OIiA6ICJPRkYiOworICAgICAgICAgICAgcHVz aCBAb3B0aW9ucywgIi1EJGZlYXR1cmVOYW1lPSRmZWF0dXJlRW5hYmxlZCI7CisgICAgICAgIH0K KyAgICB9CisgICAgcHVzaCBAb3B0aW9ucywgIi0tbWFrZWFyZ3M9IiAuICRtYWtlQXJncyBpZiBk ZWZpbmVkKCRtYWtlQXJncyk7CisgICAgcHVzaCBAb3B0aW9ucywgIi0tcHJlZml4PSIgLiAkcHJl Zml4UGF0aCBpZiBkZWZpbmVkKCRwcmVmaXhQYXRoKTsKKyAgICBteSAkcmVzdWx0ID0gYnVpbGRD TWFrZUVmbFByb2plY3QoJGNsZWFuLCBAb3B0aW9ucyk7CisgICAgZXhpdCBleGl0U3RhdHVzKCRy ZXN1bHQpIGlmIGV4aXRTdGF0dXMoJHJlc3VsdCk7Cit9CisKICMgQnVpbGQsIGFuZCBhYm9ydCBp ZiB0aGUgYnVpbGQgZmFpbHMuCiBmb3IgbXkgJGRpciAoQHByb2plY3RzKSB7CiAgICAgY2hkaXIg JGRpciBvciBkaWU7CkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiA2 NjUyNikKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTQwNyw2ICsxNDA3LDcyIEBAIHN1YiBidWlsZEF1dG90b29sc1Byb2plY3QoJEApCiAg ICAgcmV0dXJuICRyZXN1bHQ7CiB9CiAKK3N1YiBidWlsZENNYWtlUHJvamVjdCgkQCkKK3sKKyAg ICBteSAoJHBvcnQsICRjbGVhbiwgQGJ1aWxkUGFyYW1zKSA9IEBfOworICAgIG15ICRkaXIgPSBG aWxlOjpTcGVjLT5jYW5vbnBhdGgoYmFzZVByb2R1Y3REaXIoKSk7CisgICAgbXkgJGNvbmZpZyA9 IGNvbmZpZ3VyYXRpb24oKTsKKyAgICBteSAkcmVzdWx0OworICAgIG15ICRtYWtlQXJncyA9ICIi OworICAgIG15IEBidWlsZEFyZ3M7CisgICAgCisgICAgJG1ha2VBcmdzIC49ICIgLWoiIC4gbnVt YmVyT2ZDUFVzKCkgaWYgKCRtYWtlQXJncyAhfiBtLy1qXHMqXGQrLyk7CisKKyAgICBpZiAoJGNs ZWFuKSB7CisgICAgICAgIHByaW50ICJDbGVhbmluZyB0aGUgYnVpbGQgZGlyZWN0b3J5ICckZGly J1xuIjsKKyAgICAgICAgJGRpciA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGRpciwgJGNvbmZpZyk7 CisgICAgICAgIEZpbGU6OlBhdGg6OnJlbW92ZV90cmVlKCRkaXIsIHtrZWVwX3Jvb3QgPT4gMX0p OworICAgICAgICAkcmVzdWx0ID0gMDsKKyAgICB9IGVsc2UgeworICAgICAgICBteSAkY21ha2Vi aW4gPSAiY21ha2UiOworICAgICAgICBteSAkbWFrZSA9ICJtYWtlIjsKKworICAgICAgICBwdXNo IEBidWlsZEFyZ3MsICItRFBPUlQ9JHBvcnQiOworCisgICAgICAgIGZvciBteSAkaSAoMCAuLiAk I2J1aWxkUGFyYW1zKSB7CisgICAgICAgICAgICBteSAkb3B0ID0gJGJ1aWxkUGFyYW1zWyRpXTsK KyAgICAgICAgICAgIGlmICgkb3B0ID1+IC9eLS1tYWtlYXJncz0oLiopL2kgKSB7CisgICAgICAg ICAgICAgICAgJG1ha2VBcmdzID0gJDE7CisgICAgICAgICAgICB9IGVsc2lmICgkb3B0ID1+IC9e LS1wcmVmaXg9KC4qKS9pICkgeworICAgICAgICAgICAgICAgIHB1c2ggQGJ1aWxkQXJncywgIi1E Q01BS0VfSU5TVEFMTF9QUkVGSVg9JDEiOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgICAgICBwdXNoIEBidWlsZEFyZ3MsICRvcHQ7CisgICAgICAgICAgICB9CisgICAgICAgIH0K KworICAgICAgICBpZiAoJGNvbmZpZyA9fiBtL2RlYnVnL2kpIHsKKyAgICAgICAgICAgIHB1c2gg QGJ1aWxkQXJncywgIi1EQ01BS0VfQlVJTERfVFlQRT1EZWJ1ZyI7CisgICAgICAgIH0gZWxzaWYg KCRjb25maWcgPX4gbS9yZWxlYXNlL2kpIHsKKyAgICAgICAgICAgIHB1c2ggQGJ1aWxkQXJncywg Ii1EQ01BS0VfQlVJTERfVFlQRT1SZWxlYXNlIjsKKyAgICAgICAgfQorCisgICAgICAgIHB1c2gg QGJ1aWxkQXJncywgc291cmNlRGlyKCk7CisKKyAgICAgICAgJGRpciA9IEZpbGU6OlNwZWMtPmNh dGZpbGUoJGRpciwgJGNvbmZpZyk7CisgICAgICAgIEZpbGU6OlBhdGg6Om1rcGF0aCgkZGlyKTsK KyAgICAgICAgY2hkaXIgJGRpciBvciBkaWUgIkZhaWxlZCB0byBjZCBpbnRvICIgLiAkZGlyIC4g IlxuIjsKKyAgICAgICAgCisgICAgICAgIHByaW50ICJDYWxsaW5nICckY21ha2ViaW4gQGJ1aWxk QXJncycgaW4gIiAuICRkaXIgLiAiXG5cbiI7CisgICAgICAgIG15ICRyZXN1bHQgPSBzeXN0ZW0g IiRjbWFrZWJpbiBAYnVpbGRBcmdzIjsKKyAgICAgICAgaWYgKCRyZXN1bHQgbmUgMCkgeworICAg ICAgICAgICAgZGllICJGYWlsZWQgd2hpbGUgcnVubmluZyAkY21ha2ViaW4gdG8gZ2VuZXJhdGUg bWFrZWZpbGVzIVxuIjsKKyAgICAgICAgfQorCisgICAgICAgIHByaW50ICJDYWxsaW5nICckbWFr ZSAkbWFrZUFyZ3MnIGluICIgLiAkZGlyIC4gIlxuXG4iOworICAgICAgICAkcmVzdWx0ID0gc3lz dGVtICIkbWFrZSAkbWFrZUFyZ3MiOworCisgICAgICAgIGNoZGlyICIuLiIgb3IgZGllOworICAg IH0KKworICAgIHJldHVybiAkcmVzdWx0OyAKK30KKworc3ViIGJ1aWxkQ01ha2VFZmxQcm9qZWN0 KCRAKQoreworICAgIG15ICgkY2xlYW4sIEBidWlsZEFyZ3MpID0gQF87CisgICAgcmV0dXJuIGJ1 aWxkQ01ha2VQcm9qZWN0KCJFZmwiLCAkY2xlYW4sIEBidWlsZEFyZ3MpOworfQorCiBzdWIgYnVp bGRRTWFrZVByb2plY3QoJEApCiB7CiAgICAgbXkgKCRjbGVhbiwgQGJ1aWxkUGFyYW1zKSA9IEBf Owo= 68152 2010-09-20 16:15:56 -0700 2010-09-20 19:07:27 -0700 Patch bug-44979-20100920201553.patch text/plain 5603 leandro SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY3ODkwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDktMjAgIExlYW5kcm8gUGVyZWlyYSAg PGxlYW5kcm9AcHJvZnVzaW9uLm1vYmk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRs ZXIuCisKKyAgICAgICAgYnVpbGQtd2Via2l0OiBBZGQgc3VwcG9ydCBmb3IgQ01ha2UgYnVpbGQg c3lzdGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 NDk3OQorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6IEFkZCAiLS1lZmwiIGNvbW1h bmQtbGluZSBvcHRpb24gdG8gYnVpbGQgdGhlCisgICAgICAgIEVGTCBwb3J0IG9mIFdlYktpdC4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06IERlZmluZSBidWlsZENNYWtlUHJvamVj dCgpIGFuZAorICAgICAgICBidWlsZEVmbENNYWtlUHJvamVjdCgpIHN1YnJvdXRpbmVzLgorCiAy MDEwLTA5LTIwICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJr aXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQJKHJldmlz aW9uIDY3ODkwKQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQJKHdvcmtpbmcg Y29weSkKQEAgLTEwNiw3ICsxMDYsNyBAQCBteSBAZmVhdHVyZXMgPSAoCiAgICAgICBkZWZpbmUg PT4gIkVOQUJMRV9FVkVOVFNPVVJDRSIsIGRlZmF1bHQgPT4gMSwgdmFsdWUgPT4gXCRldmVudHNv dXJjZVN1cHBvcnQgfSwKIAogICAgIHsgb3B0aW9uID0+ICJmaWx0ZXJzIiwgZGVzYyA9PiAiVG9n Z2xlIEZpbHRlcnMgc3VwcG9ydCIsCi0gICAgICBkZWZpbmUgPT4gIkVOQUJMRV9GSUxURVJTIiwg ZGVmYXVsdCA9PiAoaXNBcHBsZVdlYktpdCgpIHx8IGlzR3RrKCkgfHwgaXNRdCgpKSwgdmFsdWUg PT4gXCRmaWx0ZXJzU3VwcG9ydCB9LAorICAgICAgZGVmaW5lID0+ICJFTkFCTEVfRklMVEVSUyIs IGRlZmF1bHQgPT4gKGlzQXBwbGVXZWJLaXQoKSB8fCBpc0d0aygpIHx8IGlzUXQoKSB8fCBpc0Vm bCgpKSwgdmFsdWUgPT4gXCRmaWx0ZXJzU3VwcG9ydCB9LAogCiAgICAgeyBvcHRpb24gPT4gImdl b2xvY2F0aW9uIiwgZGVzYyA9PiAiVG9nZ2xlIEdlb2xvY2F0aW9uIHN1cHBvcnQiLAogICAgICAg ZGVmaW5lID0+ICJFTkFCTEVfR0VPTE9DQVRJT04iLCBkZWZhdWx0ID0+IChpc0FwcGxlV2ViS2l0 KCkgfHwgaXNHdGsoKSksIHZhbHVlID0+IFwkZ2VvbG9jYXRpb25TdXBwb3J0IH0sCkBAIC0yNDUs MTMgKzI0NSwxNCBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0CiAg IC0tY2hyb21pdW0gICAgICAgICAgICAgICAgICAgICAgICBCdWlsZCB0aGUgQ2hyb21pdW0gcG9y dCBvbiBNYWMvV2luL0xpbnV4CiAgIC0tZ3RrICAgICAgICAgICAgICAgICAgICAgICAgICAgICBC dWlsZCB0aGUgR1RLKyBwb3J0CiAgIC0tcXQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBC dWlsZCB0aGUgUXQgcG9ydAorICAtLWVmbCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQnVp bGQgdGhlIEVGTCBwb3J0CiAgIC0taW5zcGVjdG9yLWZyb250ZW5kICAgICAgICAgICAgICBDb3B5 IGNoYW5nZXMgdG8gdGhlIGluc3BlY3RvciBmcm9udC1lbmQgZmlsZXMgdG8gdGhlIGJ1aWxkIGRp cmVjdG9yeQogCiAgIC0taW5zdGFsbC1oZWFkZXJzPTxwYXRoPiAgICAgICAgICBTZXQgaW5zdGFs bGF0aW9uIHBhdGggZm9yIHRoZSBoZWFkZXJzIChRdCBvbmx5KQogICAtLWluc3RhbGwtbGlicz08 cGF0aD4gICAgICAgICAgICAgU2V0IGluc3RhbGxhdGlvbiBwYXRoIGZvciB0aGUgbGlicmFyaWVz IChRdCBvbmx5KQogICAtLXY4ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVXNlIFY4IGFz IEphdmFTY3JpcHQgZW5naW5lIChRdCBvbmx5KQogCi0gIC0tcHJlZml4PTxwYXRoPiAgICAgICAg ICAgICAgICAgICBTZXQgaW5zdGFsbGF0aW9uIHByZWZpeCB0byB0aGUgZ2l2ZW4gcGF0aCAoR3Rr IG9ubHkpCisgIC0tcHJlZml4PTxwYXRoPiAgICAgICAgICAgICAgICAgICBTZXQgaW5zdGFsbGF0 aW9uIHByZWZpeCB0byB0aGUgZ2l2ZW4gcGF0aCAoR3RrL0VmbCBvbmx5KQogICAtLW1ha2Vhcmdz PTxhcmd1bWVudHM+ICAgICAgICAgICAgT3B0aW9uYWwgTWFrZWZpbGUgZmxhZ3MKIAogICAtLW1p bmltYWwgICAgICAgICAgICAgICAgICAgICAgICAgTm8gb3B0aW9uYWwgZmVhdHVyZXMsIHVubGVz cyBleHBsaWNpdGx5IGVuYWJsZWQuCkBAIC00MjgsNiArNDI5LDIyIEBAIGlmIChpc0Nocm9taXVt KCkpIHsKICAgICBleGl0IGV4aXRTdGF0dXMoJHJlc3VsdCkgaWYgZXhpdFN0YXR1cygkcmVzdWx0 KTsKIH0KIAoraWYgKGlzRWZsKCkpIHsKKyAgICBAb3B0aW9ucyA9ICgpOworICAgIEBwcm9qZWN0 cyA9ICgpOworICAgIGZvcmVhY2ggKEBmZWF0dXJlcykgeworICAgICAgICBteSAkZmVhdHVyZU5h bWUgPSAkXy0+e2RlZmluZX07CisgICAgICAgIGlmICgkZmVhdHVyZU5hbWUpIHsKKyAgICAgICAg ICAgIG15ICRmZWF0dXJlRW5hYmxlZCA9ICR7JF8tPnt2YWx1ZX19ID8gIk9OIiA6ICJPRkYiOwor ICAgICAgICAgICAgcHVzaCBAb3B0aW9ucywgIi1EJGZlYXR1cmVOYW1lPSRmZWF0dXJlRW5hYmxl ZCI7CisgICAgICAgIH0KKyAgICB9CisgICAgcHVzaCBAb3B0aW9ucywgIi0tbWFrZWFyZ3M9IiAu ICRtYWtlQXJncyBpZiBkZWZpbmVkKCRtYWtlQXJncyk7CisgICAgcHVzaCBAb3B0aW9ucywgIi0t cHJlZml4PSIgLiAkcHJlZml4UGF0aCBpZiBkZWZpbmVkKCRwcmVmaXhQYXRoKTsKKyAgICBteSAk cmVzdWx0ID0gYnVpbGRDTWFrZUVmbFByb2plY3QoJGNsZWFuLCBAb3B0aW9ucyk7CisgICAgZXhp dCBleGl0U3RhdHVzKCRyZXN1bHQpIGlmIGV4aXRTdGF0dXMoJHJlc3VsdCk7Cit9CisKICMgQnVp bGQsIGFuZCBhYm9ydCBpZiB0aGUgYnVpbGQgZmFpbHMuCiBmb3IgbXkgJGRpciAoQHByb2plY3Rz KSB7CiAgICAgY2hkaXIgJGRpciBvciBkaWU7CkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCShyZXZpc2lvbiA2Nzg5MCkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQkod29ya2luZyBjb3B5KQpAQCAtMTQwOCw2ICsxNDA4LDcyIEBAIHN1YiBidWlsZEF1dG90b29s c1Byb2plY3QoJEApCiAgICAgcmV0dXJuICRyZXN1bHQ7CiB9CiAKK3N1YiBidWlsZENNYWtlUHJv amVjdCgkQCkKK3sKKyAgICBteSAoJHBvcnQsICRjbGVhbiwgQGJ1aWxkUGFyYW1zKSA9IEBfOwor ICAgIG15ICRkaXIgPSBGaWxlOjpTcGVjLT5jYW5vbnBhdGgoYmFzZVByb2R1Y3REaXIoKSk7Cisg ICAgbXkgJGNvbmZpZyA9IGNvbmZpZ3VyYXRpb24oKTsKKyAgICBteSAkcmVzdWx0OworICAgIG15 ICRtYWtlQXJncyA9ICIiOworICAgIG15IEBidWlsZEFyZ3M7CisgICAgCisgICAgJG1ha2VBcmdz IC49ICIgLWoiIC4gbnVtYmVyT2ZDUFVzKCkgaWYgKCRtYWtlQXJncyAhfiBtLy1qXHMqXGQrLyk7 CisKKyAgICBpZiAoJGNsZWFuKSB7CisgICAgICAgIHByaW50ICJDbGVhbmluZyB0aGUgYnVpbGQg ZGlyZWN0b3J5ICckZGlyJ1xuIjsKKyAgICAgICAgJGRpciA9IEZpbGU6OlNwZWMtPmNhdGZpbGUo JGRpciwgJGNvbmZpZyk7CisgICAgICAgIEZpbGU6OlBhdGg6OnJlbW92ZV90cmVlKCRkaXIsIHtr ZWVwX3Jvb3QgPT4gMX0pOworICAgICAgICAkcmVzdWx0ID0gMDsKKyAgICB9IGVsc2UgeworICAg ICAgICBteSAkY21ha2ViaW4gPSAiY21ha2UiOworICAgICAgICBteSAkbWFrZSA9ICJtYWtlIjsK KworICAgICAgICBwdXNoIEBidWlsZEFyZ3MsICItRFBPUlQ9JHBvcnQiOworCisgICAgICAgIGZv ciBteSAkaSAoMCAuLiAkI2J1aWxkUGFyYW1zKSB7CisgICAgICAgICAgICBteSAkb3B0ID0gJGJ1 aWxkUGFyYW1zWyRpXTsKKyAgICAgICAgICAgIGlmICgkb3B0ID1+IC9eLS1tYWtlYXJncz0oLiop L2kgKSB7CisgICAgICAgICAgICAgICAgJG1ha2VBcmdzID0gJDE7CisgICAgICAgICAgICB9IGVs c2lmICgkb3B0ID1+IC9eLS1wcmVmaXg9KC4qKS9pICkgeworICAgICAgICAgICAgICAgIHB1c2gg QGJ1aWxkQXJncywgIi1EQ01BS0VfSU5TVEFMTF9QUkVGSVg9JDEiOworICAgICAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgICAgICBwdXNoIEBidWlsZEFyZ3MsICRvcHQ7CisgICAgICAgICAg ICB9CisgICAgICAgIH0KKworICAgICAgICBpZiAoJGNvbmZpZyA9fiBtL2RlYnVnL2kpIHsKKyAg ICAgICAgICAgIHB1c2ggQGJ1aWxkQXJncywgIi1EQ01BS0VfQlVJTERfVFlQRT1EZWJ1ZyI7Cisg ICAgICAgIH0gZWxzaWYgKCRjb25maWcgPX4gbS9yZWxlYXNlL2kpIHsKKyAgICAgICAgICAgIHB1 c2ggQGJ1aWxkQXJncywgIi1EQ01BS0VfQlVJTERfVFlQRT1SZWxlYXNlIjsKKyAgICAgICAgfQor CisgICAgICAgIHB1c2ggQGJ1aWxkQXJncywgc291cmNlRGlyKCk7CisKKyAgICAgICAgJGRpciA9 IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGRpciwgJGNvbmZpZyk7CisgICAgICAgIEZpbGU6OlBhdGg6 Om1rcGF0aCgkZGlyKTsKKyAgICAgICAgY2hkaXIgJGRpciBvciBkaWUgIkZhaWxlZCB0byBjZCBp bnRvICIgLiAkZGlyIC4gIlxuIjsKKyAgICAgICAgCisgICAgICAgIHByaW50ICJDYWxsaW5nICck Y21ha2ViaW4gQGJ1aWxkQXJncycgaW4gIiAuICRkaXIgLiAiXG5cbiI7CisgICAgICAgIG15ICRy ZXN1bHQgPSBzeXN0ZW0gIiRjbWFrZWJpbiBAYnVpbGRBcmdzIjsKKyAgICAgICAgaWYgKCRyZXN1 bHQgbmUgMCkgeworICAgICAgICAgICAgZGllICJGYWlsZWQgd2hpbGUgcnVubmluZyAkY21ha2Vi aW4gdG8gZ2VuZXJhdGUgbWFrZWZpbGVzIVxuIjsKKyAgICAgICAgfQorCisgICAgICAgIHByaW50 ICJDYWxsaW5nICckbWFrZSAkbWFrZUFyZ3MnIGluICIgLiAkZGlyIC4gIlxuXG4iOworICAgICAg ICAkcmVzdWx0ID0gc3lzdGVtICIkbWFrZSAkbWFrZUFyZ3MiOworCisgICAgICAgIGNoZGlyICIu LiIgb3IgZGllOworICAgIH0KKworICAgIHJldHVybiAkcmVzdWx0OyAKK30KKworc3ViIGJ1aWxk Q01ha2VFZmxQcm9qZWN0KCRAKQoreworICAgIG15ICgkY2xlYW4sIEBidWlsZEFyZ3MpID0gQF87 CisgICAgcmV0dXJuIGJ1aWxkQ01ha2VQcm9qZWN0KCJFZmwiLCAkY2xlYW4sIEBidWlsZEFyZ3Mp OworfQorCiBzdWIgYnVpbGRRTWFrZVByb2plY3QoJEApCiB7CiAgICAgbXkgKCRjbGVhbiwgQGJ1 aWxkUGFyYW1zKSA9IEBfOwo=