160340 2016-07-29 06:52:05 -0700 Allow more --cmakeargs option in build-jsc and build-webkit 2016-08-09 02:12:36 -0700 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ossy ossy commit-queue ddkilzer ossy oldest_to_newest 1215550 0 ossy 2016-07-29 06:52:05 -0700 We can use --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local" as the example says in the help. It works as expected. But it doesn't work if we use BUILD_WEBKIT_ARGS or BUILD_JSC_ARGS environment variable to set --cmakeargs option, because they are splitted because of the whitespace. Additionally if we set --cmakeargs in BUILD_WEBKIT_ARGS and pass an other --cmakeargs to the command line, the cmdline one is omitted, because Perl's GetOptions uses only the last option. I think the proper fix would be to allow more --cmakeargs and simply concatenate them. 1215551 1 284864 ossy 2016-07-29 06:54:02 -0700 Created attachment 284864 Patch 1215723 2 284864 ddkilzer 2016-07-29 15:17:32 -0700 Comment on attachment 284864 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=284864&action=review > Tools/Scripts/build-jsc:67 > - --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local") > + --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local") More --cmakeargs allowed. The "More --cmakeargs allowed." at the end will be hard to read/notice in the shell. How about this? --cmakeargs=<arguments> One or more optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local") > Tools/Scripts/build-jsc:79 > - 'cmakeargs=s' => \$cmakeArgs > + 'cmakeargs=s' => sub { $cmakeArgs .= " $_[1]" } Can this also be accomplished by using an array for cmakeArgs? 'cmakeargs=s' => \@cmakeArgs, Or will that destroy the whitespace? This is apparently the preferred way to do this via the "Options with multiple values" section in "man Getopt::Long". > Tools/Scripts/build-webkit:104 > - --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local") > + --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local") More --cmakeargs allowed. Ditto. > Tools/Scripts/build-webkit:119 > - 'cmakeargs=s' => \$cmakeArgs, > + 'cmakeargs=s' => sub { $cmakeArgs .= " $_[1]" }, Ditto. 1216082 3 ossy 2016-08-01 04:10:08 -0700 (In reply to comment #2) > Comment on attachment 284864 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=284864&action=review > > > Tools/Scripts/build-jsc:67 > > - --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local") > > + --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local") More --cmakeargs allowed. > > The "More --cmakeargs allowed." at the end will be hard to read/notice in > the shell. How about this? > > --cmakeargs=<arguments> One or more optional CMake flags (e.g. > --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local") OK, will use the one you suggested. > > Tools/Scripts/build-jsc:79 > > - 'cmakeargs=s' => \$cmakeArgs > > + 'cmakeargs=s' => sub { $cmakeArgs .= " $_[1]" } > > Can this also be accomplished by using an array for cmakeArgs? > > 'cmakeargs=s' => \@cmakeArgs, > > Or will that destroy the whitespace? > > This is apparently the preferred way to do this via the "Options with > multiple values" section in "man Getopt::Long". Good point, I wasn't thorough enough to find this super easy way in the man. Actually it isn't necessary to use whitespace separated string, let's use array everywhere for cmake arguments. 1216083 4 285005 ossy 2016-08-01 04:20:30 -0700 Created attachment 285005 Patch 1217349 5 ossy 2016-08-04 02:29:12 -0700 ping? 1218713 6 285005 commit-queue 2016-08-09 02:12:32 -0700 Comment on attachment 285005 Patch Clearing flags on attachment: 285005 Committed r204278: <http://trac.webkit.org/changeset/204278> 1218714 7 commit-queue 2016-08-09 02:12:36 -0700 All reviewed patches have been landed. Closing bug. 284864 2016-07-29 06:54:02 -0700 2016-08-01 04:20:24 -0700 Patch bug-160340-20160729065247.patch text/plain 2838 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzODk5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzEwNDA2NzMwYWY5MmRlOWViN2M1M2M5NWZmODg5NWFh OTQ2Zjk2NC4uNWE1OTcwODFiNTdkNzE4MzI5YmQ5ZDI4OGJiNTNlNGRmOWYxNmU3NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDE2LTA3LTI5ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgQWxsb3cgbW9yZSAtLWNtYWtlYXJncyBvcHRpb24gaW4gYnVpbGQtanNjIGFuZCBi dWlsZC13ZWJraXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2MDM0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy9idWlsZC1qc2M6CisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6 CisKIDIwMTYtMDctMjkgIFRpYm9yIE1lc3phcm9zICA8dG1lc3phcm9zLnUtc3plZ2VkQHBhcnRu ZXIuc2Ftc3VuZy5jb20+CiAKICAgICAgICAgVXBkYXRlIGZvciBjb250cmlidXRvcnMuanNvbgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MgYi9Ub29scy9TY3JpcHRzL2J1aWxk LWpzYwppbmRleCAzMWY2MGVmYzY5MTM4MDRjODIwN2UyMzIyNmI1YjViNGE2M2Q1NzAzLi5mNDE1 YmQ0ZmUxNTE4Y2VhYWFjZGY2YTQ5YTM5OWMzNTI5N2Y0NTUzIDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL2J1aWxkLWpzYworKysgYi9Ub29scy9TY3JpcHRzL2J1aWxkLWpzYwpAQCAtNjQsNyAr NjQsNyBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRv IGJ1aWxkIHN5c3RlbV0KICAgLS1jbG9vcCAgICAgICAgICAgICAgICAgICAgICAgVXNlIEMgTG9v cCBpbnRlcnByZXRlciAoZGVmYXVsdDogJGZvcmNlQ0xvb3ApCiAgIC0tY2xpICAgICAgICAgICAg ICAgICAgICAgICAgIEJ1aWxkIHRoZSBuZXcganNjIGNvbW1hbmQgbGluZSBpbnRlcmZhY2UgKGRl ZmF1bHQ6ICRjbGkpCiAgIC0tbWFrZWFyZ3M9PGFyZ3VtZW50cz4gICAgICAgIE9wdGlvbmFsIE1h a2VmaWxlIGZsYWdzCi0gIC0tY21ha2VhcmdzPTxhcmd1bWVudHM+ICAgICAgIE9wdGlvbmFsIENN YWtlIGZsYWdzIChlLmcuIC0tY21ha2VhcmdzPSItREZPTz1iYXIgLURDTUFLRV9QUkVGSVhfUEFU SD0vdXNyL2xvY2FsIikKKyAgLS1jbWFrZWFyZ3M9PGFyZ3VtZW50cz4gICAgICAgT3B0aW9uYWwg Q01ha2UgZmxhZ3MgKGUuZy4gLS1jbWFrZWFyZ3M9Ii1ERk9PPWJhciAtRENNQUtFX1BSRUZJWF9Q QVRIPS91c3IvbG9jYWwiKSBNb3JlIC0tY21ha2VhcmdzIGFsbG93ZWQuCiBFT0YKIAogR2V0T3B0 aW9ucygKQEAgLTc2LDcgKzc2LDcgQEAgR2V0T3B0aW9ucygKICAgICAnY2xpIScgPT4gXCRjbGks CiAgICAgJ2NvcHktbGlicmFyaWVzIScgPT4gXCRjb3B5TGlicmFyaWVzLAogICAgICdtYWtlYXJn cz1zJyA9PiBcJG1ha2VBcmdzLAotICAgICdjbWFrZWFyZ3M9cycgPT4gXCRjbWFrZUFyZ3MKKyAg ICAnY21ha2VhcmdzPXMnID0+IHN1YiB7ICRjbWFrZUFyZ3MgLj0gIiAkX1sxXSIgfQogKTsKIAog aWYgKCRzaG93SGVscCkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQg Yi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCA2NTNkMzc0NTIwMzE4YzNhMjBlYWUw NjY1Yzc5MDhhYTc3MjE0ZjlkLi4zZTZlNzg5ODU4NDhlN2U3YWFhNDk1OGM0NzZmYjE3NTQxOTU3 Yjg5IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysgYi9Ub29scy9T Y3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtMTAxLDcgKzEwMSw3IEBAIFVzYWdlOiAkcHJvZ3JhbU5h bWUgW29wdGlvbnNdIFtvcHRpb25zIHRvIHBhc3MgdG8gYnVpbGQgc3lzdGVtXQogCiAgIC0tcHJl Zml4PTxwYXRoPiAgICAgICAgICAgICAgICAgICBTZXQgaW5zdGFsbGF0aW9uIHByZWZpeCB0byB0 aGUgZ2l2ZW4gcGF0aCAoR3RrL0VmbCBvbmx5KQogICAtLW1ha2VhcmdzPTxhcmd1bWVudHM+ICAg ICAgICAgICAgT3B0aW9uYWwgTWFrZWZpbGUgZmxhZ3MKLSAgLS1jbWFrZWFyZ3M9PGFyZ3VtZW50 cz4gICAgICAgICAgIE9wdGlvbmFsIENNYWtlIGZsYWdzIChlLmcuIC0tY21ha2VhcmdzPSItREZP Tz1iYXIgLURDTUFLRV9QUkVGSVhfUEFUSD0vdXNyL2xvY2FsIikKKyAgLS1jbWFrZWFyZ3M9PGFy Z3VtZW50cz4gICAgICAgICAgIE9wdGlvbmFsIENNYWtlIGZsYWdzIChlLmcuIC0tY21ha2Vhcmdz PSItREZPTz1iYXIgLURDTUFLRV9QUkVGSVhfUEFUSD0vdXNyL2xvY2FsIikgTW9yZSAtLWNtYWtl YXJncyBhbGxvd2VkLgogCiAgIC0tbWluaW1hbCAgICAgICAgICAgICAgICAgICAgICAgICBObyBv cHRpb25hbCBmZWF0dXJlcywgdW5sZXNzIGV4cGxpY2l0bHkgZW5hYmxlZAogCkBAIC0xMTYsNyAr MTE2LDcgQEAgbXkgJW9wdGlvbnMgPSAoCiAgICAgJ2luc3RhbGwtbGlicz1zJyA9PiBcJGluc3Rh bGxMaWJzLAogICAgICdwcmVmaXg9cycgPT4gXCRwcmVmaXhQYXRoLAogICAgICdtYWtlYXJncz1z JyA9PiBcJG1ha2VBcmdzLAotICAgICdjbWFrZWFyZ3M9cycgPT4gXCRjbWFrZUFyZ3MsCisgICAg J2NtYWtlYXJncz1zJyA9PiBzdWIgeyAkY21ha2VBcmdzIC49ICIgJF9bMV0iIH0sCiAgICAgJ21p bmltYWwnID0+IFwkbWluaW1hbCwKICAgICAnb25seS13ZWJraXQnID0+IFwkb25seVdlYktpdFBy b2plY3QsCiAgICAgJ2NvdmVyYWdlJyA9PiBcJGNvdmVyYWdlU3VwcG9ydCwK 285005 2016-08-01 04:20:30 -0700 2016-08-09 02:12:32 -0700 Patch bug-160340-20160801041910.patch text/plain 4485 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzOTczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2E1Yjk1NTlhZGU2YTBjMTliYzNlMThkMTc4NzAwY2Yy NTdmZTEzMi4uZmZjNjQwNmZmOWE2YWZmZGRlMmQ5ZmE2ODA0OGZkYmVhNDI4N2UyMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDE2LTA4LTAxICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgQWxsb3cgbW9yZSAtLWNtYWtlYXJncyBvcHRpb24gaW4gYnVpbGQtanNjIGFuZCBi dWlsZC13ZWJraXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2MDM0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy9idWlsZC1qc2M6CisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6 CisKIDIwMTYtMDgtMDEgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAK ICAgICAgICAgV2Ugc2hvdWxkIG5vdCBrZWVwIHRoZSBKYXZhU2NyaXB0IHRlc3RzIGluc2lkZSB0 aGUgU291cmNlL0phdmFTY3JpcHRDb3JlLyBkaXJlY3RvcnkuCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL2J1aWxkLWpzYyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtanNjCmluZGV4IDMxZjYwZWZj NjkxMzgwNGM4MjA3ZTIzMjI2YjViNWI0YTYzZDU3MDMuLjMyNzQ1NWZjM2ZmN2YwMGZlMmVlMTkz NmU1YmNlYjk2M2E3YmRmMzEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtanNjCisr KyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtanNjCkBAIC00Niw3ICs0Niw3IEBAIG15ICRmdGxKSVQg PSBpbnQoaXNBcHBsZU1hY1dlYktpdCgpICYmICF3aWxsVXNlSU9TU2ltdWxhdG9yU0RLKCkgfHwg aXNYODZfNjQoKSAmCiBteSAkZm9yY2VDTG9vcCA9IDA7CiBteSAkY2xpID0gMDsKIG15ICRtYWtl QXJncyA9ICIiOwotbXkgJGNtYWtlQXJncyA9ICIiOworbXkgQGNtYWtlQXJnczsKIG15ICRjb3B5 TGlicmFyaWVzID0gMTsKIG15ICRzdGFydFRpbWUgPSB0aW1lKCk7CiAKQEAgLTY0LDcgKzY0LDcg QEAgVXNhZ2U6ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10gW29wdGlvbnMgdG8gcGFzcyB0byBidWls ZCBzeXN0ZW1dCiAgIC0tY2xvb3AgICAgICAgICAgICAgICAgICAgICAgIFVzZSBDIExvb3AgaW50 ZXJwcmV0ZXIgKGRlZmF1bHQ6ICRmb3JjZUNMb29wKQogICAtLWNsaSAgICAgICAgICAgICAgICAg ICAgICAgICBCdWlsZCB0aGUgbmV3IGpzYyBjb21tYW5kIGxpbmUgaW50ZXJmYWNlIChkZWZhdWx0 OiAkY2xpKQogICAtLW1ha2VhcmdzPTxhcmd1bWVudHM+ICAgICAgICBPcHRpb25hbCBNYWtlZmls ZSBmbGFncwotICAtLWNtYWtlYXJncz08YXJndW1lbnRzPiAgICAgICBPcHRpb25hbCBDTWFrZSBm bGFncyAoZS5nLiAtLWNtYWtlYXJncz0iLURGT089YmFyIC1EQ01BS0VfUFJFRklYX1BBVEg9L3Vz ci9sb2NhbCIpCisgIC0tY21ha2VhcmdzPTxhcmd1bWVudHM+ICAgICAgIE9uZSBvciBtb3JlIG9w dGlvbmFsIENNYWtlIGZsYWdzIChlLmcuIC0tY21ha2VhcmdzPSItREZPTz1iYXIgLURDTUFLRV9Q UkVGSVhfUEFUSD0vdXNyL2xvY2FsIikKIEVPRgogCiBHZXRPcHRpb25zKApAQCAtNzYsNyArNzYs NyBAQCBHZXRPcHRpb25zKAogICAgICdjbGkhJyA9PiBcJGNsaSwKICAgICAnY29weS1saWJyYXJp ZXMhJyA9PiBcJGNvcHlMaWJyYXJpZXMsCiAgICAgJ21ha2VhcmdzPXMnID0+IFwkbWFrZUFyZ3Ms Ci0gICAgJ2NtYWtlYXJncz1zJyA9PiBcJGNtYWtlQXJncworICAgICdjbWFrZWFyZ3M9cycgPT4g XEBjbWFrZUFyZ3MKICk7CiAKIGlmICgkc2hvd0hlbHApIHsKQEAgLTEwMSw4ICsxMDEsOCBAQCBp ZiAoJGZvcmNlQ0xvb3ApIHsKIH0KIAogaWYgKGlzQ01ha2VCdWlsZCgpKSB7Ci0gICAgJGNtYWtl QXJncyAuPSAkZm9yY2VDTG9vcCA/ICIgLURFTkFCTEVfSklUPU9GRiIgOiAiIC1ERU5BQkxFX0pJ VD1PTiI7Ci0gICAgJGNtYWtlQXJncyAuPSAkZnRsSklUID8gIiAtREVOQUJMRV9GVExfSklUPU9O IiA6ICIgLURFTkFCTEVfRlRMX0pJVD1PRkYiOworICAgIHB1c2ggQGNtYWtlQXJncywgJGZvcmNl Q0xvb3AgPyAiIC1ERU5BQkxFX0pJVD1PRkYiIDogIiAtREVOQUJMRV9KSVQ9T04iOworICAgIHB1 c2ggQGNtYWtlQXJncywgJGZ0bEpJVCA/ICIgLURFTkFCTEVfRlRMX0pJVD1PTiIgOiAiIC1ERU5B QkxFX0ZUTF9KSVQ9T0ZGIjsKIAogICAgIG15ICRidWlsZFRhcmdldCA9ICIiOwogICAgIHVubGVz cyAoaXNBbnlXaW5kb3dzKCkpIHsKQEAgLTExNCw3ICsxMTQsNyBAQCBpZiAoaXNDTWFrZUJ1aWxk KCkpIHsKICAgICB9CiAKICAgICAjIFRoaXMgY2FsbCBvbmx5IHJldHVybnMgaWYgbm90aGluZyB3 cm9uZyBoYXBwZW5lZAotICAgIGJ1aWxkQ01ha2VQcm9qZWN0T3JFeGl0KDAsIHVuZGVmLCAkYnVp bGRUYXJnZXQsIChjbWFrZUJhc2VkUG9ydEFyZ3VtZW50cygpLCAkY21ha2VBcmdzKSk7CisgICAg YnVpbGRDTWFrZVByb2plY3RPckV4aXQoMCwgdW5kZWYsICRidWlsZFRhcmdldCwgKGNtYWtlQmFz ZWRQb3J0QXJndW1lbnRzKCksIEBjbWFrZUFyZ3MpKTsKICAgICB3cml0ZUNvbmdyYXRzKCk7CiAg ICAgZXhpdCBleGl0U3RhdHVzKDApOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWls ZC13ZWJraXQgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCA2NTNkMzc0NTIwMzE4 YzNhMjBlYWUwNjY1Yzc5MDhhYTc3MjE0ZjlkLi5iYTM3NmFhYWQxMWM5YjgwNDIzNzA2ZTFiY2E5 YWU1Mjg4Yzg4MjM4IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysg Yi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtNTcsNyArNTcsNyBAQCBteSAkaW5zdGFs bEhlYWRlcnM7CiBteSAkaW5zdGFsbExpYnM7CiBteSAkcHJlZml4UGF0aDsKIG15ICRtYWtlQXJn cyA9ICIiOwotbXkgJGNtYWtlQXJncyA9ICIiOworbXkgQGNtYWtlQXJnczsKIG15ICRvbmx5V2Vi S2l0UHJvamVjdCA9IDA7CiBteSAkY292ZXJhZ2VTdXBwb3J0ID0gMDsKIG15ICRzaG91bGRSdW5T dGF0aWNBbmFseXplciA9IDA7CkBAIC0xMDEsNyArMTAxLDcgQEAgVXNhZ2U6ICRwcm9ncmFtTmFt ZSBbb3B0aW9uc10gW29wdGlvbnMgdG8gcGFzcyB0byBidWlsZCBzeXN0ZW1dCiAKICAgLS1wcmVm aXg9PHBhdGg+ICAgICAgICAgICAgICAgICAgIFNldCBpbnN0YWxsYXRpb24gcHJlZml4IHRvIHRo ZSBnaXZlbiBwYXRoIChHdGsvRWZsIG9ubHkpCiAgIC0tbWFrZWFyZ3M9PGFyZ3VtZW50cz4gICAg ICAgICAgICBPcHRpb25hbCBNYWtlZmlsZSBmbGFncwotICAtLWNtYWtlYXJncz08YXJndW1lbnRz PiAgICAgICAgICAgT3B0aW9uYWwgQ01ha2UgZmxhZ3MgKGUuZy4gLS1jbWFrZWFyZ3M9Ii1ERk9P PWJhciAtRENNQUtFX1BSRUZJWF9QQVRIPS91c3IvbG9jYWwiKQorICAtLWNtYWtlYXJncz08YXJn dW1lbnRzPiAgICAgICAgICAgT25lIG9yIG1vcmUgb3B0aW9uYWwgQ01ha2UgZmxhZ3MgKGUuZy4g LS1jbWFrZWFyZ3M9Ii1ERk9PPWJhciAtRENNQUtFX1BSRUZJWF9QQVRIPS91c3IvbG9jYWwiKQog CiAgIC0tbWluaW1hbCAgICAgICAgICAgICAgICAgICAgICAgICBObyBvcHRpb25hbCBmZWF0dXJl cywgdW5sZXNzIGV4cGxpY2l0bHkgZW5hYmxlZAogCkBAIC0xMTYsNyArMTE2LDcgQEAgbXkgJW9w dGlvbnMgPSAoCiAgICAgJ2luc3RhbGwtbGlicz1zJyA9PiBcJGluc3RhbGxMaWJzLAogICAgICdw cmVmaXg9cycgPT4gXCRwcmVmaXhQYXRoLAogICAgICdtYWtlYXJncz1zJyA9PiBcJG1ha2VBcmdz LAotICAgICdjbWFrZWFyZ3M9cycgPT4gXCRjbWFrZUFyZ3MsCisgICAgJ2NtYWtlYXJncz1zJyA9 PiBcQGNtYWtlQXJncywKICAgICAnbWluaW1hbCcgPT4gXCRtaW5pbWFsLAogICAgICdvbmx5LXdl YmtpdCcgPT4gXCRvbmx5V2ViS2l0UHJvamVjdCwKICAgICAnY292ZXJhZ2UnID0+IFwkY292ZXJh Z2VTdXBwb3J0LApAQCAtMjM4LDcgKzIzOCw3IEBAIGlmIChpc0NNYWtlQnVpbGQoKSAmJiAhaXNB bnlXaW5kb3dzKCkpIHsKICAgICBteSBAZmVhdHVyZUFyZ3MgPSBjTWFrZUFyZ3NGcm9tRmVhdHVy ZXMoKTsKICAgICByZW1vdmVDTWFrZUNhY2hlKEBmZWF0dXJlQXJncyk7CiAKLSAgICBidWlsZENN YWtlUHJvamVjdE9yRXhpdCgkY2xlYW4sICRwcmVmaXhQYXRoLCAkbWFrZUFyZ3MsIChjbWFrZUJh c2VkUG9ydEFyZ3VtZW50cygpLCBAZmVhdHVyZUFyZ3MpLCAkY21ha2VBcmdzKTsKKyAgICBidWls ZENNYWtlUHJvamVjdE9yRXhpdCgkY2xlYW4sICRwcmVmaXhQYXRoLCAkbWFrZUFyZ3MsIChjbWFr ZUJhc2VkUG9ydEFyZ3VtZW50cygpLCBAZmVhdHVyZUFyZ3MpLCBAY21ha2VBcmdzKTsKIH0KIAog bXkgJGJhc2VQcm9kdWN0RGlyID0gYmFzZVByb2R1Y3REaXIoKTsK