197116 2019-04-19 14:11:25 -0700 Add Xcode version check for Header post-processing scripts 2019-04-23 17:52:48 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin achristensen ap bfulgham commit-queue ews-watchlist keith_miller lforschler mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1528864 0 krollin 2019-04-19 14:11:25 -0700 There are several places in our Xcode projects that post-process header files after they've been exported. Because of XCBuild, we're moving to a model where the post-processing is performed at the same time the header files are exported, rather than as a distinct post-processing step. This patch disables the distinct step when the inline processing is available. In practice, this means prefixing appropriate post-processing Custom Build phases with: if [ "${XCODE_VERSION_MAJOR}" -ge "1100" -a "${APPLY_RULES_IN_COPY_HEADERS}" = "YES" ]; then # In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step. exit 0 fi 1528865 1 webkit-bug-importer 2019-04-19 14:12:08 -0700 <rdar://problem/50058968> 1529803 2 368078 krollin 2019-04-23 16:18:03 -0700 Created attachment 368078 Patch 1529809 3 368078 bfulgham 2019-04-23 16:35:41 -0700 Comment on attachment 368078 Patch Looks reasonable. r=me (if EWS is happy) 1529827 4 368078 commit-queue 2019-04-23 17:16:47 -0700 Comment on attachment 368078 Patch Rejecting attachment 368078 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 368078, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=368078&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=197116&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Failed to run "['Tools/Scripts/update-webkit']" exit_code: 1 Updating OpenSource From https://git.webkit.org/git/WebKit 165bf4efab5..908452fed98 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 244570 = 165bf4efab5cfcf64ee0183401b1003be50e82f5 r244571 = fd4abbc1ad1f0f8c99119c1d366e7c04bf46d69b r244572 = 908452fed98f80ee058f1b2535fc24e5a6efa3da Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc Can't create session: Unable to connect to a repository at URL 'http://svn.webkit.org/repository/webkit': Error running context: The server unexpectedly closed the connection. at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN.pm line 717. Died at /Volumes/Data/EWS/WebKit/Tools/Scripts/webkitdirs.pm line 2920. Failed to run "['Tools/Scripts/update-webkit']" exit_code: 1 Updating OpenSource From https://git.webkit.org/git/WebKit 165bf4efab5..908452fed98 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 244570 = 165bf4efab5cfcf64ee0183401b1003be50e82f5 r244571 = fd4abbc1ad1f0f8c99119c1d366e7c04bf46d69b r244572 = 908452fed98f80ee058f1b2535fc24e5a6efa3da Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc Can't create session: Unable to connect to a repository at URL 'http://svn.webkit.org/repository/webkit': Error running context: The server unexpectedly closed the connection. at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN.pm line 717. Died at /Volumes/Data/EWS/WebKit/Tools/Scripts/webkitdirs.pm line 2920. Failed to run "['Tools/Scripts/update-webkit']" exit_code: 1 Updating OpenSource From https://git.webkit.org/git/WebKit 165bf4efab5..908452fed98 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 244570 = 165bf4efab5cfcf64ee0183401b1003be50e82f5 r244571 = fd4abbc1ad1f0f8c99119c1d366e7c04bf46d69b r244572 = 908452fed98f80ee058f1b2535fc24e5a6efa3da Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc Can't create session: Unable to connect to a repository at URL 'http://svn.webkit.org/repository/webkit': Error running context: The server unexpectedly closed the connection. at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN.pm line 717. Died at /Volumes/Data/EWS/WebKit/Tools/Scripts/webkitdirs.pm line 2920. Full output: https://webkit-queues.webkit.org/results/11976963 1529841 5 krollin 2019-04-23 17:28:19 -0700 I refuse to accept that error as mine. 1529854 6 368078 commit-queue 2019-04-23 17:52:47 -0700 Comment on attachment 368078 Patch Clearing flags on attachment: 368078 Committed r244575: <https://trac.webkit.org/changeset/244575> 1529855 7 commit-queue 2019-04-23 17:52:48 -0700 All reviewed patches have been landed. Closing bug. 368078 2019-04-23 16:18:03 -0700 2019-04-23 17:52:47 -0700 Patch bug-197116-20190423161803.patch text/plain 12295 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy NmI4NTM0MzJhMjYyNjJiNGRhMGQ3ZmZiNjQwM2M5ZDI1YzE5ODU1Li4yZDdhMjY4NGEyZTViNzhh NGFiZTBkNWM1MTE1ZWM0MDI1YWVmYzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxOS0wNC0xOSAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+ CisKKyAgICAgICAgQWRkIFhjb2RlIHZlcnNpb24gY2hlY2sgZm9yIEhlYWRlciBwb3N0LXByb2Nl c3Npbmcgc2NyaXB0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk3MTE2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDA1ODk2OD4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBhcmUgc2V2ZXJh bCBwbGFjZXMgaW4gb3VyIFhjb2RlIHByb2plY3RzIHRoYXQgcG9zdC1wcm9jZXNzCisgICAgICAg IGhlYWRlciBmaWxlcyBhZnRlciB0aGV5J3ZlIGJlZW4gZXhwb3J0ZWQuIEJlY2F1c2Ugb2YgWENC dWlsZCwgd2UncmUKKyAgICAgICAgbW92aW5nIHRvIGEgbW9kZWwgd2hlcmUgdGhlIHBvc3QtcHJv Y2Vzc2luZyBpcyBwZXJmb3JtZWQgYXQgdGhlIHNhbWUKKyAgICAgICAgdGltZSB0aGUgaGVhZGVy IGZpbGVzIGFyZSBleHBvcnRlZCwgcmF0aGVyIHRoYW4gYXMgYSBkaXN0aW5jdAorICAgICAgICBw b3N0LXByb2Nlc3Npbmcgc3RlcC4gVGhpcyBwYXRjaCBkaXNhYmxlcyB0aGUgZGlzdGluY3Qgc3Rl cCB3aGVuIHRoZQorICAgICAgICBpbmxpbmUgcHJvY2Vzc2luZyBpcyBhdmFpbGFibGUuCisKKyAg ICAgICAgSW4gcHJhY3RpY2UsIHRoaXMgbWVhbnMgcHJlZml4aW5nIGFwcHJvcHJpYXRlIHBvc3Qt cHJvY2Vzc2luZyBDdXN0b20KKyAgICAgICAgQnVpbGQgcGhhc2VzIHdpdGg6CisKKyAgICAgICAg aWYgWyAiJHtYQ09ERV9WRVJTSU9OX01BSk9SfSIgLWdlICIxMTAwIiAtYSAiJHtVU0VfTkVXX0JV SUxEX1NZU1RFTX0iID0gIllFUyIgXTsgdGhlbgorICAgICAgICAgICAgIyBJbiB0aGlzIGNvbmZp Z3VyYXRpb24sIHBvc3QtcHJvY2Vzc2luZyBpcyBwZXJmb3JtZWQgYXQgdGhlIHNhbWUgdGltZSBh cyBjb3B5aW5nIGluIHRoZSBwb3N0cHJvY2Vzcy1oZWFkZXItcnVsZSBzY3JpcHQsIHNvIHRoZXJl J3Mgbm8gbmVlZCBmb3IgdGhpcyBzZXBhcmF0ZSBzdGVwLgorICAgICAgICAgICAgZXhpdCAwCisg ICAgICAgIGZpCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qOgorCiAyMDE5LTA0LTIyICBCYXN1a2UgU3V6dWtpICA8YmFzdWtlLnN1enVraUBzb255 LmNvbT4KIAogICAgICAgICBbUGxheVN0YXRpb25dIFJlc3RydWN0dXJpbmcgUmVtb3RlIEluc3Bl Y3RvciBjbGFzc2VzIHRvIHN1cHBvcnQgbXVsdGlwbGUgcGxhdGZvcm0uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI5 NWI5MzA1MGI4YjI0YTQwMTFlMWNlMWZiMDg0YTNmYjdjODE2MzguLmM3NmNhOTI5MjMwYTE3ZGYy N2Q3MDI4NTZhY2FkMjFkYWE1ZTM2Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTkt MDQtMTkgIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBY Y29kZSB2ZXJzaW9uIGNoZWNrIGZvciBIZWFkZXIgcG9zdC1wcm9jZXNzaW5nIHNjcmlwdHMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzExNgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTAwNTg5Njg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHNldmVyYWwgcGxhY2VzIGluIG91ciBY Y29kZSBwcm9qZWN0cyB0aGF0IHBvc3QtcHJvY2VzcworICAgICAgICBoZWFkZXIgZmlsZXMgYWZ0 ZXIgdGhleSd2ZSBiZWVuIGV4cG9ydGVkLiBCZWNhdXNlIG9mIFhDQnVpbGQsIHdlJ3JlCisgICAg ICAgIG1vdmluZyB0byBhIG1vZGVsIHdoZXJlIHRoZSBwb3N0LXByb2Nlc3NpbmcgaXMgcGVyZm9y bWVkIGF0IHRoZSBzYW1lCisgICAgICAgIHRpbWUgdGhlIGhlYWRlciBmaWxlcyBhcmUgZXhwb3J0 ZWQsIHJhdGhlciB0aGFuIGFzIGEgZGlzdGluY3QKKyAgICAgICAgcG9zdC1wcm9jZXNzaW5nIHN0 ZXAuIFRoaXMgcGF0Y2ggZGlzYWJsZXMgdGhlIGRpc3RpbmN0IHN0ZXAgd2hlbiB0aGUKKyAgICAg ICAgaW5saW5lIHByb2Nlc3NpbmcgaXMgYXZhaWxhYmxlLgorCisgICAgICAgIEluIHByYWN0aWNl LCB0aGlzIG1lYW5zIHByZWZpeGluZyBhcHByb3ByaWF0ZSBwb3N0LXByb2Nlc3NpbmcgQ3VzdG9t CisgICAgICAgIEJ1aWxkIHBoYXNlcyB3aXRoOgorCisgICAgICAgIGlmIFsgIiR7WENPREVfVkVS U0lPTl9NQUpPUn0iIC1nZSAiMTEwMCIgLWEgIiR7VVNFX05FV19CVUlMRF9TWVNURU19IiA9ICJZ RVMiIF07IHRoZW4KKyAgICAgICAgICAgICMgSW4gdGhpcyBjb25maWd1cmF0aW9uLCBwb3N0LXBy b2Nlc3NpbmcgaXMgcGVyZm9ybWVkIGF0IHRoZSBzYW1lIHRpbWUgYXMgY29weWluZyBpbiB0aGUg cG9zdHByb2Nlc3MtaGVhZGVyLXJ1bGUgc2NyaXB0LCBzbyB0aGVyZSdzIG5vIG5lZWQgZm9yIHRo aXMgc2VwYXJhdGUgc3RlcC4KKyAgICAgICAgICAgIGV4aXQgMAorICAgICAgICBmaQorCisgICAg ICAgICogV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTktMDQtMjIgIEx1 ZG92aWNvIGRlIE5pdHRpcyAgPGx1ZG92aWNvLmRlbml0dGlzQGNvbGxhYm9yYS5jb20+CiAKICAg ICAgICAgW0dUS10gZml4IGd0a19zdHlsZV9jb250ZXh0X3NldF9iYWNrZ3JvdW5kIGRlcHJlY2F0 aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXRMZWdhY3kvQ2hhbmdlTG9nCmluZGV4IGU0MjgyZDQxYzVjMzEzODljZTkxYWM4NjA0OGNl YzExYmQyMGU2OWIuLjVkZGExMTk0NGU1ZGU5ODU5NzE3M2M3NTMzNmMxY2M5ZWNiZmIwNjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXRMZWdhY3kvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDQtMTkgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBYY29kZSB2ZXJzaW9uIGNo ZWNrIGZvciBIZWFkZXIgcG9zdC1wcm9jZXNzaW5nIHNjcmlwdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzExNgorICAgICAgICA8cmRhcjovL3By b2JsZW0vNTAwNTg5Njg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlcmUgYXJlIHNldmVyYWwgcGxhY2VzIGluIG91ciBYY29kZSBwcm9qZWN0cyB0 aGF0IHBvc3QtcHJvY2VzcworICAgICAgICBoZWFkZXIgZmlsZXMgYWZ0ZXIgdGhleSd2ZSBiZWVu IGV4cG9ydGVkLiBCZWNhdXNlIG9mIFhDQnVpbGQsIHdlJ3JlCisgICAgICAgIG1vdmluZyB0byBh IG1vZGVsIHdoZXJlIHRoZSBwb3N0LXByb2Nlc3NpbmcgaXMgcGVyZm9ybWVkIGF0IHRoZSBzYW1l CisgICAgICAgIHRpbWUgdGhlIGhlYWRlciBmaWxlcyBhcmUgZXhwb3J0ZWQsIHJhdGhlciB0aGFu IGFzIGEgZGlzdGluY3QKKyAgICAgICAgcG9zdC1wcm9jZXNzaW5nIHN0ZXAuIFRoaXMgcGF0Y2gg ZGlzYWJsZXMgdGhlIGRpc3RpbmN0IHN0ZXAgd2hlbiB0aGUKKyAgICAgICAgaW5saW5lIHByb2Nl c3NpbmcgaXMgYXZhaWxhYmxlLgorCisgICAgICAgIEluIHByYWN0aWNlLCB0aGlzIG1lYW5zIHBy ZWZpeGluZyBhcHByb3ByaWF0ZSBwb3N0LXByb2Nlc3NpbmcgQ3VzdG9tCisgICAgICAgIEJ1aWxk IHBoYXNlcyB3aXRoOgorCisgICAgICAgIGlmIFsgIiR7WENPREVfVkVSU0lPTl9NQUpPUn0iIC1n ZSAiMTEwMCIgLWEgIiR7VVNFX05FV19CVUlMRF9TWVNURU19IiA9ICJZRVMiIF07IHRoZW4KKyAg ICAgICAgICAgICMgSW4gdGhpcyBjb25maWd1cmF0aW9uLCBwb3N0LXByb2Nlc3NpbmcgaXMgcGVy Zm9ybWVkIGF0IHRoZSBzYW1lIHRpbWUgYXMgY29weWluZyBpbiB0aGUgcG9zdHByb2Nlc3MtaGVh ZGVyLXJ1bGUgc2NyaXB0LCBzbyB0aGVyZSdzIG5vIG5lZWQgZm9yIHRoaXMgc2VwYXJhdGUgc3Rl cC4KKyAgICAgICAgICAgIGV4aXQgMAorICAgICAgICBmaQorCisgICAgICAgICogV2ViS2l0TGVn YWN5Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTktMDQtMjAgIERvbiBPbG1zdGVh ZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBbQ01ha2VdW1dpbl0gVXNlIHRh cmdldCBvcmllbnRlZCBkZXNpZ24gZm9yIFdlYktpdExlZ2FjeQpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2og Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagppbmRleCBlMGVmMzAxN2MwODI0OTMxMDljNzgxM2RlZDIzZGNhNjllZDlkMGYyLi5m YTg2Y2NhYTY2NTc0ODBmMTU3MGQyZjZhNDU2ZTgwM2RlOTEzNzMwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvagpAQCAtMTA0MDMsNyArMTA0MDMsNyBAQAogCQkJKTsKIAkJCXJ1bk9ubHlG b3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQkJc2hlbGxQYXRoID0gL2Jpbi9zaDsK LQkJCXNoZWxsU2NyaXB0ID0gImV4ZWMgJHtTUkNST09UfS9wb3N0cHJvY2Vzcy1oZWFkZXJzLnNo XG4iOworCQkJc2hlbGxTY3JpcHQgPSAiaWYgWyBcIiR7WENPREVfVkVSU0lPTl9NQUpPUn1cIiAt Z2UgXCIxMTAwXCIgLWEgXCIke1VTRV9ORVdfQlVJTERfU1lTVEVNfVwiID0gXCJZRVNcIiBdOyB0 aGVuXG4gICAgIyBJbiB0aGlzIGNvbmZpZ3VyYXRpb24sIHBvc3QtcHJvY2Vzc2luZyBpcyBwZXJm b3JtZWQgYXQgdGhlIHNhbWUgdGltZSBhcyBjb3B5aW5nIGluIHRoZSBwb3N0cHJvY2Vzcy1oZWFk ZXItcnVsZSBzY3JpcHQsIHNvIHRoZXJlJ3Mgbm8gbmVlZCBmb3IgdGhpcyBzZXBhcmF0ZSBzdGVw LlxuICAgIGV4aXQgMFxuZmlcblxuZXhlYyAke1NSQ1JPT1R9L3Bvc3Rwcm9jZXNzLWhlYWRlcnMu c2hcbiI7CiAJCX07CiAJCTM3NEY5NUM5MjA1Rjk5NzUwMDJCRjY4RiAvKiBNYWtlIGxpYldURi5h IFN5bWJvbGljIExpbmsgKi8gPSB7CiAJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRl eCBkNGM3YjU0NjdlYWZlYWNmODUxZjRlZDlmMWVkZGNiMTg4MTdkYTNkLi4wMThkYmM0M2U0NDFh MTVkYjg5NjNmZmNjMjExYmUzMjMyZTY2NDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0 Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTEwNDU2LDcgKzEwNDU2LDcgQEAKIAkJCSk7 CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJCXNoZWxsUGF0 aCA9IC9iaW4vc2g7Ci0JCQlzaGVsbFNjcmlwdCA9ICJpZiBbIFwiJHtBQ1RJT059XCIgPSBcImJ1 aWxkXCIgLW8gXCIke0FDVElPTn1cIiA9IFwiaW5zdGFsbFwiIC1vIFwiJHtBQ1RJT059XCIgPSBc Imluc3RhbGxoZHJzXCIgLW8gXCIke0FDVElPTn1cIiA9IFwiaW5zdGFsbGFwaVwiIF07IHRoZW5c biAgICBleGVjICR7U1JDUk9PVH0vbWFjL3Bvc3Rwcm9jZXNzLWZyYW1ld29yay1oZWFkZXJzLnNo XG5maVxuIjsKKwkJCXNoZWxsU2NyaXB0ID0gImlmIFsgXCIke1hDT0RFX1ZFUlNJT05fTUFKT1J9 XCIgLWdlIFwiMTEwMFwiIC1hIFwiJHtVU0VfTkVXX0JVSUxEX1NZU1RFTX1cIiA9IFwiWUVTXCIg XTsgdGhlblxuICAgICMgSW4gdGhpcyBjb25maWd1cmF0aW9uLCBwb3N0LXByb2Nlc3NpbmcgaXMg cGVyZm9ybWVkIGF0IHRoZSBzYW1lIHRpbWUgYXMgY29weWluZyBpbiB0aGUgcG9zdHByb2Nlc3Mt aGVhZGVyLXJ1bGUgc2NyaXB0LCBzbyB0aGVyZSdzIG5vIG5lZWQgZm9yIHRoaXMgc2VwYXJhdGUg c3RlcC5cbiAgICBleGl0IDBcbmZpXG5cbmlmIFsgXCIke0FDVElPTn1cIiA9IFwiYnVpbGRcIiAt byBcIiR7QUNUSU9OfVwiID0gXCJpbnN0YWxsXCIgLW8gXCIke0FDVElPTn1cIiA9IFwiaW5zdGFs bGhkcnNcIiAtbyBcIiR7QUNUSU9OfVwiID0gXCJpbnN0YWxsYXBpXCIgXTsgdGhlblxuICAgIGV4 ZWMgJHtTUkNST09UfS9tYWMvcG9zdHByb2Nlc3MtZnJhbWV3b3JrLWhlYWRlcnMuc2hcbmZpXG4i OwogCQl9OwogCQkxQTIxODAxNjFCNTQ1NDYyMDA0NkFFQzQgLyogQWRkIFN5bWxpbmsgaW4gL1N5 c3RlbS9MaWJyYXJ5L1ByaXZhdGVGcmFtZXdvcmtzICovID0gewogCQkJaXNhID0gUEJYU2hlbGxT Y3JpcHRCdWlsZFBoYXNlOwpAQCAtMTA0OTksNyArMTA0OTksNyBAQAogCQkJKTsKIAkJCXJ1bk9u bHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQkJc2hlbGxQYXRoID0gL2Jpbi9z aDsKLQkJCXNoZWxsU2NyaXB0ID0gIldLRk9VTkRBVElPTl9IPSR7VEFSR0VUX0JVSUxEX0RJUn0v JHtQVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSH0vV0tGb3VuZGF0aW9uLmhcblxuaWYgW1sgXCIk e1dLX0ZSQU1FV09SS19IRUFERVJfUE9TVFBST0NFU1NJTkdfRElTQUJMRUR9XCIgPT0gXCJZRVNc IiBdXTsgdGhlblxuICAgIFVOSUZERUZfT1BUSU9OUz1cIi1VV0tfRlJBTUVXT1JLX0hFQURFUl9Q T1NUUFJPQ0VTU0lOR19FTkFCTEVEXCI7XG5lbHNlXG4gICAgVU5JRkRFRl9PUFRJT05TPVwiLURX S19GUkFNRVdPUktfSEVBREVSX1BPU1RQUk9DRVNTSU5HX0VOQUJMRURcIjtcbmZpXG5cbnVuaWZk ZWYgLUIgJHtVTklGREVGX09QVElPTlN9IC1vIFwiJHtXS0ZPVU5EQVRJT05fSH1cIi51bmlmZGVm IFwiJHtXS0ZPVU5EQVRJT05fSH1cIlxuXG5jYXNlICQ/IGluXG4wKVxuICAgIHJtIFwiJHtXS0ZP VU5EQVRJT05fSH1cIi51bmlmZGVmXG4gICAgOztcbjEpXG4gICAgbXYgXCIke1dLRk9VTkRBVElP Tl9IfVwiey51bmlmZGVmLH1cbiAgICA7O1xuKilcbiAgICBleGl0IDFcbmVzYWNcbiI7CisJCQlz aGVsbFNjcmlwdCA9ICJpZiBbIFwiJHtYQ09ERV9WRVJTSU9OX01BSk9SfVwiIC1nZSBcIjExMDBc IiAtYSBcIiR7VVNFX05FV19CVUlMRF9TWVNURU19XCIgPSBcIllFU1wiIF07IHRoZW5cbiAgICAj IEluIHRoaXMgY29uZmlndXJhdGlvbiwgcG9zdC1wcm9jZXNzaW5nIGlzIHBlcmZvcm1lZCBhdCB0 aGUgc2FtZSB0aW1lIGFzIGNvcHlpbmcgaW4gdGhlIHBvc3Rwcm9jZXNzLWhlYWRlci1ydWxlIHNj cmlwdCwgc28gdGhlcmUncyBubyBuZWVkIGZvciB0aGlzIHNlcGFyYXRlIHN0ZXAuXG4gICAgZXhp dCAwXG5maVxuXG5XS0ZPVU5EQVRJT05fSD0ke1RBUkdFVF9CVUlMRF9ESVJ9LyR7UFVCTElDX0hF QURFUlNfRk9MREVSX1BBVEh9L1dLRm91bmRhdGlvbi5oXG5cbmlmIFtbIFwiJHtXS19GUkFNRVdP UktfSEVBREVSX1BPU1RQUk9DRVNTSU5HX0RJU0FCTEVEfVwiID09IFwiWUVTXCIgXV07IHRoZW5c biAgICBVTklGREVGX09QVElPTlM9XCItVVdLX0ZSQU1FV09SS19IRUFERVJfUE9TVFBST0NFU1NJ TkdfRU5BQkxFRFwiO1xuZWxzZVxuICAgIFVOSUZERUZfT1BUSU9OUz1cIi1EV0tfRlJBTUVXT1JL X0hFQURFUl9QT1NUUFJPQ0VTU0lOR19FTkFCTEVEXCI7XG5maVxuXG51bmlmZGVmIC1CICR7VU5J RkRFRl9PUFRJT05TfSAtbyBcIiR7V0tGT1VOREFUSU9OX0h9XCIudW5pZmRlZiBcIiR7V0tGT1VO REFUSU9OX0h9XCJcblxuY2FzZSAkPyBpblxuMClcbiAgICBybSBcIiR7V0tGT1VOREFUSU9OX0h9 XCIudW5pZmRlZlxuICAgIDs7XG4xKVxuICAgIG12IFwiJHtXS0ZPVU5EQVRJT05fSH1cInsudW5p ZmRlZix9XG4gICAgOztcbiopXG4gICAgZXhpdCAxXG5lc2FjXG4iOwogCQl9OwogCQkxQURBRTEy RjE5MTlBOTBDMDBGNDhFMjEgLyogVXBkYXRlIEluZm8ucGxpc3Qgd2l0aCB2ZXJzaW9uIGluZm9y bWF0aW9uICovID0gewogCQkJaXNhID0gUEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlOwpAQCAtMTA1 OTksNyArMTA1OTksNyBAQAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nl c3NpbmcgPSAwOwogCQkJc2hlbGxQYXRoID0gL2Jpbi9zaDsKLQkJCXNoZWxsU2NyaXB0ID0gIldL QkFTRV9IPSR7VEFSR0VUX0JVSUxEX0RJUn0vJHtQUklWQVRFX0hFQURFUlNfRk9MREVSX1BBVEh9 L1dLQmFzZS5oXG5cbnVuaWZkZWYgLUIgLURfX0FQUExFX18gLVVCVUlMRElOR19HVEtfXyAtVUJV SUxESU5HX1dQRV9fIC1VVVNFX1NPVVAgLW8gXCIke1dLQkFTRV9IfVwiLnVuaWZkZWYgXCIke1dL QkFTRV9IfVwiXG5cbmNhc2UgJD8gaW5cbjApXG4gICAgcm0gXCIke1dLQkFTRV9IfVwiLnVuaWZk ZWZcbiAgICA7O1xuMSlcbiAgICBtdiBcIiR7V0tCQVNFX0h9XCJ7LnVuaWZkZWYsfVxuICAgIDs7 XG4qKVxuICAgIGV4aXQgMVxuZXNhY1xuIjsKKwkJCXNoZWxsU2NyaXB0ID0gImlmIFsgXCIke1hD T0RFX1ZFUlNJT05fTUFKT1J9XCIgLWdlIFwiMTEwMFwiIC1hIFwiJHtVU0VfTkVXX0JVSUxEX1NZ U1RFTX1cIiA9IFwiWUVTXCIgXTsgdGhlblxuICAgICMgSW4gdGhpcyBjb25maWd1cmF0aW9uLCBw b3N0LXByb2Nlc3NpbmcgaXMgcGVyZm9ybWVkIGF0IHRoZSBzYW1lIHRpbWUgYXMgY29weWluZyBp biB0aGUgcG9zdHByb2Nlc3MtaGVhZGVyLXJ1bGUgc2NyaXB0LCBzbyB0aGVyZSdzIG5vIG5lZWQg Zm9yIHRoaXMgc2VwYXJhdGUgc3RlcC5cbiAgICBleGl0IDBcbmZpXG5cbldLQkFTRV9IPSR7VEFS R0VUX0JVSUxEX0RJUn0vJHtQUklWQVRFX0hFQURFUlNfRk9MREVSX1BBVEh9L1dLQmFzZS5oXG5c bnVuaWZkZWYgLUIgLURfX0FQUExFX18gLVVCVUlMRElOR19HVEtfXyAtVUJVSUxESU5HX1dQRV9f IC1VVVNFX1NPVVAgLW8gXCIke1dLQkFTRV9IfVwiLnVuaWZkZWYgXCIke1dLQkFTRV9IfVwiXG5c bmNhc2UgJD8gaW5cbjApXG4gICAgcm0gXCIke1dLQkFTRV9IfVwiLnVuaWZkZWZcbiAgICA7O1xu MSlcbiAgICBtdiBcIiR7V0tCQVNFX0h9XCJ7LnVuaWZkZWYsfVxuICAgIDs7XG4qKVxuICAgIGV4 aXQgMVxuZXNhY1xuIjsKIAkJfTsKIAkJMzdFNTMxMDExQjIzOTEwOTAwNzRGMERGIC8qIENvcHkg aU9TIFNhbmRib3ggUHJvZmlsZXMgZm9yIE1hbnVhbCBTYW5kYm94aW5nICovID0gewogCQkJaXNh ID0gUEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlOwpAQCAtMTA5MDYsNyArMTA5MDYsNyBAQAogCQkJ KTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQkJc2hlbGxQ YXRoID0gL2Jpbi9zaDsKLQkJCXNoZWxsU2NyaXB0ID0gImlmIFsgXCIke0FDVElPTn1cIiA9IFwi YnVpbGRcIiAtbyBcIiR7QUNUSU9OfVwiID0gXCJpbnN0YWxsXCIgLW8gXCIke0FDVElPTn1cIiA9 IFwiaW5zdGFsbGhkcnNcIiAtbyBcIiR7QUNUSU9OfVwiID0gXCJpbnN0YWxsYXBpXCIgXTsgdGhl blxuICAgIGZvciBIRUFERVJTX0RJUkVDVE9SWSBpbiBcIiR7UFVCTElDX0hFQURFUlNfRk9MREVS X1BBVEh9XCIgXCIke1BSSVZBVEVfSEVBREVSU19GT0xERVJfUEFUSH1cIjsgZG9cbiAgICAgICAg Zm9yIEhFQURFUl9QQVRIIGluIFwiJHtUQVJHRVRfQlVJTERfRElSfS8ke0hFQURFUlNfRElSRUNU T1JZfS9cIiouaDsgZG9cbiAgICAgICAgICAgIGlmIFtbICEgLXogYGdyZXAgJyNpbXBvcnQgPFdl YktpdEFkZGl0aW9ucy8uKlxcLmg+JyBcIiR7SEVBREVSX1BBVEh9XCJgIF1dOyB0aGVuXG4gICAg ICAgICAgICAgICAgcHl0aG9uIFwiJHtTUkNST09UfS9tYWMvcmVwbGFjZS13ZWJraXQtYWRkaXRp b25zLWluY2x1ZGVzLnB5XCIgXCIke0hFQURFUl9QQVRIfVwiIFwiJHtCVUlMVF9QUk9EVUNUU19E SVJ9XCIgXCIke1NES1JPT1R9XCIgfHwgZXhpdCAkP1xuICAgICAgICAgICAgZmlcbiAgICAgICAg ZG9uZVxuICAgIGRvbmVcbmZpXG4iOworCQkJc2hlbGxTY3JpcHQgPSAiaWYgWyBcIiR7WENPREVf VkVSU0lPTl9NQUpPUn1cIiAtZ2UgXCIxMTAwXCIgLWEgXCIke1VTRV9ORVdfQlVJTERfU1lTVEVN fVwiID0gXCJZRVNcIiBdOyB0aGVuXG4gICAgIyBJbiB0aGlzIGNvbmZpZ3VyYXRpb24sIHBvc3Qt cHJvY2Vzc2luZyBpcyBwZXJmb3JtZWQgYXQgdGhlIHNhbWUgdGltZSBhcyBjb3B5aW5nIGluIHRo ZSBwb3N0cHJvY2Vzcy1oZWFkZXItcnVsZSBzY3JpcHQsIHNvIHRoZXJlJ3Mgbm8gbmVlZCBmb3Ig dGhpcyBzZXBhcmF0ZSBzdGVwLlxuICAgIGV4aXQgMFxuZmlcblxuaWYgWyBcIiR7QUNUSU9OfVwi ID0gXCJidWlsZFwiIC1vIFwiJHtBQ1RJT059XCIgPSBcImluc3RhbGxcIiAtbyBcIiR7QUNUSU9O fVwiID0gXCJpbnN0YWxsaGRyc1wiIC1vIFwiJHtBQ1RJT059XCIgPSBcImluc3RhbGxhcGlcIiBd OyB0aGVuXG4gICAgZm9yIEhFQURFUlNfRElSRUNUT1JZIGluIFwiJHtQVUJMSUNfSEVBREVSU19G T0xERVJfUEFUSH1cIiBcIiR7UFJJVkFURV9IRUFERVJTX0ZPTERFUl9QQVRIfVwiOyBkb1xuICAg ICAgICBmb3IgSEVBREVSX1BBVEggaW4gXCIke1RBUkdFVF9CVUlMRF9ESVJ9LyR7SEVBREVSU19E SVJFQ1RPUll9L1wiKi5oOyBkb1xuICAgICAgICAgICAgaWYgW1sgISAteiBgZ3JlcCAnI2ltcG9y dCA8V2ViS2l0QWRkaXRpb25zLy4qXFwuaD4nIFwiJHtIRUFERVJfUEFUSH1cImAgXV07IHRoZW5c biAgICAgICAgICAgICAgICBweXRob24gXCIke1NSQ1JPT1R9L21hYy9yZXBsYWNlLXdlYmtpdC1h ZGRpdGlvbnMtaW5jbHVkZXMucHlcIiBcIiR7SEVBREVSX1BBVEh9XCIgXCIke0JVSUxUX1BST0RV Q1RTX0RJUn1cIiBcIiR7U0RLUk9PVH1cIiB8fCBleGl0ICQ/XG4gICAgICAgICAgICBmaVxuICAg ICAgICBkb25lXG4gICAgZG9uZVxuZmlcbiI7CiAJCX07CiAvKiBFbmQgUEJYU2hlbGxTY3JpcHRC dWlsZFBoYXNlIHNlY3Rpb24gKi8KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9X ZWJLaXRMZWdhY3kueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXRMZWdh Y3kvV2ViS2l0TGVnYWN5Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMDI1YTAyZTI3 OWQyOWY4NWNmNGQwMDMxMzRjNDhmMjI1ODhhOGUzMy4uYWI0NWI3YzU0YWI5YjU0NTkxNGVjMTcw YmViOWQ5ZDg3N2U0YmRlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9XZWJLaXRM ZWdhY3kueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5 L1dlYktpdExlZ2FjeS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMzM5LDcgKzMzMzks NyBAQAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwog CQkJc2hlbGxQYXRoID0gL2Jpbi9zaDsKLQkJCXNoZWxsU2NyaXB0ID0gImV4ZWMgXCIke1NSQ1JP T1R9L21hYy9wb3N0cHJvY2Vzcy1oZWFkZXJzLnNoXCIiOworCQkJc2hlbGxTY3JpcHQgPSAiaWYg WyBcIiR7WENPREVfVkVSU0lPTl9NQUpPUn1cIiAtZ2UgXCIxMTAwXCIgLWEgXCIke1VTRV9ORVdf QlVJTERfU1lTVEVNfVwiID0gXCJZRVNcIiBdOyB0aGVuXG4gICAgIyBJbiB0aGlzIGNvbmZpZ3Vy YXRpb24sIHBvc3QtcHJvY2Vzc2luZyBpcyBwZXJmb3JtZWQgYXQgdGhlIHNhbWUgdGltZSBhcyBj b3B5aW5nIGluIHRoZSBwb3N0cHJvY2Vzcy1oZWFkZXItcnVsZSBzY3JpcHQsIHNvIHRoZXJlJ3Mg bm8gbmVlZCBmb3IgdGhpcyBzZXBhcmF0ZSBzdGVwLlxuICAgIGV4aXQgMFxuZmlcblxuZXhlYyBc IiR7U1JDUk9PVH0vbWFjL3Bvc3Rwcm9jZXNzLWhlYWRlcnMuc2hcIlxuIjsKIAkJfTsKIC8qIEVu ZCBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2Ugc2VjdGlvbiAqLwogCg==