116169 2013-05-15 11:10:55 -0700 [Windows] Update various build scripts for VS2010 (or newer) build environments 2013-05-15 11:36:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116170 1 bfulgham bfulgham bfulgham commit-queue dbates oldest_to_newest 889403 0 bfulgham 2013-05-15 11:10:55 -0700 Many of the utilities used for Windows building are based around Windows XP-era SDK's and VS2005 paths. While many of the build solutions were updated for VS2010, the various command-line tools used by testing bots or other automated environments were not updated to reflect the new tool chain. This bug makes the following changes: 1. Teach 'webkitdirs.pm' about various acceptable Windows SDK's that users might standardize on to build WebKit. 2. Update 'build-api-tests' to select the correct Visual Studio solution based on the current build environment. 3. Update 'build-dumprendertree' to select the correct Visual Studio solution based on the current build environment. 4. Update 'build-webkit' to select the correct Visual Studio solution based on the current build environment. Note: The JSC solution needs to also be updated to build as a stand-alone solution. Once that is done, we can update 'build-jsc' to recognize the VS2010 (or newer) environment. 889408 1 201857 bfulgham 2013-05-15 11:20:10 -0700 Created attachment 201857 Patch 889411 2 201858 bfulgham 2013-05-15 11:28:02 -0700 Created attachment 201858 Patch 889422 3 bfulgham 2013-05-15 11:36:03 -0700 Committed r150131: <http://trac.webkit.org/changeset/150131> 201857 2013-05-15 11:20:10 -0700 2013-05-15 11:28:01 -0700 Patch bug-116169-20130515111907.patch text/plain 5850 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDEzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEzLTA1LTE1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBVcGRhdGUgdmFyaW91cyBidWlsZCB0b29scyB0byB1bmRl cnN0YW5kIFZTMjAxMCBlbnZpcm9ubWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNjE2OS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtYXBpLXRlc3RzOiBJZGVudGlmeSBW UzIwMTAgZW52aXJvbm1lbnQuCisgICAgICAgICogU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJl ZTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6IERpdHRvLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGRpZUlmV2luZG93c1BsYXRmb3Jt U0RLTm90SW5zdGFsbGVkKTogVXBkYXRlIHRvIHJlY29nbml6ZSBhIHdpZGVyCisgICAgICAgIHJh bmdlIG9mIGFjY2VwdGFibGUgU0RLJ3MuCisKIDIwMTMtMDUtMTUgIFBldGVyIEdhbCAgPGdhbHBl dGVyQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBBbGxvdyBodHRwIHRlc3RzIG9uIEFyY2gg TGludXgKSW5kZXg6IFRvb2xzL1NjcmlwdHMvYnVpbGQtYXBpLXRlc3RzCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvYnVpbGQtYXBpLXRlc3RzCShyZXZpc2lvbiAxNTAwOTUpCisrKyBUb29s cy9TY3JpcHRzL2J1aWxkLWFwaS10ZXN0cwkod29ya2luZyBjb3B5KQpAQCAtNjUsNyArNjUsMTEg QEAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJv amVjdCgiVGVzdFdlYktpdEFQSSIsICRjbGVhbiwgWGNvZGVPcHRpb25zKCksIEBBUkdWKTsKIH0g ZWxzaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewogICAgIGNoZGlyICJUb29scy9UZXN0V2ViS2l0 QVBJIiBvciBkaWU7Ci0gICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdCgid2lu L1Rlc3RXZWJLaXRBUEkuc2xuIiwgJGNsZWFuKTsKKyAgICBteSAkc29sdXRpb25QYXRoID0gIlRl c3RXZWJLaXRBUEkudmN4cHJvai9UZXN0V2ViS2l0QVBJLnNsbiI7CisgICAgaWYgKHZpc3VhbFN0 dWRpb1ZlcnNpb24oKSBlcSAiOCIpIHsKKyAgICAgICAgJHNvbHV0aW9uUGF0aCA9ICJ3aW4vVGVz dFdlYktpdEFQSS5zbG4iOworICAgIH0KKyAgICAkcmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Q cm9qZWN0KCRzb2x1dGlvblBhdGgsICRjbGVhbik7CiB9IGVsc2UgewogICAgIGRpZSAiVGVzdFdl YktpdEFQSSBpcyBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZvcm0uXG4iOwogfQpJbmRleDog VG9vbHMvU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlCShyZXZpc2lvbiAxNTAwOTUpCisrKyBUb29scy9T Y3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlCSh3b3JraW5nIGNvcHkpCkBAIC02OCw3ICs2OCwx MSBAQCBteSAkcmVzdWx0OwogaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICRyZXN1bHQg PSBidWlsZFhDb2RlUHJvamVjdCgiRHVtcFJlbmRlclRyZWUiLCAkY2xlYW4sIFhjb2RlT3B0aW9u cygpLCBAQVJHVik7CiB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKLSAgICAkcmVzdWx0 ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJEdW1wUmVuZGVyVHJlZS5zbG4iLCAkY2xlYW4p OworICAgIG15ICRkcnRTb2x1dGlvblBhdGggPSAiRHVtcFJlbmRlclRyZWUudmN4cHJvai9EdW1w UmVuZGVyVHJlZS5zbG4iOworICAgIGlmICh2aXN1YWxTdHVkaW9WZXJzaW9uKCkgZXEgIjgiKSB7 CisgICAgICAgICRkcnRTb2x1dGlvblBhdGggPSAiRHVtcFJlbmRlclRyZWUuc2xuIjsKKyAgICB9 CisgICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdCgkZHJ0U29sdXRpb25QYXRo LCAkY2xlYW4pOwogfSBlbHNpZiAoaXNRdCgpIHx8IGlzR3RrKCkgfHwgaXNFZmwoKSkgewogICAg ICMgUXQsIEd0ayBhbmQgRUZMIGJ1aWxkIGV2ZXJ5dGhpbmcgaW4gb25lIHNob3QuIE5vIG5lZWQg dG8gYnVpbGQgYW55dGhpbmcgaGVyZS4KICAgICAkcmVzdWx0ID0gMDsKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvYnVpbGQtd2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Vi a2l0CShyZXZpc2lvbiAxNTAwOTUpCisrKyBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkod29y a2luZyBjb3B5KQpAQCAtMzM3LDcgKzMzNywxMSBAQCBmb3IgbXkgJGRpciAoQHByb2plY3RzKSB7 CiAgICAgICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJvamVjdCgkcHJvamVjdFBhdGgsICRjbGVh biwgQGxvY2FsX29wdGlvbnMsIEBBUkdWKTsKICAgICB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0 KCkpIHsKICAgICAgICAgaWYgKCRwcm9qZWN0IGVxICJXZWJLaXQiKSB7Ci0gICAgICAgICAgICAk cmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJ3aW4vV2ViS2l0LnZjcHJvai9XZWJL aXQuc2xuIiwgJGNsZWFuKTsKKyAgICAgICAgICAgIG15ICR3ZWJraXRTb2x1dGlvblBhdGggPSAi V2ViS2l0LnZjeHByb2ovV2ViS2l0LnNsbiI7CisgICAgICAgICAgICBpZiAodmlzdWFsU3R1ZGlv VmVyc2lvbigpIGVxICI4IikgeworICAgICAgICAgICAgICAgICR3ZWJraXRTb2x1dGlvblBhdGgg PSAid2luL1dlYktpdC52Y3Byb2ovV2ViS2l0LnNsbiI7CisgICAgICAgICAgICB9CisgICAgICAg ICAgICAkcmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCR3ZWJraXRTb2x1dGlvblBh dGgsICRjbGVhbik7CiAgICAgICAgIH0KICAgICB9CiAgICAgIyBWYXJpb3VzIGJ1aWxkKiBjYWxs cyBhYm92ZSBtYXkgY2hhbmdlIHRoZSBDV0QuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lv biAxNTAwOTUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkK QEAgLTE2ODEsMTcgKzE2ODEsMjggQEAgc3ViIGRpZUlmV2luZG93c1BsYXRmb3JtU0RLTm90SW5z dGFsbGVkCiB7CiAgICAgbXkgJHJlZ2lzdHJ5MzJQYXRoID0gIi9wcm9jL3JlZ2lzdHJ5LyI7CiAg ICAgbXkgJHJlZ2lzdHJ5NjRQYXRoID0gIi9wcm9jL3JlZ2lzdHJ5NjQvIjsKLSAgICBteSAkd2lu ZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlFbnRyeSA9ICJIS0VZX0xPQ0FMX01BQ0hJTkUvU09GVFdB UkUvTWljcm9zb2Z0L01pY3Jvc29mdFNESy9JbnN0YWxsZWRTREtzL0QyRkY5Rjg5LThBQTItNDM3 My04QTMxLUM4MzhCRjREQkJFMSI7CisgICAgbXkgQHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5 RW50cmllcyA9ICgKKyAgICAgICAgIkhLRVlfTE9DQUxfTUFDSElORS9TT0ZUV0FSRS9NaWNyb3Nv ZnQvTWljcm9zb2Z0IFNES3MvV2luZG93cy92OC4wQSIsCisgICAgICAgICJIS0VZX0xPQ0FMX01B Q0hJTkUvU09GVFdBUkUvTWljcm9zb2Z0L01pY3Jvc29mdCBTREtzL1dpbmRvd3MvdjguMCIsCisg ICAgICAgICJIS0VZX0xPQ0FMX01BQ0hJTkUvU09GVFdBUkUvTWljcm9zb2Z0L01pY3Jvc29mdCBT REtzL1dpbmRvd3MvdjcuMUEiLAorICAgICAgICAiSEtFWV9MT0NBTF9NQUNISU5FL1NPRlRXQVJF L01pY3Jvc29mdC9NaWNyb3NvZnQgU0RLcy9XaW5kb3dzL3Y3LjBBIiwKKyAgICAgICAgIkhLRVlf TE9DQUxfTUFDSElORS9TT0ZUV0FSRS9NaWNyb3NvZnQvTWljcm9zb2Z0U0RLL0luc3RhbGxlZFNE S3MvRDJGRjlGODktOEFBMi00MzczLThBMzEtQzgzOEJGNERCQkUxIiwKKyAgICApOwogCiAgICAg IyBGSVhNRTogSXQgd291bGQgYmUgYmV0dGVyIHRvIGRldGVjdCB3aGV0aGVyIHdlIGFyZSB1c2lu ZyAzMi0gb3IgNjQtYml0IFdpbmRvd3MKICAgICAjIGFuZCBvbmx5IGNoZWNrIHRoZSBhcHByb3By aWF0ZSBlbnRyeS4gQnV0IGZvciBub3cgd2UganVzdCBibGluZGx5IGNoZWNrIGJvdGguCi0gICAg cmV0dXJuIGlmICgtZSAkcmVnaXN0cnkzMlBhdGggLiAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0 cnlFbnRyeSkgfHwgKC1lICRyZWdpc3RyeTY0UGF0aCAuICR3aW5kb3dzUGxhdGZvcm1TREtSZWdp c3RyeUVudHJ5KTsKKyAgICBteSAkcmVjb21tZW5kZWRQbGF0Zm9ybVNESyA9ICR3aW5kb3dzUGxh dGZvcm1TREtSZWdpc3RyeUVudHJpZXNbMF07CisgICAgbXkgJHdpbmRvd3NQbGF0Zm9ybVNES1Jl Z2lzdHJ5RW50cnk7CisKKyAgICB3aGlsZSAoQHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5RW50 cmllcykgeworICAgICAgICAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlFbnRyeSA9IHNoaWZ0 IEB3aW5kb3dzUGxhdGZvcm1TREtSZWdpc3RyeUVudHJpZXM7CisgICAgICAgIHJldHVybiBpZiAo LWUgJHJlZ2lzdHJ5MzJQYXRoIC4gJHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5RW50cnkpIHx8 ICgtZSAkcmVnaXN0cnk2NFBhdGggLiAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlFbnRyeSk7 CisgICAgfQogCiAgICAgcHJpbnQgIioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKipcbiI7Ci0gICAgcHJpbnQgIkNhbm5vdCBmaW5kIHJl Z2lzdHJ5IGVudHJ5ICckd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlFbnRyeScuXG4iOwotICAg IHByaW50ICJQbGVhc2UgZG93bmxvYWQgYW5kIGluc3RhbGwgdGhlIE1pY3Jvc29mdCBXaW5kb3dz IFNlcnZlciAyMDAzIFIyXG4iOwotICAgIHByaW50ICJQbGF0Zm9ybSBTREsgZnJvbSA8aHR0cDov L3d3dy5taWNyb3NvZnQuY29tL2Rvd25sb2Fkcy9kZXRhaWxzLmFzcHg/XG4iOwotICAgIHByaW50 ICJmYW1pbHlpZD0wYmFmMmIzNS1jNjU2LTQ5NjktYWNlOC1lNGMwYzA3MTZhZGImZGlzcGxheWxh bmc9ZW4+LlxuXG4iOworICAgIHByaW50ICJDYW5ub3QgZmluZCByZWdpc3RyeSBlbnRyeSAnJHJl Y29tbWVuZGVkUGxhdGZvcm1TREsnLlxuIjsKKyAgICBwcmludCAiUGxlYXNlIGRvd25sb2FkIGFu ZCBpbnN0YWxsIHRoZSBNaWNyb3NvZnQgV2luZG93cyBTREtcbiI7CisgICAgcHJpbnQgImZyb20g PGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9lbi11cy9kb3dubG9hZC9kZXRhaWxzLmFzcHg/aWQ9 ODI3OT4uXG5cbiI7CiAgICAgcHJpbnQgIlRoZW4gZm9sbG93IHN0ZXAgMiBpbiB0aGUgV2luZG93 cyBzZWN0aW9uIG9mIHRoZSBcIkluc3RhbGxpbmcgRGV2ZWxvcGVyXG4iOwogICAgIHByaW50ICJU b29sc1wiIGluc3RydWN0aW9ucyBhdCA8aHR0cDovL3d3dy53ZWJraXQub3JnL2J1aWxkaW5nL3Rv b2xzLmh0bWw+LlxuIjsKICAgICBwcmludCAiKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuIjsK 201858 2013-05-15 11:28:02 -0700 2013-05-15 11:35:15 -0700 Patch bug-116169-20130515112700.patch text/plain 5811 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDEzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEzLTA1LTE1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBVcGRhdGUgdmFyaW91cyBidWlsZCB0b29scyB0byB1bmRl cnN0YW5kIFZTMjAxMCBlbnZpcm9ubWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNjE2OS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtYXBpLXRlc3RzOiBJZGVudGlmeSBW UzIwMTAgZW52aXJvbm1lbnQuCisgICAgICAgICogU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJl ZTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6IERpdHRvLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGRpZUlmV2luZG93c1BsYXRmb3Jt U0RLTm90SW5zdGFsbGVkKTogVXBkYXRlIHRvIHJlY29nbml6ZSBhIHdpZGVyCisgICAgICAgIHJh bmdlIG9mIGFjY2VwdGFibGUgU0RLJ3MuCisKIDIwMTMtMDUtMTUgIFBldGVyIEdhbCAgPGdhbHBl dGVyQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBBbGxvdyBodHRwIHRlc3RzIG9uIEFyY2gg TGludXgKSW5kZXg6IFRvb2xzL1NjcmlwdHMvYnVpbGQtYXBpLXRlc3RzCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvYnVpbGQtYXBpLXRlc3RzCShyZXZpc2lvbiAxNTAwOTUpCisrKyBUb29s cy9TY3JpcHRzL2J1aWxkLWFwaS10ZXN0cwkod29ya2luZyBjb3B5KQpAQCAtNjUsNyArNjUsMTEg QEAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJv amVjdCgiVGVzdFdlYktpdEFQSSIsICRjbGVhbiwgWGNvZGVPcHRpb25zKCksIEBBUkdWKTsKIH0g ZWxzaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewogICAgIGNoZGlyICJUb29scy9UZXN0V2ViS2l0 QVBJIiBvciBkaWU7Ci0gICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdCgid2lu L1Rlc3RXZWJLaXRBUEkuc2xuIiwgJGNsZWFuKTsKKyAgICBteSAkc29sdXRpb25QYXRoID0gIlRl c3RXZWJLaXRBUEkudmN4cHJvai9UZXN0V2ViS2l0QVBJLnNsbiI7CisgICAgaWYgKHZpc3VhbFN0 dWRpb1ZlcnNpb24oKSBlcSAiOCIpIHsKKyAgICAgICAgJHNvbHV0aW9uUGF0aCA9ICJ3aW4vVGVz dFdlYktpdEFQSS5zbG4iOworICAgIH0KKyAgICAkcmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Q cm9qZWN0KCRzb2x1dGlvblBhdGgsICRjbGVhbik7CiB9IGVsc2UgewogICAgIGRpZSAiVGVzdFdl YktpdEFQSSBpcyBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZvcm0uXG4iOwogfQpJbmRleDog VG9vbHMvU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlCShyZXZpc2lvbiAxNTAwOTUpCisrKyBUb29scy9T Y3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlCSh3b3JraW5nIGNvcHkpCkBAIC02OCw3ICs2OCwx MSBAQCBteSAkcmVzdWx0OwogaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICRyZXN1bHQg PSBidWlsZFhDb2RlUHJvamVjdCgiRHVtcFJlbmRlclRyZWUiLCAkY2xlYW4sIFhjb2RlT3B0aW9u cygpLCBAQVJHVik7CiB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKLSAgICAkcmVzdWx0 ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJEdW1wUmVuZGVyVHJlZS5zbG4iLCAkY2xlYW4p OworICAgIG15ICRkcnRTb2x1dGlvblBhdGggPSAiRHVtcFJlbmRlclRyZWUudmN4cHJvai9EdW1w UmVuZGVyVHJlZS5zbG4iOworICAgIGlmICh2aXN1YWxTdHVkaW9WZXJzaW9uKCkgZXEgIjgiKSB7 CisgICAgICAgICRkcnRTb2x1dGlvblBhdGggPSAiRHVtcFJlbmRlclRyZWUuc2xuIjsKKyAgICB9 CisgICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdCgkZHJ0U29sdXRpb25QYXRo LCAkY2xlYW4pOwogfSBlbHNpZiAoaXNRdCgpIHx8IGlzR3RrKCkgfHwgaXNFZmwoKSkgewogICAg ICMgUXQsIEd0ayBhbmQgRUZMIGJ1aWxkIGV2ZXJ5dGhpbmcgaW4gb25lIHNob3QuIE5vIG5lZWQg dG8gYnVpbGQgYW55dGhpbmcgaGVyZS4KICAgICAkcmVzdWx0ID0gMDsKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvYnVpbGQtd2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Vi a2l0CShyZXZpc2lvbiAxNTAwOTUpCisrKyBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkod29y a2luZyBjb3B5KQpAQCAtMzM3LDcgKzMzNywxMSBAQCBmb3IgbXkgJGRpciAoQHByb2plY3RzKSB7 CiAgICAgICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJvamVjdCgkcHJvamVjdFBhdGgsICRjbGVh biwgQGxvY2FsX29wdGlvbnMsIEBBUkdWKTsKICAgICB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0 KCkpIHsKICAgICAgICAgaWYgKCRwcm9qZWN0IGVxICJXZWJLaXQiKSB7Ci0gICAgICAgICAgICAk cmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJ3aW4vV2ViS2l0LnZjcHJvai9XZWJL aXQuc2xuIiwgJGNsZWFuKTsKKyAgICAgICAgICAgIG15ICR3ZWJraXRTb2x1dGlvblBhdGggPSAi V2ViS2l0LnZjeHByb2ovV2ViS2l0LnNsbiI7CisgICAgICAgICAgICBpZiAodmlzdWFsU3R1ZGlv VmVyc2lvbigpIGVxICI4IikgeworICAgICAgICAgICAgICAgICR3ZWJraXRTb2x1dGlvblBhdGgg PSAid2luL1dlYktpdC52Y3Byb2ovV2ViS2l0LnNsbiI7CisgICAgICAgICAgICB9CisgICAgICAg ICAgICAkcmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCR3ZWJraXRTb2x1dGlvblBh dGgsICRjbGVhbik7CiAgICAgICAgIH0KICAgICB9CiAgICAgIyBWYXJpb3VzIGJ1aWxkKiBjYWxs cyBhYm92ZSBtYXkgY2hhbmdlIHRoZSBDV0QuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lv biAxNTAwOTUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkK QEAgLTE2ODEsMTcgKzE2ODEsMjcgQEAgc3ViIGRpZUlmV2luZG93c1BsYXRmb3JtU0RLTm90SW5z dGFsbGVkCiB7CiAgICAgbXkgJHJlZ2lzdHJ5MzJQYXRoID0gIi9wcm9jL3JlZ2lzdHJ5LyI7CiAg ICAgbXkgJHJlZ2lzdHJ5NjRQYXRoID0gIi9wcm9jL3JlZ2lzdHJ5NjQvIjsKLSAgICBteSAkd2lu ZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlFbnRyeSA9ICJIS0VZX0xPQ0FMX01BQ0hJTkUvU09GVFdB UkUvTWljcm9zb2Z0L01pY3Jvc29mdFNESy9JbnN0YWxsZWRTREtzL0QyRkY5Rjg5LThBQTItNDM3 My04QTMxLUM4MzhCRjREQkJFMSI7CisgICAgbXkgQHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5 RW50cmllcyA9ICgKKyAgICAgICAgIkhLRVlfTE9DQUxfTUFDSElORS9TT0ZUV0FSRS9NaWNyb3Nv ZnQvTWljcm9zb2Z0IFNES3MvV2luZG93cy92OC4wQSIsCisgICAgICAgICJIS0VZX0xPQ0FMX01B Q0hJTkUvU09GVFdBUkUvTWljcm9zb2Z0L01pY3Jvc29mdCBTREtzL1dpbmRvd3MvdjguMCIsCisg ICAgICAgICJIS0VZX0xPQ0FMX01BQ0hJTkUvU09GVFdBUkUvTWljcm9zb2Z0L01pY3Jvc29mdCBT REtzL1dpbmRvd3MvdjcuMUEiLAorICAgICAgICAiSEtFWV9MT0NBTF9NQUNISU5FL1NPRlRXQVJF L01pY3Jvc29mdC9NaWNyb3NvZnQgU0RLcy9XaW5kb3dzL3Y3LjBBIiwKKyAgICAgICAgIkhLRVlf TE9DQUxfTUFDSElORS9TT0ZUV0FSRS9NaWNyb3NvZnQvTWljcm9zb2Z0U0RLL0luc3RhbGxlZFNE S3MvRDJGRjlGODktOEFBMi00MzczLThBMzEtQzgzOEJGNERCQkUxIiwKKyAgICApOwogCiAgICAg IyBGSVhNRTogSXQgd291bGQgYmUgYmV0dGVyIHRvIGRldGVjdCB3aGV0aGVyIHdlIGFyZSB1c2lu ZyAzMi0gb3IgNjQtYml0IFdpbmRvd3MKICAgICAjIGFuZCBvbmx5IGNoZWNrIHRoZSBhcHByb3By aWF0ZSBlbnRyeS4gQnV0IGZvciBub3cgd2UganVzdCBibGluZGx5IGNoZWNrIGJvdGguCi0gICAg cmV0dXJuIGlmICgtZSAkcmVnaXN0cnkzMlBhdGggLiAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0 cnlFbnRyeSkgfHwgKC1lICRyZWdpc3RyeTY0UGF0aCAuICR3aW5kb3dzUGxhdGZvcm1TREtSZWdp c3RyeUVudHJ5KTsKKyAgICBteSAkcmVjb21tZW5kZWRQbGF0Zm9ybVNESyA9ICR3aW5kb3dzUGxh dGZvcm1TREtSZWdpc3RyeUVudHJpZXNbMF07CisKKyAgICB3aGlsZSAoQHdpbmRvd3NQbGF0Zm9y bVNES1JlZ2lzdHJ5RW50cmllcykgeworICAgICAgICBteSAkd2luZG93c1BsYXRmb3JtU0RLUmVn aXN0cnlFbnRyeSA9IHNoaWZ0IEB3aW5kb3dzUGxhdGZvcm1TREtSZWdpc3RyeUVudHJpZXM7Cisg ICAgICAgIHJldHVybiBpZiAoLWUgJHJlZ2lzdHJ5MzJQYXRoIC4gJHdpbmRvd3NQbGF0Zm9ybVNE S1JlZ2lzdHJ5RW50cnkpIHx8ICgtZSAkcmVnaXN0cnk2NFBhdGggLiAkd2luZG93c1BsYXRmb3Jt U0RLUmVnaXN0cnlFbnRyeSk7CisgICAgfQogCiAgICAgcHJpbnQgIioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbiI7Ci0gICAgcHJp bnQgIkNhbm5vdCBmaW5kIHJlZ2lzdHJ5IGVudHJ5ICckd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0 cnlFbnRyeScuXG4iOwotICAgIHByaW50ICJQbGVhc2UgZG93bmxvYWQgYW5kIGluc3RhbGwgdGhl IE1pY3Jvc29mdCBXaW5kb3dzIFNlcnZlciAyMDAzIFIyXG4iOwotICAgIHByaW50ICJQbGF0Zm9y bSBTREsgZnJvbSA8aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL2Rvd25sb2Fkcy9kZXRhaWxzLmFz cHg/XG4iOwotICAgIHByaW50ICJmYW1pbHlpZD0wYmFmMmIzNS1jNjU2LTQ5NjktYWNlOC1lNGMw YzA3MTZhZGImZGlzcGxheWxhbmc9ZW4+LlxuXG4iOworICAgIHByaW50ICJDYW5ub3QgZmluZCBy ZWdpc3RyeSBlbnRyeSAnJHJlY29tbWVuZGVkUGxhdGZvcm1TREsnLlxuIjsKKyAgICBwcmludCAi UGxlYXNlIGRvd25sb2FkIGFuZCBpbnN0YWxsIHRoZSBNaWNyb3NvZnQgV2luZG93cyBTREtcbiI7 CisgICAgcHJpbnQgImZyb20gPGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9lbi11cy9kb3dubG9h ZC9kZXRhaWxzLmFzcHg/aWQ9ODI3OT4uXG5cbiI7CiAgICAgcHJpbnQgIlRoZW4gZm9sbG93IHN0 ZXAgMiBpbiB0aGUgV2luZG93cyBzZWN0aW9uIG9mIHRoZSBcIkluc3RhbGxpbmcgRGV2ZWxvcGVy XG4iOwogICAgIHByaW50ICJUb29sc1wiIGluc3RydWN0aW9ucyBhdCA8aHR0cDovL3d3dy53ZWJr aXQub3JnL2J1aWxkaW5nL3Rvb2xzLmh0bWw+LlxuIjsKICAgICBwcmludCAiKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuIjsK