74534 2011-12-14 13:15:21 -0800 Web Inspector: CodeGeneratorInspector.py convert script conditions to precompiler #ifs 2011-12-15 06:20:09 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 72861 0 peter.rybin webkit-unassigned apavlov bweinstein joepeck keishi loislo peter.rybin pfeldman pmuellr rik timothy yurys oldest_to_newest 521231 0 peter.rybin 2011-12-14 13:15:21 -0800 Currently generator generates different outputs depending on command-line parameters. Re-implement it so that output is always the same, but has precompiler #ifs. This is cleaner. 521532 1 119352 peter.rybin 2011-12-14 17:49:15 -0800 Created attachment 119352 Patch 521640 2 loislo 2011-12-14 21:38:15 -0800 please attach samples of the generated files. 521860 3 119352 loislo 2011-12-15 06:20:02 -0800 Comment on attachment 119352 Patch Clearing flags on attachment: 119352 Committed r102933: <http://trac.webkit.org/changeset/102933> 521861 4 loislo 2011-12-15 06:20:09 -0800 All reviewed patches have been landed. Closing bug. 119352 2011-12-14 17:49:15 -0800 2011-12-15 06:20:02 -0800 Patch bug-74534-20111215054913.patch text/plain 11224 peter.rybin U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyODE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBjMmMxM2Q1MTQ2ZTBk NTY3NGEwZmRkM2QxMzcxOTNlYTM4MDE0Yy4uNDQzYjcyZWI5NDFiOWNiZGZmODg3ZmY2YTY4M2Zk ZmZlZDU2OGJkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTEyLTE0ICBQZXRl ciBSeWJpbiAgPHBldGVyLnJ5YmluQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBDb2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5IGNvbnZlcnQgc2NyaXB0IGNvbmRpdGlvbnMgdG8g cHJlY29tcGlsZXIgI2lmcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzQ1MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBHZW5lcmF0b3IgaXMgcmV3cml0dGVuIHRvIGFkZCAjaWYncyB0byBvdXRwdXQuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weToKKyAgICAgICAg KERvbWFpbk5hbWVGaXhlcy5nZXRfZml4ZWRfZGF0YS5SZXMuZ2V0X2d1YXJkLkd1YXJkLmdlbmVy YXRlX29wZW4pOgorICAgICAgICAoRG9tYWluTmFtZUZpeGVzLmdldF9maXhlZF9kYXRhLlJlcy5n ZXRfZ3VhcmQuR3VhcmQpOgorICAgICAgICAoRG9tYWluTmFtZUZpeGVzLmdldF9maXhlZF9kYXRh LlJlcy5nZXRfZ3VhcmQuR3VhcmQuZ2VuZXJhdGVfY2xvc2UpOgorICAgICAgICAoRG9tYWluTmFt ZUZpeGVzLmdldF9maXhlZF9kYXRhLlJlcyk6CisgICAgICAgIChEb21haW5OYW1lRml4ZXMuZ2V0 X2ZpeGVkX2RhdGEuUmVzLmdldF9ndWFyZCk6CisgICAgICAgIChHZW5lcmF0b3IuZ28pOgorICAg ICAgICAoR2VuZXJhdG9yLnByb2Nlc3NfZXZlbnQpOgorICAgICAgICAoR2VuZXJhdG9yLnByb2Nl c3NfY29tbWFuZCk6CisgICAgICAgIChHZW5lcmF0b3IucHJvY2Vzc190eXBlcyk6CisKIDIwMTEt MTItMTQgIEpvbmF0aGFuIEJhY2tlciAgPGJhY2tlckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg W2Nocm9taXVtXSBQbHVtYiB0aHJvdWdoIGZsYWcgZm9yIGVuYWJsaW5nIHBhcnRpYWwgc3dhcApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0 b3IucHkgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5w eQppbmRleCBjMTk1Y2I2NzAxMWZmY2M0OTNiYjNiMjlkYzEyYTI5ZTQyMTkwMzNhLi42ZTI4NWRi YTI3Y2JlOTljZDA0NjU1ZTViNzMwYjA1ZjlhMGY5MDhkIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weQpAQCAtMzksMTIgKzM5LDEy IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKIAogCiBET01BSU5fREVGSU5FX05BTUVfTUFQID0gewot ICAgICJEYXRhYmFzZSI6ICJFTkFCTEVfU1FMX0RBVEFCQVNFIiwKLSAgICAiRGVidWdnZXIiOiAi RU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIiLAotICAgICJET01EZWJ1Z2dlciI6ICJFTkFCTEVf SkFWQVNDUklQVF9ERUJVR0dFUiIsCi0gICAgIkZpbGVTeXN0ZW0iOiAiRU5BQkxFX0ZJTEVfU1lT VEVNIiwKLSAgICAiUHJvZmlsZXIiOiAiRU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIiLAotICAg ICJXb3JrZXIiOiAiRU5BQkxFX1dPUktFUlMiLAorICAgICJEYXRhYmFzZSI6ICJTUUxfREFUQUJB U0UiLAorICAgICJEZWJ1Z2dlciI6ICJKQVZBU0NSSVBUX0RFQlVHR0VSIiwKKyAgICAiRE9NRGVi dWdnZXIiOiAiSkFWQVNDUklQVF9ERUJVR0dFUiIsCisgICAgIkZpbGVTeXN0ZW0iOiAiRklMRV9T WVNURU0iLAorICAgICJQcm9maWxlciI6ICJKQVZBU0NSSVBUX0RFQlVHR0VSIiwKKyAgICAiV29y a2VyIjogIldPUktFUlMiLAogfQogCiAKQEAgLTU1LDYgKzU1LDcgQEAgVFlQRV9OQU1FX0ZJWF9N QVAgPSB7CiAKIAogY21kbGluZV9wYXJzZXIgPSBvcHRwYXJzZS5PcHRpb25QYXJzZXIoKQorIyBG SVhNRTogZ2V0IHJpZCBvZiB0aGlzIG9wdGlvbiBvbmNlIHRoZSBzeXN0ZW0gaXMgc3RhYmxlLgog Y21kbGluZV9wYXJzZXIuYWRkX29wdGlvbigiLS1kZWZpbmVzIikKIGNtZGxpbmVfcGFyc2VyLmFk ZF9vcHRpb24oIi0tb3V0cHV0X2hfZGlyIikKIGNtZGxpbmVfcGFyc2VyLmFkZF9vcHRpb24oIi0t b3V0cHV0X2NwcF9kaXIiKQpAQCAtMTg4LDE5ICsxODksMjAgQEAgY2xhc3MgRG9tYWluTmFtZUZp eGVzOgogICAgICAgICAgICAgYWdlbnRfZmllbGRfbmFtZSA9IGZpZWxkX25hbWVfcmVzCiAKICAg ICAgICAgICAgIEBzdGF0aWNtZXRob2QKLSAgICAgICAgICAgIGRlZiBpc19kaXNhYmxlZChkZWZp bmVzKToKLSAgICAgICAgICAgICAgICBpZiBub3QgZG9tYWluX25hbWUgaW4gRE9NQUlOX0RFRklO RV9OQU1FX01BUDoKLSAgICAgICAgICAgICAgICAgICAgIyBIYXMgbm90IGNvcnJlc3BvbmRpbmcg cHJlcHJvY2Vzc29yIHN5bWJvbC4KLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisg ICAgICAgICAgICBkZWYgZ2V0X2d1YXJkKCk6CisgICAgICAgICAgICAgICAgaWYgZG9tYWluX25h bWUgaW4gRE9NQUlOX0RFRklORV9OQU1FX01BUDoKKyAgICAgICAgICAgICAgICAgICAgZGVmaW5l X25hbWUgPSBET01BSU5fREVGSU5FX05BTUVfTUFQW2RvbWFpbl9uYW1lXQogCi0gICAgICAgICAg ICAgICAgZGVmaW5lX25hbWUgPSBET01BSU5fREVGSU5FX05BTUVfTUFQW2RvbWFpbl9uYW1lXQor ICAgICAgICAgICAgICAgICAgICBjbGFzcyBHdWFyZDoKKyAgICAgICAgICAgICAgICAgICAgICAg IEBzdGF0aWNtZXRob2QKKyAgICAgICAgICAgICAgICAgICAgICAgIGRlZiBnZW5lcmF0ZV9vcGVu KG91dHB1dCk6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0cHV0LmFwcGVuZCgiI2lm IEVOQUJMRSglcylcbiIgJSBkZWZpbmVfbmFtZSkKIAotICAgICAgICAgICAgICAgIGlmIG5vdCBk ZWZpbmVfbmFtZSBpbiBkZWZpbmVzOgotICAgICAgICAgICAgICAgICAgICAjIERpc2FibGVkIHdo ZW4gbm90IG1lbnRpb25lZAotICAgICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQorICAgICAg ICAgICAgICAgICAgICAgICAgQHN0YXRpY21ldGhvZAorICAgICAgICAgICAgICAgICAgICAgICAg ZGVmIGdlbmVyYXRlX2Nsb3NlKG91dHB1dCk6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg b3V0cHV0LmFwcGVuZCgiI2VuZGlmIC8vIEVOQUJMRSglcylcbiIgJSBkZWZpbmVfbmFtZSkKIAot ICAgICAgICAgICAgICAgIGRlZmluZV92YWx1ZSA9IGRlZmluZXNbZGVmaW5lX25hbWVdCi0gICAg ICAgICAgICAgICAgcmV0dXJuIG5vdCBib29sKGRlZmluZV92YWx1ZSkKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIEd1YXJkCiAKICAgICAgICAgcmV0dXJuIFJlcwogCkBAIC0xMjkyLDkgKzEy OTQsNyBAQCAkbWV0aG9kcwogICAgIGJhY2tlbmRfanMgPSBzdHJpbmcuVGVtcGxhdGUoZmlsZV9o ZWFkZXJfICsKICIiIgogCi0kZGVsZWdhdGVzCi0kZXZlbnRBcmdzCi0kZG9tYWluRGlzcGF0Y2hl cnMKKyRkb21haW5Jbml0aWFsaXplcnMKICIiIikKIAogICAgIHBhcmFtX2NvbnRhaW5lcl9hY2Nl c3NfY29kZSA9ICIiIgpAQCAtMTMxNiw5ICsxMzE2LDcgQEAgY2xhc3MgR2VuZXJhdG9yOgogICAg IGJhY2tlbmRfbWV0aG9kX25hbWVfZGVjbGFyYXRpb25fbGlzdCA9IFtdCiAgICAgbWV0aG9kX2hh bmRsZXJfbGlzdCA9IFtdCiAgICAgZnJvbnRlbmRfbWV0aG9kX2xpc3QgPSBbXQotICAgIGJhY2tl bmRfanNfaW5pdGlhbGl6ZXJfbGlzdCA9IFtdCi0gICAgYmFja2VuZF9qc19ldmVudF9saXN0ID0g W10KLSAgICBiYWNrZW5kX2pzX2RvbWFpbl9kaXNwYXRjaGVyX2xpc3QgPSBbXQorICAgIGJhY2tl bmRfanNfZG9tYWluX2luaXRpYWxpemVyX2xpc3QgPSBbXQogCiAgICAgYmFja2VuZF9zZXR0ZXJz X2xpc3QgPSBbXQogICAgIGJhY2tlbmRfY29uc3RydWN0b3JfaW5pdF9saXN0ID0gW10KQEAgLTEz MzIsMTkgKzEzMzAsMzggQEAgY2xhc3MgR2VuZXJhdG9yOgogICAgIGRlZiBnbygpOgogICAgICAg ICBHZW5lcmF0b3IucHJvY2Vzc190eXBlcyh0eXBlX21hcCkKIAorICAgICAgICBmaXJzdF9jeWNs ZV9ndWFyZGFibGVfbGlzdF9saXN0ID0gWworICAgICAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRf bWV0aG9kX2RlY2xhcmF0aW9uX2xpc3QsCisgICAgICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9t ZXRob2RfaW1wbGVtZW50YXRpb25fbGlzdCwKKyAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5k X21ldGhvZF9uYW1lX2RlY2xhcmF0aW9uX2xpc3QsCisgICAgICAgICAgICBHZW5lcmF0b3IuZnJv bnRlbmRfY2xhc3NfZmllbGRfbGluZXMsCisgICAgICAgICAgICBHZW5lcmF0b3IuZnJvbnRlbmRf Y29uc3RydWN0b3JfaW5pdF9saXN0LAorICAgICAgICAgICAgR2VuZXJhdG9yLmZyb250ZW5kX2Rv bWFpbl9jbGFzc19saW5lcywKKyAgICAgICAgICAgIEdlbmVyYXRvci5mcm9udGVuZF9tZXRob2Rf bGlzdCwKKyAgICAgICAgICAgIEdlbmVyYXRvci5tZXRob2RfaGFuZGxlcl9saXN0LAorICAgICAg ICAgICAgR2VuZXJhdG9yLm1ldGhvZF9uYW1lX2VudW1fbGlzdF0KKwogICAgICAgICBmb3IganNv bl9kb21haW4gaW4ganNvbl9hcGlbImRvbWFpbnMiXToKICAgICAgICAgICAgIGRvbWFpbl9uYW1l ID0ganNvbl9kb21haW5bImRvbWFpbiJdCiAgICAgICAgICAgICBkb21haW5fbmFtZV9sb3dlciA9 IGRvbWFpbl9uYW1lLmxvd2VyKCkKIAotICAgICAgICAgICAgZG9tYWluX2RhdGEgPSBEb21haW5O YW1lRml4ZXMuZ2V0X2ZpeGVkX2RhdGEoZG9tYWluX25hbWUpCisgICAgICAgICAgICBkb21haW5f Zml4ZXMgPSBEb21haW5OYW1lRml4ZXMuZ2V0X2ZpeGVkX2RhdGEoZG9tYWluX25hbWUpCisKKyAg ICAgICAgICAgIGRvbWFpbl9ndWFyZCA9IGRvbWFpbl9maXhlcy5nZXRfZ3VhcmQoKQogCi0gICAg ICAgICAgICBpZiBkb21haW5fZGF0YS5pc19kaXNhYmxlZChkZWZpbmVzX21hcCk6Ci0gICAgICAg ICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgIGlmIGRvbWFpbl9ndWFyZDoKKyAgICAgICAg ICAgICAgICBmb3IgbCBpbiBmaXJzdF9jeWNsZV9ndWFyZGFibGVfbGlzdF9saXN0OgorICAgICAg ICAgICAgICAgICAgICBkb21haW5fZ3VhcmQuZ2VuZXJhdGVfb3BlbihsKQogCi0gICAgICAgICAg ICBhZ2VudF9maWVsZF9uYW1lID0gZG9tYWluX2RhdGEuYWdlbnRfZmllbGRfbmFtZQorICAgICAg ICAgICAgYWdlbnRfZmllbGRfbmFtZSA9IGRvbWFpbl9maXhlcy5hZ2VudF9maWVsZF9uYW1lCiAK ICAgICAgICAgICAgIGZyb250ZW5kX21ldGhvZF9kZWNsYXJhdGlvbl9saW5lcyA9IFtdCiAKKyAg ICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX2pzX2RvbWFpbl9pbml0aWFsaXplcl9saXN0LmFw cGVuZCgiLy8gJXMuXG4iICUgZG9tYWluX25hbWUpCisKKyAgICAgICAgICAgIGlmIG5vdCBkb21h aW5fZml4ZXMuc2tpcF9qc19iaW5kOgorICAgICAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5k X2pzX2RvbWFpbl9pbml0aWFsaXplcl9saXN0LmFwcGVuZCgiSW5zcGVjdG9yQmFja2VuZC5yZWdp c3RlciVzRGlzcGF0Y2hlciA9IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRj aGVyLmJpbmQoSW5zcGVjdG9yQmFja2VuZCwgXCIlc1wiKTtcbiIgJSAoZG9tYWluX25hbWUsIGRv bWFpbl9uYW1lKSkKKwogICAgICAgICAgICAgaWYgImV2ZW50cyIgaW4ganNvbl9kb21haW46CiAg ICAgICAgICAgICAgICAgZm9yIGpzb25fZXZlbnQgaW4ganNvbl9kb21haW5bImV2ZW50cyJdOgog ICAgICAgICAgICAgICAgICAgICBHZW5lcmF0b3IucHJvY2Vzc19ldmVudChqc29uX2V2ZW50LCBk b21haW5fbmFtZSwgZnJvbnRlbmRfbWV0aG9kX2RlY2xhcmF0aW9uX2xpbmVzKQpAQCAtMTM2MCwy NyArMTM3Nyw0MyBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgICAgICAgICAgICAgZm9yIGpzb25f Y29tbWFuZCBpbiBqc29uX2RvbWFpblsiY29tbWFuZHMiXToKICAgICAgICAgICAgICAgICAgICAg R2VuZXJhdG9yLnByb2Nlc3NfY29tbWFuZChqc29uX2NvbW1hbmQsIGRvbWFpbl9uYW1lLCBhZ2Vu dF9maWVsZF9uYW1lKQogCi0gICAgICAgICAgICBpZiBub3QgZG9tYWluX2RhdGEuc2tpcF9qc19i aW5kOgotICAgICAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX2pzX2RvbWFpbl9kaXNwYXRj aGVyX2xpc3QuYXBwZW5kKCJJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyJXNEaXNwYXRjaGVyID0g SW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JC YWNrZW5kLCBcIiVzXCIpO1xuIiAlIChkb21haW5fbmFtZSwgZG9tYWluX25hbWUpKQorICAgICAg ICAgICAgaWYgZG9tYWluX2d1YXJkOgorICAgICAgICAgICAgICAgIGZvciBsIGluIHJldmVyc2Vk KGZpcnN0X2N5Y2xlX2d1YXJkYWJsZV9saXN0X2xpc3QpOgorICAgICAgICAgICAgICAgICAgICBk b21haW5fZ3VhcmQuZ2VuZXJhdGVfY2xvc2UobCkKKyAgICAgICAgICAgIEdlbmVyYXRvci5iYWNr ZW5kX2pzX2RvbWFpbl9pbml0aWFsaXplcl9saXN0LmFwcGVuZCgiXG4iKQogCiAgICAgICAgIHNv cnRlZF9qc29uX2RvbWFpbnMgPSBsaXN0KGpzb25fYXBpWyJkb21haW5zIl0pCiAgICAgICAgIHNv cnRlZF9qc29uX2RvbWFpbnMuc29ydChrZXk9bGFtYmRhIG86IG9bImRvbWFpbiJdKQogCisgICAg ICAgIHNvcnRlZF9jeWNsZV9ndWFyZGFibGVfbGlzdF9saXN0ID0gWworICAgICAgICAgICAgR2Vu ZXJhdG9yLmJhY2tlbmRfY29uc3RydWN0b3JfaW5pdF9saXN0LAorICAgICAgICAgICAgR2VuZXJh dG9yLmJhY2tlbmRfc2V0dGVyc19saXN0LAorICAgICAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRf ZmllbGRfbGlzdCwKKyAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX2ZvcndhcmRfbGlzdCwK KyAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX2luY2x1ZGVfbGlzdF0KKwogICAgICAgICBm b3IganNvbl9kb21haW4gaW4gc29ydGVkX2pzb25fZG9tYWluczoKICAgICAgICAgICAgIGRvbWFp bl9uYW1lID0ganNvbl9kb21haW5bImRvbWFpbiJdCiAKLSAgICAgICAgICAgIGRvbWFpbl9kYXRh ID0gRG9tYWluTmFtZUZpeGVzLmdldF9maXhlZF9kYXRhKGRvbWFpbl9uYW1lKQotICAgICAgICAg ICAgaWYgZG9tYWluX2RhdGEuaXNfZGlzYWJsZWQoZGVmaW5lc19tYXApOgotICAgICAgICAgICAg ICAgIGNvbnRpbnVlCisgICAgICAgICAgICBkb21haW5fZml4ZXMgPSBEb21haW5OYW1lRml4ZXMu Z2V0X2ZpeGVkX2RhdGEoZG9tYWluX25hbWUpCisgICAgICAgICAgICBkb21haW5fZ3VhcmQgPSBk b21haW5fZml4ZXMuZ2V0X2d1YXJkKCkKKworICAgICAgICAgICAgaWYgZG9tYWluX2d1YXJkOgor ICAgICAgICAgICAgICAgIGZvciBsIGluIHNvcnRlZF9jeWNsZV9ndWFyZGFibGVfbGlzdF9saXN0 OgorICAgICAgICAgICAgICAgICAgICBkb21haW5fZ3VhcmQuZ2VuZXJhdGVfb3BlbihsKQogCi0g ICAgICAgICAgICBhZ2VudF90eXBlX25hbWUgPSBkb21haW5fZGF0YS5hZ2VudF90eXBlX25hbWUK LSAgICAgICAgICAgIGFnZW50X2ZpZWxkX25hbWUgPSBkb21haW5fZGF0YS5hZ2VudF9maWVsZF9u YW1lCisgICAgICAgICAgICBhZ2VudF90eXBlX25hbWUgPSBkb21haW5fZml4ZXMuYWdlbnRfdHlw ZV9uYW1lCisgICAgICAgICAgICBhZ2VudF9maWVsZF9uYW1lID0gZG9tYWluX2ZpeGVzLmFnZW50 X2ZpZWxkX25hbWUKICAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX2NvbnN0cnVjdG9yX2lu aXRfbGlzdC5hcHBlbmQoIiAgICAgICAgLCBtXyVzKDApIiAlIGFnZW50X2ZpZWxkX25hbWUpCiAg ICAgICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9zZXR0ZXJzX2xpc3QuYXBwZW5kKCIgICAgdm9p ZCByZWdpc3RlckFnZW50KCVzKiAlcykgeyBBU1NFUlQoIW1fJXMpOyBtXyVzID0gJXM7IH0iICUg KGFnZW50X3R5cGVfbmFtZSwgYWdlbnRfZmllbGRfbmFtZSwgYWdlbnRfZmllbGRfbmFtZSwgYWdl bnRfZmllbGRfbmFtZSwgYWdlbnRfZmllbGRfbmFtZSkpCiAgICAgICAgICAgICBHZW5lcmF0b3Iu YmFja2VuZF9maWVsZF9saXN0LmFwcGVuZCgiICAgICVzKiBtXyVzOyIgJSAoYWdlbnRfdHlwZV9u YW1lLCBhZ2VudF9maWVsZF9uYW1lKSkKICAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX2Zv cndhcmRfbGlzdC5hcHBlbmQoImNsYXNzICVzOyIgJSBhZ2VudF90eXBlX25hbWUpCiAgICAgICAg ICAgICBHZW5lcmF0b3IuYmFja2VuZF9pbmNsdWRlX2xpc3QuYXBwZW5kKCIjaW5jbHVkZSBcIiVz LmhcIiIgJSBhZ2VudF90eXBlX25hbWUpCiAKKyAgICAgICAgICAgIGlmIGRvbWFpbl9ndWFyZDoK KyAgICAgICAgICAgICAgICBmb3IgbCBpbiByZXZlcnNlZChzb3J0ZWRfY3ljbGVfZ3VhcmRhYmxl X2xpc3RfbGlzdCk6CisgICAgICAgICAgICAgICAgICAgIGRvbWFpbl9ndWFyZC5nZW5lcmF0ZV9j bG9zZShsKQorCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBwcm9jZXNzX2V2ZW50KGpzb25f ZXZlbnQsIGRvbWFpbl9uYW1lLCBmcm9udGVuZF9tZXRob2RfZGVjbGFyYXRpb25fbGluZXMpOgog ICAgICAgICBldmVudF9uYW1lID0ganNvbl9ldmVudFsibmFtZSJdCkBAIC0xNDIyLDcgKzE0NTUs NyBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgICAgICAgICBwYXJhbWV0ZXJzPWpvaW4ocGFyYW1l dGVyX2xpc3QsICIsICIpLAogICAgICAgICAgICAgY29kZT1qb2luKG1ldGhvZF9saW5lX2xpc3Qs ICIiKSkpCiAKLSAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfanNfZXZlbnRfbGlzdC5hcHBlbmQo Ikluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudChcIiVzLiVzXCIsIFslc10pO1xuIiAlICgK KyAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfanNfZG9tYWluX2luaXRpYWxpemVyX2xpc3QuYXBw ZW5kKCJJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoXCIlcy4lc1wiLCBbJXNdKTtcbiIg JSAoCiAgICAgICAgICAgICBkb21haW5fbmFtZSwgZXZlbnRfbmFtZSwgam9pbihiYWNrZW5kX2pz X2V2ZW50X3BhcmFtX2xpc3QsICIsICIpKSkKIAogICAgIEBzdGF0aWNtZXRob2QKQEAgLTE1MTMs NyArMTU0Niw3IEBAIGNsYXNzIEdlbmVyYXRvcjoKICAgICAgICAgICAgIHJlc3BvbnNlQ29vaz1y ZXNwb25zZV9jb29rX3RleHQpKQogICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9tZXRob2RfbmFt ZV9kZWNsYXJhdGlvbl9saXN0LmFwcGVuZCgiICAgIFwiJXMuJXNcIiwiICUgKGRvbWFpbl9uYW1l LCBqc29uX2NvbW1hbmRfbmFtZSkpCiAKLSAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfanNfaW5p dGlhbGl6ZXJfbGlzdC5hcHBlbmQoIkluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb21tYW5kKFwi JXMuJXNcIiwgWyVzXSwgJXMpO1xuIiAlIChkb21haW5fbmFtZSwganNvbl9jb21tYW5kX25hbWUs IGpzX3BhcmFtZXRlcnNfdGV4dCwganNfcmVwbHlfbGlzdCkpCisgICAgICAgIEdlbmVyYXRvci5i YWNrZW5kX2pzX2RvbWFpbl9pbml0aWFsaXplcl9saXN0LmFwcGVuZCgiSW5zcGVjdG9yQmFja2Vu ZC5yZWdpc3RlckNvbW1hbmQoXCIlcy4lc1wiLCBbJXNdLCAlcyk7XG4iICUgKGRvbWFpbl9uYW1l LCBqc29uX2NvbW1hbmRfbmFtZSwganNfcGFyYW1ldGVyc190ZXh0LCBqc19yZXBseV9saXN0KSkK IAogICAgIEBzdGF0aWNtZXRob2QKICAgICBkZWYgcHJvY2Vzc190eXBlcyh0eXBlX21hcCk6CkBA IC0xNTIzLDYgKzE1NTYsMTMgQEAgY2xhc3MgR2VuZXJhdG9yOgogICAgICAgICAgICAgcGFzcwog CiAgICAgICAgIGZvciBkb21haW5fZGF0YSBpbiB0eXBlX21hcC5kb21haW5zKCk6CisKKyAgICAg ICAgICAgIGRvbWFpbl9maXhlcyA9IERvbWFpbk5hbWVGaXhlcy5nZXRfZml4ZWRfZGF0YShkb21h aW5fZGF0YS5uYW1lKCkpCisgICAgICAgICAgICBkb21haW5fZ3VhcmQgPSBkb21haW5fZml4ZXMu Z2V0X2d1YXJkKCkKKworICAgICAgICAgICAgaWYgZG9tYWluX2d1YXJkOgorICAgICAgICAgICAg ICAgIGRvbWFpbl9ndWFyZC5nZW5lcmF0ZV9vcGVuKG91dHB1dCkKKwogICAgICAgICAgICAgb3V0 cHV0LmFwcGVuZCgibmFtZXNwYWNlICIpCiAgICAgICAgICAgICBvdXRwdXQuYXBwZW5kKGRvbWFp bl9kYXRhLm5hbWUoKSkKICAgICAgICAgICAgIG91dHB1dC5hcHBlbmQoIiB7XG4iKQpAQCAtMTUz Myw2ICsxNTczLDkgQEAgY2xhc3MgR2VuZXJhdG9yOgogICAgICAgICAgICAgb3V0cHV0LmFwcGVu ZChkb21haW5fZGF0YS5uYW1lKCkpCiAgICAgICAgICAgICBvdXRwdXQuYXBwZW5kKCJcblxuIikK IAorICAgICAgICAgICAgaWYgZG9tYWluX2d1YXJkOgorICAgICAgICAgICAgICAgIGRvbWFpbl9n dWFyZC5nZW5lcmF0ZV9jbG9zZShvdXRwdXQpCisKIEdlbmVyYXRvci5nbygpCiAKIGJhY2tlbmRf aF9maWxlID0gb3BlbihvdXRwdXRfaGVhZGVyX2Rpcm5hbWUgKyAiL0luc3BlY3RvckJhY2tlbmRE aXNwYXRjaGVyLmgiLCAidyIpCkBAIC0xNTY4LDkgKzE2MTEsNyBAQCBiYWNrZW5kX2NwcF9maWxl LndyaXRlKFRlbXBsYXRlcy5iYWNrZW5kX2NwcC5zdWJzdGl0dXRlKE5vbmUsCiAgICAgbWVzc2Fn ZUhhbmRsZXJzPWpvaW4oR2VuZXJhdG9yLm1ldGhvZF9oYW5kbGVyX2xpc3QsICJcbiIpKSkKIAog YmFja2VuZF9qc19maWxlLndyaXRlKFRlbXBsYXRlcy5iYWNrZW5kX2pzLnN1YnN0aXR1dGUoTm9u ZSwKLSAgICBkZWxlZ2F0ZXM9am9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19pbml0aWFsaXplcl9s aXN0LCAiIiksCi0gICAgZXZlbnRBcmdzPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfanNfZXZlbnRf bGlzdCwgIiIpLAotICAgIGRvbWFpbkRpc3BhdGNoZXJzPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRf anNfZG9tYWluX2Rpc3BhdGNoZXJfbGlzdCwgIiIpKSkKKyAgICBkb21haW5Jbml0aWFsaXplcnM9 am9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19kb21haW5faW5pdGlhbGl6ZXJfbGlzdCwgIiIpKSkK IAogYmFja2VuZF9oX2ZpbGUuY2xvc2UoKQogYmFja2VuZF9jcHBfZmlsZS5jbG9zZSgpCg==