56918 2011-03-23 05:27:07 -0700 [Qt] Teach build-jsc how to build JavaScriptCore on Qt 2011-03-29 05:34:46 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other All RESOLVED FIXED Qt, QtTriaged P5 Minor --- 1 loki webkit-unassigned abarth benjamin eric galpeter ossy webkit.review.bot oldest_to_newest 372092 0 loki 2011-03-23 05:27:07 -0700 There is old issue on Qt, the JavaScriptCore and jsc binary cannot be built with build-jsc script. I hope it can be solved with a simple patch. 372093 1 86605 loki 2011-03-23 05:28:01 -0700 Created attachment 86605 build-jsc for Qt 372766 2 86605 abecsi 2011-03-24 06:08:13 -0700 Comment on attachment 86605 build-jsc for Qt View in context: https://bugs.webkit.org/attachment.cgi?id=86605&action=review LGTM, Just one little nitpick: > Tools/Scripts/webkitdirs.pm:1577 > + } else { > + $project = ""; > + } I think it would be better to use $project = 0; here and simply use !$project in the ifs, this would make the paths easier to read. 374426 3 87130 loki 2011-03-28 05:36:27 -0700 Created attachment 87130 build-jsc for Qt 375155 4 87130 ossy 2011-03-29 03:17:47 -0700 Comment on attachment 87130 build-jsc for Qt View in context: https://bugs.webkit.org/attachment.cgi?id=87130&action=review I'm sure if it works with a little fix I suggested, but it is a little nasty hack, because the original code was hacked in itself. r=me to go ahead, but we really need a serious refactor for buildQMakeProject() in the near future. > Tools/Scripts/webkitdirs.pm:1637 > if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) { > push @subdirs, "WebKit2"; > if ( -e sourceDir() ."/Tools/DerivedSources.pro" ) { We need one more if (!$project) guard to avoid building WebKit2, MiniBrowser and WTR. 375186 5 87130 loki 2011-03-29 04:26:01 -0700 Comment on attachment 87130 build-jsc for Qt fixed and landed in r82228 375212 6 webkit.review.bot 2011-03-29 05:34:46 -0700 http://trac.webkit.org/changeset/82228 might have broken GTK Linux 64-bit Debug The following tests are not passing: svg/text/text-deco-01-b.svg 86605 2011-03-23 05:28:01 -0700 2011-03-28 05:36:27 -0700 build-jsc for Qt 0001-Teach-build-jsc-how-to-build-JSC-on-Qt.patch text/plain 6871 loki RnJvbSAxODcxYWRjOTY5MGMyOTVkNmRlNmRkZGFjNTUxNGNjY2VkZGQ5NzU5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHYWJvciBMb2tpIDxsb2tpQGluZi51LXN6ZWdlZC5odT4KRGF0 ZTogV2VkLCAyMyBNYXIgMjAxMSAxMzoxMDo1NSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIFRlYWNo IGJ1aWxkLWpzYyBob3cgdG8gYnVpbGQgSlNDIG9uIFF0CgpTaWduZWQtb2ZmLWJ5OiBHYWJvciBM b2tpIDxsb2tpQGluZi51LXN6ZWdlZC5odT4KLS0tCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAg ICAgfCAgICA5ICsrKysrCiBUb29scy9TY3JpcHRzL2J1aWxkLWpzYyAgICAgfCAgICA2ICsrLQog VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIHwgICA3NyArKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDYzIGluc2VydGlvbnMoKyks IDI5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCBmZjU5NmM2Li4yOGFmN2I1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDMtMjMgIEdh Ym9yIExva2kgIDxsb2tpQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGVhY2ggYnVpbGQtanNjIGhvdyB0byBidWlsZCBKYXZhU2Ny aXB0Q29yZSBvbiBRdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTY5MTgKKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtanNjOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAxMS0wMy0yMiAgRXJpYyBTZWlkZWwgIDxlcmljQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvYnVpbGQtanNjIGIvVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKaW5kZXgg YzlkNDEzNC4uNzVmNjU2NyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKKysr IGIvVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKQEAgLTY5LDggKzY5LDEwIEBAIGlmIChpc0FwcGxl TWFjV2ViS2l0KCkpIHsKICAgICAkcmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJK YXZhU2NyaXB0Q29yZS52Y3Byb2ovSmF2YVNjcmlwdENvcmUuc2xuIik7CiB9IGVsc2lmIChpc0d0 aygpKSB7CiAgICAgJHJlc3VsdCA9IGJ1aWxkR3RrUHJvamVjdCgiSmF2YVNjcmlwdENvcmUiKTsK LX0gZWxzaWYgKGlzUXQoKSBvciBpc1d4KCkpIHsKLSAgICAjIFF0IGJ1aWxkcyBldmVyeXRoaW5n IGluIG9uZS1zaG90LiBObyBuZWVkIHRvIGJ1aWxkIGFueXRoaW5nIGhlcmUuCit9IGVsc2lmIChp c1F0KCkpIHsKKyAgICAkcmVzdWx0ID0gYnVpbGRRTWFrZVByb2plY3QoIkphdmFTY3JpcHRDb3Jl IiwgMCwgQEFSR1YpOworfSBlbHNpZiAoaXNXeCgpKSB7CisgICAgIyBCdWlsZHMgZXZlcnl0aGlu ZyBpbiBvbmUtc2hvdC4gTm8gbmVlZCB0byBidWlsZCBhbnl0aGluZyBoZXJlLgogICAgICRyZXN1 bHQgPSAwOwogfSBlbHNlIHsKICAgICBkaWUgIkJ1aWxkaW5nIG5vdCBkZWZpbmVkIGZvciB0aGlz IHBsYXRmb3JtIVxuIjsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBlZjdhMmY3Li5mYzY2MWIxIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCkBAIC0xNTY3LDcgKzE1NjcsMTQgQEAgc3ViIGJ1aWxkQ01ha2VQcm9qZWN0 T3JFeGl0KCQkJCRAKQogCiBzdWIgYnVpbGRRTWFrZVByb2plY3QoJEApCiB7Ci0gICAgbXkgKCRj bGVhbiwgQGJ1aWxkUGFyYW1zKSA9IEBfOworICAgIG15ICgkcHJvamVjdCwgJGNsZWFuLCBAYnVp bGRQYXJhbXMpID0gQF87CisKKyAgICBteSBAc3ViZGlycyA9ICgiSmF2YVNjcmlwdENvcmUiLCAi V2ViQ29yZSIsICJXZWJLaXQvcXQvQXBpIik7CisgICAgaWYgKGdyZXAgeyAkXyBlcSAkcHJvamVj dCB9IEBzdWJkaXJzKSB7CisgICAgICAgIEBzdWJkaXJzID0gKCRwcm9qZWN0KTsKKyAgICB9IGVs c2UgeworICAgICAgICAkcHJvamVjdCA9ICIiOworICAgIH0KIAogICAgIG15IEBidWlsZEFyZ3Mg PSAoIi1yIik7CiAKQEAgLTE2MTMsNiArMTYyMCw5IEBAIHN1YiBidWlsZFFNYWtlUHJvamVjdCgk QCkKICAgICBteSBAZHNRbWFrZUFyZ3MgPSBAYnVpbGRBcmdzOwogICAgIHB1c2ggQGRzUW1ha2VB cmdzLCAiLXIiOwogICAgIHB1c2ggQGRzUW1ha2VBcmdzLCBzb3VyY2VEaXIoKSAuICIvU291cmNl L0Rlcml2ZWRTb3VyY2VzLnBybyI7CisgICAgaWYgKCRwcm9qZWN0IG5lICIiKSB7CisgICAgICAg IHB1c2ggQGRzUW1ha2VBcmdzLCAiLWFmdGVyIFNVQkRJUlM9IiAuICRwcm9qZWN0LiAiL0Rlcml2 ZWRTb3VyY2VzLnBybyI7CisgICAgfQogICAgIHB1c2ggQGRzUW1ha2VBcmdzLCAiLW8gTWFrZWZp bGUuRGVyaXZlZFNvdXJjZXMiOwogICAgIHByaW50ICJDYWxsaW5nICckcW1ha2ViaW4gQGRzUW1h a2VBcmdzJyBpbiAiIC4gJGRpciAuICJcblxuIjsKICAgICBteSAkcmVzdWx0ID0gc3lzdGVtICIk cW1ha2ViaW4gQGRzUW1ha2VBcmdzIjsKQEAgLTE2MjIsNyArMTYzMiw2IEBAIHN1YiBidWlsZFFN YWtlUHJvamVjdCgkQCkKIAogICAgICMgRklYTUU6IEl0ZXJhdGUgb3ZlciBkaWZmZXJlbnQgc291 cmNlIGRpcmVjdG9yaWVzIG1hbnVhbGx5IHRvIHdvcmthcm91bmQgYSBwcm9ibGVtIHdpdGggcW1h a2UrZXh0cmFUYXJnZXRzK3M2MAogICAgICMgVG8gYXZvaWQgb3ZlcndyaXRpbmcgb2YgTWFrZWZp bGUuRGVyaXZlZFNvdXJjZXMgaW4gdGhlIHJvb3QgZGlyIHVzZSBNYWtlZmlsZS5EZXJpdmVkU291 cmNlcy5Ub29scyBmb3IgVG9vbHMKLSAgICBteSBAc3ViZGlycyA9ICgiSmF2YVNjcmlwdENvcmUi LCAiV2ViQ29yZSIsICJXZWJLaXQvcXQvQXBpIik7CiAgICAgaWYgKGdyZXAgeyAkXyBlcSAiQ09O RklHKz13ZWJraXQyIn0gQGJ1aWxkQXJncykgewogICAgICAgICBwdXNoIEBzdWJkaXJzLCAiV2Vi S2l0MiI7CiAgICAgICAgIGlmICggLWUgc291cmNlRGlyKCkgLiIvVG9vbHMvRGVyaXZlZFNvdXJj ZXMucHJvIiApIHsKQEAgLTE2NjksNiArMTY3OCwxMiBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3Qo JEApCiAgICAgICAgIH0KICAgICB9CiAKKyAgICBpZiAoJHByb2plY3QgbmUgIiIpIHsKKyAgICAg ICAgcHVzaCBAYnVpbGRBcmdzLCAiLWFmdGVyIFNVQkRJUlM9IiAuICRwcm9qZWN0IC4gIi8iIC4g JHByb2plY3QgLiAiLnBybyAiOworICAgICAgICBpZiAoJHByb2plY3QgZXEgIkphdmFTY3JpcHRD b3JlIikgeworICAgICAgICAgICAgcHVzaCBAYnVpbGRBcmdzLCAiLWFmdGVyIFNVQkRJUlMrPSIg LiAkcHJvamVjdCAuICIvanNjLnBybyAiOworICAgICAgICB9CisgICAgfQogICAgIHB1c2ggQGJ1 aWxkQXJncywgc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQucHJvIjsKICAgICBwcmludCAi Q2FsbGluZyAnJHFtYWtlYmluIEBidWlsZEFyZ3MnIGluICIgLiAkZGlyIC4gIlxuXG4iOwogICAg IHByaW50ICJJbnN0YWxsYXRpb24gaGVhZGVycyBkaXJlY3Rvcnk6ICRpbnN0YWxsSGVhZGVyc1xu IiBpZihkZWZpbmVkKCRpbnN0YWxsSGVhZGVycykpOwpAQCAtMTY3OSwzNiArMTY5NCw0NCBAQCBz dWIgYnVpbGRRTWFrZVByb2plY3QoJEApCiAgICAgICAgZGllICJGYWlsZWQgdG8gc2V0dXAgYnVp bGQgZW52aXJvbm1lbnQgdXNpbmcgJHFtYWtlYmluIVxuIjsKICAgICB9CiAKLSAgICAkYnVpbGRB cmdzWy0xXSA9IHNvdXJjZURpcigpIC4gIi9Ub29scy9Ub29scy5wcm8iOwotICAgIG15ICRtYWtl ZmlsZSA9ICJNYWtlZmlsZS5Ub29scyI7CisgICAgbXkgJG1ha2VmaWxlID0gIiI7CisgICAgaWYg KCRwcm9qZWN0IGVxICIiKSB7CisgICAgICAgICRidWlsZEFyZ3NbLTFdID0gc291cmNlRGlyKCkg LiAiL1Rvb2xzL1Rvb2xzLnBybyI7CisgICAgICAgICRtYWtlZmlsZSA9ICJNYWtlZmlsZS5Ub29s cyI7CiAKLSAgICAjIE9uIFN5bWJpYW4gcW1ha2UgbmVlZHMgdG8gcnVuIGluIHRoZSBzYW1lIGRp cmVjdG9yeSB3aGVyZSB0aGUgcHJvIGZpbGUgaXMgbG9jYXRlZC4KLSAgICBpZiAoaXNTeW1iaWFu KCkpIHsKLSAgICAgICAgJGRpciA9ICRzb3VyY2VEaXIgLiAiL1Rvb2xzIjsKLSAgICAgICAgY2hk aXIgJGRpciBvciBkaWUgIkZhaWxlZCB0byBjZCBpbnRvICIgLiAkZGlyIC4gIlxuIjsKLSAgICAg ICAgJG1ha2VmaWxlID0gImJsZC5pbmYiOwotICAgIH0KKyAgICAgICAgIyBPbiBTeW1iaWFuIHFt YWtlIG5lZWRzIHRvIHJ1biBpbiB0aGUgc2FtZSBkaXJlY3Rvcnkgd2hlcmUgdGhlIHBybyBmaWxl IGlzIGxvY2F0ZWQuCisgICAgICAgIGlmIChpc1N5bWJpYW4oKSkgeworICAgICAgICAgICAgJGRp ciA9ICRzb3VyY2VEaXIgLiAiL1Rvb2xzIjsKKyAgICAgICAgICAgIGNoZGlyICRkaXIgb3IgZGll ICJGYWlsZWQgdG8gY2QgaW50byAiIC4gJGRpciAuICJcbiI7CisgICAgICAgICAgICAkbWFrZWZp bGUgPSAiYmxkLmluZiI7CisgICAgICAgIH0KIAotICAgIHByaW50ICJDYWxsaW5nICckcW1ha2Vi aW4gQGJ1aWxkQXJncyAtbyAkbWFrZWZpbGUnIGluICIgLiAkZGlyIC4gIlxuXG4iOwotICAgICRy ZXN1bHQgPSBzeXN0ZW0gIiRxbWFrZWJpbiBAYnVpbGRBcmdzIC1vICRtYWtlZmlsZSI7Ci0gICAg aWYgKCRyZXN1bHQgbmUgMCkgewotICAgICAgIGRpZSAiRmFpbGVkIHRvIHNldHVwIGJ1aWxkIGVu dmlyb25tZW50IHVzaW5nICRxbWFrZWJpbiFcbiI7CisgICAgICAgIHByaW50ICJDYWxsaW5nICck cW1ha2ViaW4gQGJ1aWxkQXJncyAtbyAkbWFrZWZpbGUnIGluICIgLiAkZGlyIC4gIlxuXG4iOwor ICAgICAgICAkcmVzdWx0ID0gc3lzdGVtICIkcW1ha2ViaW4gQGJ1aWxkQXJncyAtbyAkbWFrZWZp bGUiOworICAgICAgICBpZiAoJHJlc3VsdCBuZSAwKSB7CisgICAgICAgICAgICBkaWUgIkZhaWxl ZCB0byBzZXR1cCBidWlsZCBlbnZpcm9ubWVudCB1c2luZyAkcW1ha2ViaW4hXG4iOworICAgICAg ICB9CiAgICAgfQogCi0gICAgIyBNYW51YWxseSBjcmVhdGUgbWFrZWZpbGVzIGZvciB0aGUgZXhh bXBsZXMgc28gd2UgZG9uJ3QgYnVpbGQgYnkgZGVmYXVsdAotICAgIG15ICRleGFtcGxlc0RpciA9 ICRkaXIgLiAiL1dlYktpdC9xdC9leGFtcGxlcyI7Ci0gICAgRmlsZTo6UGF0aDo6bWtwYXRoKCRl eGFtcGxlc0Rpcik7Ci0gICAgJGJ1aWxkQXJnc1stMV0gPSBzb3VyY2VEaXIoKSAuICIvU291cmNl L1dlYktpdC9xdC9leGFtcGxlcy9leGFtcGxlcy5wcm8iOwotICAgIGNoZGlyICRleGFtcGxlc0Rp ciBvciBkaWU7Ci0gICAgcHJpbnQgIkNhbGxpbmcgJyRxbWFrZWJpbiBAYnVpbGRBcmdzJyBpbiAi IC4gJGV4YW1wbGVzRGlyIC4gIlxuXG4iOwotICAgICRyZXN1bHQgPSBzeXN0ZW0gIiRxbWFrZWJp biBAYnVpbGRBcmdzIjsKLSAgICBkaWUgIkZhaWxlZCB0byBjcmVhdGUgbWFrZWZpbGVzIGZvciB0 aGUgZXhhbXBsZXMhXG4iIGlmICRyZXN1bHQgbmUgMDsKLSAgICBjaGRpciAkZGlyIG9yIGRpZTsK KyAgICBpZiAoJHByb2plY3QgZXEgIiIpIHsKKyAgICAgICAgIyBNYW51YWxseSBjcmVhdGUgbWFr ZWZpbGVzIGZvciB0aGUgZXhhbXBsZXMgc28gd2UgZG9uJ3QgYnVpbGQgYnkgZGVmYXVsdAorICAg ICAgICBteSAkZXhhbXBsZXNEaXIgPSAkZGlyIC4gIi9XZWJLaXQvcXQvZXhhbXBsZXMiOworICAg ICAgICBGaWxlOjpQYXRoOjpta3BhdGgoJGV4YW1wbGVzRGlyKTsKKyAgICAgICAgJGJ1aWxkQXJn c1stMV0gPSBzb3VyY2VEaXIoKSAuICIvU291cmNlL1dlYktpdC9xdC9leGFtcGxlcy9leGFtcGxl cy5wcm8iOworICAgICAgICBjaGRpciAkZXhhbXBsZXNEaXIgb3IgZGllOworICAgICAgICBwcmlu dCAiQ2FsbGluZyAnJHFtYWtlYmluIEBidWlsZEFyZ3MnIGluICIgLiAkZXhhbXBsZXNEaXIgLiAi XG5cbiI7CisgICAgICAgICRyZXN1bHQgPSBzeXN0ZW0gIiRxbWFrZWJpbiBAYnVpbGRBcmdzIjsK KyAgICAgICAgZGllICJGYWlsZWQgdG8gY3JlYXRlIG1ha2VmaWxlcyBmb3IgdGhlIGV4YW1wbGVz IVxuIiBpZiAkcmVzdWx0IG5lIDA7CisgICAgICAgIGNoZGlyICRkaXIgb3IgZGllOworICAgIH0K IAotICAgIG15ICRtYWtlVG9vbHMgPSAiZWNobyBObyBNYWtlZmlsZSBmb3IgVG9vbHMuIFNraXBw aW5nIG1ha2UiOworICAgIG15ICRtYWtlVG9vbHMgPSAiZWNobyI7CisgICAgaWYgKCRwcm9qZWN0 IGVxICIiKSB7CisgICAgICAgICRtYWtlVG9vbHMgPSAiZWNobyBObyBNYWtlZmlsZSBmb3IgVG9v bHMuIFNraXBwaW5nIG1ha2UiOwogCi0gICAgaWYgKC1lICIkZGlyLyRtYWtlZmlsZSIpIHsKLSAg ICAgICAgJG1ha2VUb29scyA9ICIkbWFrZSAkbWFrZWFyZ3MgLWYgJG1ha2VmaWxlIjsKKyAgICAg ICAgaWYgKC1lICIkZGlyLyRtYWtlZmlsZSIpIHsKKyAgICAgICAgICAgICRtYWtlVG9vbHMgPSAi JG1ha2UgJG1ha2VhcmdzIC1mICRtYWtlZmlsZSI7CisgICAgICAgIH0KICAgICB9CiAKICAgICBp ZiAoJGNsZWFuKSB7CkBAIC0xNzMzLDcgKzE3NTYsNyBAQCBzdWIgYnVpbGRRTWFrZVF0UHJvamVj dCgkJEApCiB7CiAgICAgbXkgKCRwcm9qZWN0LCAkY2xlYW4sIEBidWlsZEFyZ3MpID0gQF87CiAK LSAgICByZXR1cm4gYnVpbGRRTWFrZVByb2plY3QoJGNsZWFuLCBAYnVpbGRBcmdzKTsKKyAgICBy ZXR1cm4gYnVpbGRRTWFrZVByb2plY3QoIiIsICRjbGVhbiwgQGJ1aWxkQXJncyk7CiB9CiAKIHN1 YiBidWlsZEd0a1Byb2plY3QKLS0gCjEuNy4wLjQKCg== 87130 2011-03-28 05:36:27 -0700 2011-03-29 04:26:01 -0700 build-jsc for Qt 0001-Qt-Teach-build-jsc-how-to-build-JavaScriptCore-on-Qt.patch text/plain 6873 loki RnJvbSBmMDBiZDA2MzA1ODU5OGI2OGM2ZjM3OGM3MTY3OWUyYWEwMjU2NTc0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHYWJvciBMb2tpIDxsb2tpQGluZi51LXN6ZWdlZC5odT4KRGF0 ZTogTW9uLCAyOCBNYXIgMjAxMSAxNDozMjowNSArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIFtRdF0g VGVhY2ggYnVpbGQtanNjIGhvdyB0byBidWlsZCBKYXZhU2NyaXB0Q29yZSBvbiBRdAoKU2lnbmVk LW9mZi1ieTogR2Fib3IgTG9raSA8bG9raUBpbmYudS1zemVnZWQuaHU+Ci0tLQogVG9vbHMvQ2hh bmdlTG9nICAgICAgICAgICAgIHwgICAxMCArKysrKwogVG9vbHMvU2NyaXB0cy9idWlsZC1qc2Mg ICAgIHwgICAgNiArKy0KIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSB8ICAgNzcgKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA2 NCBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGYzNGQ5Zi4uMDZlYmYzMCAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDExLTAzLTI4ICBHYWJvciBMb2tpICA8bG9raUB3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gVGVhY2ggYnVpbGQtanNj IGhvdyB0byBidWlsZCBKYXZhU2NyaXB0Q29yZSBvbiBRdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY5MTgKKworICAgICAgICAqIFNjcmlwdHMvYnVp bGQtanNjOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAxMS0wMy0yNyAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YWNpZWogU3RhY2hvd2lhay4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtanNjIGIv VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKaW5kZXggYzlkNDEzNC4uNzVmNjU2NyAxMDA3NTUKLS0t IGEvVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKKysrIGIvVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MK QEAgLTY5LDggKzY5LDEwIEBAIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAkcmVzdWx0 ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJKYXZhU2NyaXB0Q29yZS52Y3Byb2ovSmF2YVNj cmlwdENvcmUuc2xuIik7CiB9IGVsc2lmIChpc0d0aygpKSB7CiAgICAgJHJlc3VsdCA9IGJ1aWxk R3RrUHJvamVjdCgiSmF2YVNjcmlwdENvcmUiKTsKLX0gZWxzaWYgKGlzUXQoKSBvciBpc1d4KCkp IHsKLSAgICAjIFF0IGJ1aWxkcyBldmVyeXRoaW5nIGluIG9uZS1zaG90LiBObyBuZWVkIHRvIGJ1 aWxkIGFueXRoaW5nIGhlcmUuCit9IGVsc2lmIChpc1F0KCkpIHsKKyAgICAkcmVzdWx0ID0gYnVp bGRRTWFrZVByb2plY3QoIkphdmFTY3JpcHRDb3JlIiwgMCwgQEFSR1YpOworfSBlbHNpZiAoaXNX eCgpKSB7CisgICAgIyBCdWlsZHMgZXZlcnl0aGluZyBpbiBvbmUtc2hvdC4gTm8gbmVlZCB0byBi dWlsZCBhbnl0aGluZyBoZXJlLgogICAgICRyZXN1bHQgPSAwOwogfSBlbHNlIHsKICAgICBkaWUg IkJ1aWxkaW5nIG5vdCBkZWZpbmVkIGZvciB0aGlzIHBsYXRmb3JtIVxuIjsKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQppbmRleCBlZjdhMmY3Li5hZDc2YmU5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xNTY3LDcgKzE1 NjcsMTQgQEAgc3ViIGJ1aWxkQ01ha2VQcm9qZWN0T3JFeGl0KCQkJCRAKQogCiBzdWIgYnVpbGRR TWFrZVByb2plY3QoJEApCiB7Ci0gICAgbXkgKCRjbGVhbiwgQGJ1aWxkUGFyYW1zKSA9IEBfOwor ICAgIG15ICgkcHJvamVjdCwgJGNsZWFuLCBAYnVpbGRQYXJhbXMpID0gQF87CisKKyAgICBteSBA c3ViZGlycyA9ICgiSmF2YVNjcmlwdENvcmUiLCAiV2ViQ29yZSIsICJXZWJLaXQvcXQvQXBpIik7 CisgICAgaWYgKGdyZXAgeyAkXyBlcSAkcHJvamVjdCB9IEBzdWJkaXJzKSB7CisgICAgICAgIEBz dWJkaXJzID0gKCRwcm9qZWN0KTsKKyAgICB9IGVsc2UgeworICAgICAgICAkcHJvamVjdCA9IDA7 CisgICAgfQogCiAgICAgbXkgQGJ1aWxkQXJncyA9ICgiLXIiKTsKIApAQCAtMTYxMyw2ICsxNjIw LDkgQEAgc3ViIGJ1aWxkUU1ha2VQcm9qZWN0KCRAKQogICAgIG15IEBkc1FtYWtlQXJncyA9IEBi dWlsZEFyZ3M7CiAgICAgcHVzaCBAZHNRbWFrZUFyZ3MsICItciI7CiAgICAgcHVzaCBAZHNRbWFr ZUFyZ3MsIHNvdXJjZURpcigpIC4gIi9Tb3VyY2UvRGVyaXZlZFNvdXJjZXMucHJvIjsKKyAgICBp ZiAoJHByb2plY3QpIHsKKyAgICAgICAgcHVzaCBAZHNRbWFrZUFyZ3MsICItYWZ0ZXIgU1VCRElS Uz0iIC4gJHByb2plY3QuICIvRGVyaXZlZFNvdXJjZXMucHJvIjsKKyAgICB9CiAgICAgcHVzaCBA ZHNRbWFrZUFyZ3MsICItbyBNYWtlZmlsZS5EZXJpdmVkU291cmNlcyI7CiAgICAgcHJpbnQgIkNh bGxpbmcgJyRxbWFrZWJpbiBAZHNRbWFrZUFyZ3MnIGluICIgLiAkZGlyIC4gIlxuXG4iOwogICAg IG15ICRyZXN1bHQgPSBzeXN0ZW0gIiRxbWFrZWJpbiBAZHNRbWFrZUFyZ3MiOwpAQCAtMTYyMiw3 ICsxNjMyLDYgQEAgc3ViIGJ1aWxkUU1ha2VQcm9qZWN0KCRAKQogCiAgICAgIyBGSVhNRTogSXRl cmF0ZSBvdmVyIGRpZmZlcmVudCBzb3VyY2UgZGlyZWN0b3JpZXMgbWFudWFsbHkgdG8gd29ya2Fy b3VuZCBhIHByb2JsZW0gd2l0aCBxbWFrZStleHRyYVRhcmdldHMrczYwCiAgICAgIyBUbyBhdm9p ZCBvdmVyd3JpdGluZyBvZiBNYWtlZmlsZS5EZXJpdmVkU291cmNlcyBpbiB0aGUgcm9vdCBkaXIg dXNlIE1ha2VmaWxlLkRlcml2ZWRTb3VyY2VzLlRvb2xzIGZvciBUb29scwotICAgIG15IEBzdWJk aXJzID0gKCJKYXZhU2NyaXB0Q29yZSIsICJXZWJDb3JlIiwgIldlYktpdC9xdC9BcGkiKTsKICAg ICBpZiAoZ3JlcCB7ICRfIGVxICJDT05GSUcrPXdlYmtpdDIifSBAYnVpbGRBcmdzKSB7CiAgICAg ICAgIHB1c2ggQHN1YmRpcnMsICJXZWJLaXQyIjsKICAgICAgICAgaWYgKCAtZSBzb3VyY2VEaXIo KSAuIi9Ub29scy9EZXJpdmVkU291cmNlcy5wcm8iICkgewpAQCAtMTY2OSw2ICsxNjc4LDEyIEBA IHN1YiBidWlsZFFNYWtlUHJvamVjdCgkQCkKICAgICAgICAgfQogICAgIH0KIAorICAgIGlmICgk cHJvamVjdCkgeworICAgICAgICBwdXNoIEBidWlsZEFyZ3MsICItYWZ0ZXIgU1VCRElSUz0iIC4g JHByb2plY3QgLiAiLyIgLiAkcHJvamVjdCAuICIucHJvICI7CisgICAgICAgIGlmICgkcHJvamVj dCBlcSAiSmF2YVNjcmlwdENvcmUiKSB7CisgICAgICAgICAgICBwdXNoIEBidWlsZEFyZ3MsICIt YWZ0ZXIgU1VCRElSUys9IiAuICRwcm9qZWN0IC4gIi9qc2MucHJvICI7CisgICAgICAgIH0KKyAg ICB9CiAgICAgcHVzaCBAYnVpbGRBcmdzLCBzb3VyY2VEaXIoKSAuICIvU291cmNlL1dlYktpdC5w cm8iOwogICAgIHByaW50ICJDYWxsaW5nICckcW1ha2ViaW4gQGJ1aWxkQXJncycgaW4gIiAuICRk aXIgLiAiXG5cbiI7CiAgICAgcHJpbnQgIkluc3RhbGxhdGlvbiBoZWFkZXJzIGRpcmVjdG9yeTog JGluc3RhbGxIZWFkZXJzXG4iIGlmKGRlZmluZWQoJGluc3RhbGxIZWFkZXJzKSk7CkBAIC0xNjc5 LDM2ICsxNjk0LDQ0IEBAIHN1YiBidWlsZFFNYWtlUHJvamVjdCgkQCkKICAgICAgICBkaWUgIkZh aWxlZCB0byBzZXR1cCBidWlsZCBlbnZpcm9ubWVudCB1c2luZyAkcW1ha2ViaW4hXG4iOwogICAg IH0KIAotICAgICRidWlsZEFyZ3NbLTFdID0gc291cmNlRGlyKCkgLiAiL1Rvb2xzL1Rvb2xzLnBy byI7Ci0gICAgbXkgJG1ha2VmaWxlID0gIk1ha2VmaWxlLlRvb2xzIjsKKyAgICBteSAkbWFrZWZp bGUgPSAiIjsKKyAgICBpZiAoISRwcm9qZWN0KSB7CisgICAgICAgICRidWlsZEFyZ3NbLTFdID0g c291cmNlRGlyKCkgLiAiL1Rvb2xzL1Rvb2xzLnBybyI7CisgICAgICAgICRtYWtlZmlsZSA9ICJN YWtlZmlsZS5Ub29scyI7CiAKLSAgICAjIE9uIFN5bWJpYW4gcW1ha2UgbmVlZHMgdG8gcnVuIGlu IHRoZSBzYW1lIGRpcmVjdG9yeSB3aGVyZSB0aGUgcHJvIGZpbGUgaXMgbG9jYXRlZC4KLSAgICBp ZiAoaXNTeW1iaWFuKCkpIHsKLSAgICAgICAgJGRpciA9ICRzb3VyY2VEaXIgLiAiL1Rvb2xzIjsK LSAgICAgICAgY2hkaXIgJGRpciBvciBkaWUgIkZhaWxlZCB0byBjZCBpbnRvICIgLiAkZGlyIC4g IlxuIjsKLSAgICAgICAgJG1ha2VmaWxlID0gImJsZC5pbmYiOwotICAgIH0KKyAgICAgICAgIyBP biBTeW1iaWFuIHFtYWtlIG5lZWRzIHRvIHJ1biBpbiB0aGUgc2FtZSBkaXJlY3Rvcnkgd2hlcmUg dGhlIHBybyBmaWxlIGlzIGxvY2F0ZWQuCisgICAgICAgIGlmIChpc1N5bWJpYW4oKSkgeworICAg ICAgICAgICAgJGRpciA9ICRzb3VyY2VEaXIgLiAiL1Rvb2xzIjsKKyAgICAgICAgICAgIGNoZGly ICRkaXIgb3IgZGllICJGYWlsZWQgdG8gY2QgaW50byAiIC4gJGRpciAuICJcbiI7CisgICAgICAg ICAgICAkbWFrZWZpbGUgPSAiYmxkLmluZiI7CisgICAgICAgIH0KIAotICAgIHByaW50ICJDYWxs aW5nICckcW1ha2ViaW4gQGJ1aWxkQXJncyAtbyAkbWFrZWZpbGUnIGluICIgLiAkZGlyIC4gIlxu XG4iOwotICAgICRyZXN1bHQgPSBzeXN0ZW0gIiRxbWFrZWJpbiBAYnVpbGRBcmdzIC1vICRtYWtl ZmlsZSI7Ci0gICAgaWYgKCRyZXN1bHQgbmUgMCkgewotICAgICAgIGRpZSAiRmFpbGVkIHRvIHNl dHVwIGJ1aWxkIGVudmlyb25tZW50IHVzaW5nICRxbWFrZWJpbiFcbiI7CisgICAgICAgIHByaW50 ICJDYWxsaW5nICckcW1ha2ViaW4gQGJ1aWxkQXJncyAtbyAkbWFrZWZpbGUnIGluICIgLiAkZGly IC4gIlxuXG4iOworICAgICAgICAkcmVzdWx0ID0gc3lzdGVtICIkcW1ha2ViaW4gQGJ1aWxkQXJn cyAtbyAkbWFrZWZpbGUiOworICAgICAgICBpZiAoJHJlc3VsdCBuZSAwKSB7CisgICAgICAgICAg ICBkaWUgIkZhaWxlZCB0byBzZXR1cCBidWlsZCBlbnZpcm9ubWVudCB1c2luZyAkcW1ha2ViaW4h XG4iOworICAgICAgICB9CiAgICAgfQogCi0gICAgIyBNYW51YWxseSBjcmVhdGUgbWFrZWZpbGVz IGZvciB0aGUgZXhhbXBsZXMgc28gd2UgZG9uJ3QgYnVpbGQgYnkgZGVmYXVsdAotICAgIG15ICRl eGFtcGxlc0RpciA9ICRkaXIgLiAiL1dlYktpdC9xdC9leGFtcGxlcyI7Ci0gICAgRmlsZTo6UGF0 aDo6bWtwYXRoKCRleGFtcGxlc0Rpcik7Ci0gICAgJGJ1aWxkQXJnc1stMV0gPSBzb3VyY2VEaXIo KSAuICIvU291cmNlL1dlYktpdC9xdC9leGFtcGxlcy9leGFtcGxlcy5wcm8iOwotICAgIGNoZGly ICRleGFtcGxlc0RpciBvciBkaWU7Ci0gICAgcHJpbnQgIkNhbGxpbmcgJyRxbWFrZWJpbiBAYnVp bGRBcmdzJyBpbiAiIC4gJGV4YW1wbGVzRGlyIC4gIlxuXG4iOwotICAgICRyZXN1bHQgPSBzeXN0 ZW0gIiRxbWFrZWJpbiBAYnVpbGRBcmdzIjsKLSAgICBkaWUgIkZhaWxlZCB0byBjcmVhdGUgbWFr ZWZpbGVzIGZvciB0aGUgZXhhbXBsZXMhXG4iIGlmICRyZXN1bHQgbmUgMDsKLSAgICBjaGRpciAk ZGlyIG9yIGRpZTsKKyAgICBpZiAoISRwcm9qZWN0KSB7CisgICAgICAgICMgTWFudWFsbHkgY3Jl YXRlIG1ha2VmaWxlcyBmb3IgdGhlIGV4YW1wbGVzIHNvIHdlIGRvbid0IGJ1aWxkIGJ5IGRlZmF1 bHQKKyAgICAgICAgbXkgJGV4YW1wbGVzRGlyID0gJGRpciAuICIvV2ViS2l0L3F0L2V4YW1wbGVz IjsKKyAgICAgICAgRmlsZTo6UGF0aDo6bWtwYXRoKCRleGFtcGxlc0Rpcik7CisgICAgICAgICRi dWlsZEFyZ3NbLTFdID0gc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvcXQvZXhhbXBsZXMv ZXhhbXBsZXMucHJvIjsKKyAgICAgICAgY2hkaXIgJGV4YW1wbGVzRGlyIG9yIGRpZTsKKyAgICAg ICAgcHJpbnQgIkNhbGxpbmcgJyRxbWFrZWJpbiBAYnVpbGRBcmdzJyBpbiAiIC4gJGV4YW1wbGVz RGlyIC4gIlxuXG4iOworICAgICAgICAkcmVzdWx0ID0gc3lzdGVtICIkcW1ha2ViaW4gQGJ1aWxk QXJncyI7CisgICAgICAgIGRpZSAiRmFpbGVkIHRvIGNyZWF0ZSBtYWtlZmlsZXMgZm9yIHRoZSBl eGFtcGxlcyFcbiIgaWYgJHJlc3VsdCBuZSAwOworICAgICAgICBjaGRpciAkZGlyIG9yIGRpZTsK KyAgICB9CiAKLSAgICBteSAkbWFrZVRvb2xzID0gImVjaG8gTm8gTWFrZWZpbGUgZm9yIFRvb2xz LiBTa2lwcGluZyBtYWtlIjsKKyAgICBteSAkbWFrZVRvb2xzID0gImVjaG8iOworICAgIGlmICgh JHByb2plY3QpIHsKKyAgICAgICAgJG1ha2VUb29scyA9ICJlY2hvIE5vIE1ha2VmaWxlIGZvciBU b29scy4gU2tpcHBpbmcgbWFrZSI7CiAKLSAgICBpZiAoLWUgIiRkaXIvJG1ha2VmaWxlIikgewot ICAgICAgICAkbWFrZVRvb2xzID0gIiRtYWtlICRtYWtlYXJncyAtZiAkbWFrZWZpbGUiOworICAg ICAgICBpZiAoLWUgIiRkaXIvJG1ha2VmaWxlIikgeworICAgICAgICAgICAgJG1ha2VUb29scyA9 ICIkbWFrZSAkbWFrZWFyZ3MgLWYgJG1ha2VmaWxlIjsKKyAgICAgICAgfQogICAgIH0KIAogICAg IGlmICgkY2xlYW4pIHsKQEAgLTE3MzMsNyArMTc1Niw3IEBAIHN1YiBidWlsZFFNYWtlUXRQcm9q ZWN0KCQkQCkKIHsKICAgICBteSAoJHByb2plY3QsICRjbGVhbiwgQGJ1aWxkQXJncykgPSBAXzsK IAotICAgIHJldHVybiBidWlsZFFNYWtlUHJvamVjdCgkY2xlYW4sIEBidWlsZEFyZ3MpOworICAg IHJldHVybiBidWlsZFFNYWtlUHJvamVjdCgiIiwgJGNsZWFuLCBAYnVpbGRBcmdzKTsKIH0KIAog c3ViIGJ1aWxkR3RrUHJvamVjdAotLSAKMS43LjAuNAoK