191314 2018-11-06 10:55:08 -0800 Adjust handling of Include paths that need quoting 2018-11-06 12:55:04 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin ap commit-queue ews-watchlist fpizlo keith_miller lforschler mark.lam mitz msaboff saam webkit-bug-importer oldest_to_newest 1475578 0 krollin 2018-11-06 10:55:08 -0800 There are several places in the JavaScriptCore Xcode project where the paths defined in HEADER_SEARCH_PATHS are quoted. That is, the definitions look like: HEADER_SEARCH_PATHS = ( "\"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\"", "\"${BUILT_PRODUCTS_DIR}/LLIntOffsets/${ARCHS}\"", "\"$(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders\"", "$(inherited)", ); The idea here is presumably to have the resulting $(CPP) command have -I options where the associated paths are themselves quoted, protecting against space characters in the paths. This approach to quote management can break under Xcode 9. If .xcfilelist files are added to the project, the 'objectVersion' value in the Xcode project file is changed from 46 to 51. If a project with objectVersion=51 is presented to Xcode 9 (as can happen when we build for older OS's), it produces build lines where the quotes are escaped, thereby becoming part of the path. The build then fails because a search for a file normally found in a directory called "Foo" will be looked for in "\"Foo\"", which doesn't exist. Simply removing the escaped quotes from the HEADER_SEARCH_PATHS definition doesn't work, leading to paths that need quoting due to space characters but that don't get this quoting (the part of the path after the space appears to simply go missing). Removing the escaped quotes from the HEADER_SEARCH_PATHS and moving the definitions to the .xcconfig fixes this problem. 1475580 1 webkit-bug-importer 2018-11-06 10:55:28 -0800 <rdar://problem/45849143> 1475581 2 353975 krollin 2018-11-06 10:58:09 -0800 Created attachment 353975 Patch 1475598 3 353975 mitz 2018-11-06 11:31:45 -0800 Comment on attachment 353975 Patch rs=me 1475637 4 353975 commit-queue 2018-11-06 12:55:02 -0800 Comment on attachment 353975 Patch Clearing flags on attachment: 353975 Committed r237881: <https://trac.webkit.org/changeset/237881> 1475638 5 commit-queue 2018-11-06 12:55:04 -0800 All reviewed patches have been landed. Closing bug. 353975 2018-11-06 10:58:09 -0800 2018-11-06 12:55:02 -0800 Patch bug-191314-20181106105808.patch text/plain 9064 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3ODMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 N2U0ODU5NGZhOTc0MTJiZDI3MDZhYTk4ZmIyZDY3NGI4YzdmM2Y1Li4zYmRlMGFhNDkxNmQ5ZmI0 OWI5Zjc0MTQ5ZWI1ZmNiNjBiYjFkNGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0NiBAQAorMjAxOC0xMS0wNiAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+ CisKKyAgICAgICAgQWRqdXN0IGhhbmRsaW5nIG9mIEluY2x1ZGUgcGF0aHMgdGhhdCBuZWVkIHF1 b3RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MTMxNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDU4NDkxNDM+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHNldmVyYWwgcGxhY2Vz IGluIHRoZSBKYXZhU2NyaXB0Q29yZSBYY29kZSBwcm9qZWN0IHdoZXJlIHRoZQorICAgICAgICBw YXRocyBkZWZpbmVkIGluIEhFQURFUl9TRUFSQ0hfUEFUSFMgYXJlIHF1b3RlZC4gVGhhdCBpcywg dGhlCisgICAgICAgIGRlZmluaXRpb25zIGxvb2sgbGlrZToKKworICAgICAgICAgICAgSEVBREVS X1NFQVJDSF9QQVRIUyA9ICgKKyAgICAgICAgICAgICAgICAiXCIke0JVSUxUX1BST0RVQ1RTX0RJ Un0vRGVyaXZlZFNvdXJjZXMvSmF2YVNjcmlwdENvcmVcIiIsCisgICAgICAgICAgICAgICAgIlwi JHtCVUlMVF9QUk9EVUNUU19ESVJ9L0xMSW50T2Zmc2V0cy8ke0FSQ0hTfVwiIiwKKyAgICAgICAg ICAgICAgICAiXCIkKEpBVkFTQ1JJUFRDT1JFX0ZSQU1FV09SS1NfRElSKS9KYXZhU2NyaXB0Q29y ZS5mcmFtZXdvcmsvUHJpdmF0ZUhlYWRlcnNcIiIsCisgICAgICAgICAgICAgICAgIiQoaW5oZXJp dGVkKSIsCisgICAgICAgICAgICApOworCisgICAgICAgIFRoZSBpZGVhIGhlcmUgaXMgcHJlc3Vt YWJseSB0byBoYXZlIHRoZSByZXN1bHRpbmcgJChDUFApIGNvbW1hbmQgaGF2ZQorICAgICAgICAt SSBvcHRpb25zIHdoZXJlIHRoZSBhc3NvY2lhdGVkIHBhdGhzIGFyZSB0aGVtc2VsdmVzIHF1b3Rl ZCwKKyAgICAgICAgcHJvdGVjdGluZyBhZ2FpbnN0IHNwYWNlIGNoYXJhY3RlcnMgaW4gdGhlIHBh dGhzLgorCisgICAgICAgIFRoaXMgYXBwcm9hY2ggdG8gcXVvdGUgbWFuYWdlbWVudCBjYW4gYnJl YWsgdW5kZXIgWGNvZGUgOS4gSWYKKyAgICAgICAgLnhjZmlsZWxpc3QgZmlsZXMgYXJlIGFkZGVk IHRvIHRoZSBwcm9qZWN0LCB0aGUgJ29iamVjdFZlcnNpb24nIHZhbHVlCisgICAgICAgIGluIHRo ZSBYY29kZSBwcm9qZWN0IGZpbGUgaXMgY2hhbmdlZCBmcm9tIDQ2IHRvIDUxLiBJZiBhIHByb2pl Y3Qgd2l0aAorICAgICAgICBvYmplY3RWZXJzaW9uPTUxIGlzIHByZXNlbnRlZCB0byBYY29kZSA5 IChhcyBjYW4gaGFwcGVuIHdoZW4gd2UgYnVpbGQKKyAgICAgICAgZm9yIG9sZGVyIE9TJ3MpLCBp dCBwcm9kdWNlcyBidWlsZCBsaW5lcyB3aGVyZSB0aGUgcXVvdGVzIGFyZSBlc2NhcGVkLAorICAg ICAgICB0aGVyZWJ5IGJlY29taW5nIHBhcnQgb2YgdGhlIHBhdGguIFRoZSBidWlsZCB0aGVuIGZh aWxzIGJlY2F1c2UgYQorICAgICAgICBzZWFyY2ggZm9yIGEgZmlsZSBub3JtYWxseSBmb3VuZCBp biBhIGRpcmVjdG9yeSBjYWxsZWQgIkZvbyIgd2lsbCBiZQorICAgICAgICBsb29rZWQgZm9yIGlu ICJcIkZvb1wiIiwgd2hpY2ggZG9lc24ndCBleGlzdC4KKworICAgICAgICBTaW1wbHkgcmVtb3Zp bmcgdGhlIGVzY2FwZWQgcXVvdGVzIGZyb20gdGhlIEhFQURFUl9TRUFSQ0hfUEFUSFMKKyAgICAg ICAgZGVmaW5pdGlvbiBkb2Vzbid0IHdvcmssIGxlYWRpbmcgdG8gcGF0aHMgdGhhdCBuZWVkIHF1 b3RpbmcgZHVlIHRvCisgICAgICAgIHNwYWNlIGNoYXJhY3RlcnMgYnV0IHRoYXQgZG9uJ3QgZ2V0 IHRoaXMgcXVvdGluZyAodGhlIHBhcnQgb2YgdGhlIHBhdGgKKyAgICAgICAgYWZ0ZXIgdGhlIHNw YWNlIGFwcGVhcnMgdG8gc2ltcGx5IGdvIG1pc3NpbmcpLgorCisgICAgICAgIFJlbW92aW5nIHRo ZSBlc2NhcGVkIHF1b3RlcyBmcm9tIHRoZSBIRUFERVJfU0VBUkNIX1BBVEhTIGFuZCBtb3ZpbmcK KyAgICAgICAgdGhlIGRlZmluaXRpb25zIHRvIHRoZSAueGNjb25maWcgZml4ZXMgdGhpcyBwcm9i bGVtLgorCisgICAgICAgICogQ29uZmlndXJhdGlvbnMvVG9vbEV4ZWN1dGFibGUueGNjb25maWc6 CisgICAgICAgICogSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwog MjAxOC0xMS0wNSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgogCiAgICAg ICAgIEZpeCB0eXBvcyBpbiBjbG9zaW5nIEVOQUJMRSBndWFyZHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9Db25maWd1cmF0aW9ucy9Ub29sRXhlY3V0YWJsZS54Y2NvbmZpZyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9Db25maWd1cmF0aW9ucy9Ub29sRXhlY3V0YWJsZS54Y2Nv bmZpZwppbmRleCAyNTE1MzhjNWEzYzUzYzlhYTE5MmJmOWY0NTM0ZmM5MDdmMmNkODJkLi42MWY2 NWVhNTM0ODVjMDU0ZmE0ZGE1ZTM1ZjQyNWNhODA3YjMwZWQwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ29uZmlndXJhdGlvbnMvVG9vbEV4ZWN1dGFibGUueGNjb25maWcKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NvbmZpZ3VyYXRpb25zL1Rvb2xFeGVjdXRhYmxlLnhj Y29uZmlnCkBAIC00OSw0ICs0OSw0IEBAIE9USEVSX0NGTEFHUyA9ICQoQVNBTl9PVEhFUl9DRkxB R1MpIC1pc3lzdGVtIGljdTsKIE9USEVSX0xERkxBR1MgPSAkKEFTQU5fT1RIRVJfTERGTEFHUyk7 CiAKIC8vIEV4cGxpY2l0bHkgYWRkIHRoZSBQcml2YXRlSGVhZGVycyBkaXJlY3RvcnkgdG8gdGhl IHNlYXJjaCBwYXRoIHNvIHRoYXQgZ2VuZXJhdGVkIGhlYWRlciBmaWxlcyBjYW4gYmUgZm91bmQg aW4gcHJvZHVjdGlvbiBidWlsZHMuCi1IRUFERVJfU0VBUkNIX1BBVEhTID0gIiQoSkFWQVNDUklQ VENPUkVfRlJBTUVXT1JLU19ESVIpL0phdmFTY3JpcHRDb3JlLmZyYW1ld29yay9Qcml2YXRlSGVh ZGVycyIgJChpbmhlcml0ZWQpOworSEVBREVSX1NFQVJDSF9QQVRIUyA9ICIke0JVSUxUX1BST0RV Q1RTX0RJUn0vRGVyaXZlZFNvdXJjZXMvSmF2YVNjcmlwdENvcmUiICIke0JVSUxUX1BST0RVQ1RT X0RJUn0vTExJbnRPZmZzZXRzLyR7QVJDSFN9IiAiJChKQVZBU0NSSVBUQ09SRV9GUkFNRVdPUktT X0RJUikvSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrL1ByaXZhdGVIZWFkZXJzIiAkKGluaGVyaXRl ZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0 Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGMzODc4ZTE4MDdkMmIyYzI1YTg1 ZTlmYWNmNzEzNmEzNWE4NmRjMjUuLjc2NWM5YTg1M2FhZTc4NDVjNWRkYzY2NjQwZTU5ZGQzNDM2 MGYxYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZh U2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMDgwOSwxMiArMTA4MDks NiBAQAogCQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247CiAJCQliYXNlQ29uZmlndXJhdGlv blJlZmVyZW5jZSA9IEJDMDIxQkYyMTM2OTAwQzMwMEZDNTQ2NyAvKiBUb29sRXhlY3V0YWJsZS54 Y2NvbmZpZyAqLzsKIAkJCWJ1aWxkU2V0dGluZ3MgPSB7Ci0JCQkJSEVBREVSX1NFQVJDSF9QQVRI UyA9ICgKLQkJCQkJIlwiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL0phdmFT Y3JpcHRDb3JlXCIiLAotCQkJCQkiXCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vTExJbnRPZmZzZXRz LyR7QVJDSFN9XCIiLAotCQkJCQkiXCIkKEpBVkFTQ1JJUFRDT1JFX0ZSQU1FV09SS1NfRElSKS9K YXZhU2NyaXB0Q29yZS5mcmFtZXdvcmsvUHJpdmF0ZUhlYWRlcnNcIiIsCi0JCQkJCSIkKGluaGVy aXRlZCkiLAotCQkJCSk7CiAJCQl9OwogCQkJbmFtZSA9IERlYnVnOwogCQl9OwpAQCAtMTA4MjIs MTIgKzEwODE2LDYgQEAKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwogCQkJYmFzZUNv bmZpZ3VyYXRpb25SZWZlcmVuY2UgPSBCQzAyMUJGMjEzNjkwMEMzMDBGQzU0NjcgLyogVG9vbEV4 ZWN1dGFibGUueGNjb25maWcgKi87CiAJCQlidWlsZFNldHRpbmdzID0gewotCQkJCUhFQURFUl9T RUFSQ0hfUEFUSFMgPSAoCi0JCQkJCSJcIiR7QlVJTFRfUFJPRFVDVFNfRElSfS9EZXJpdmVkU291 cmNlcy9KYXZhU2NyaXB0Q29yZVwiIiwKLQkJCQkJIlwiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L0xM SW50T2Zmc2V0cy8ke0FSQ0hTfVwiIiwKLQkJCQkJIlwiJChKQVZBU0NSSVBUQ09SRV9GUkFNRVdP UktTX0RJUikvSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrL1ByaXZhdGVIZWFkZXJzXCIiLAotCQkJ CQkiJChpbmhlcml0ZWQpIiwKLQkJCQkpOwogCQkJfTsKIAkJCW5hbWUgPSBSZWxlYXNlOwogCQl9 OwpAQCAtMTA4MzUsMTIgKzEwODIzLDYgQEAKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9u OwogCQkJYmFzZUNvbmZpZ3VyYXRpb25SZWZlcmVuY2UgPSBCQzAyMUJGMjEzNjkwMEMzMDBGQzU0 NjcgLyogVG9vbEV4ZWN1dGFibGUueGNjb25maWcgKi87CiAJCQlidWlsZFNldHRpbmdzID0gewot CQkJCUhFQURFUl9TRUFSQ0hfUEFUSFMgPSAoCi0JCQkJCSJcIiR7QlVJTFRfUFJPRFVDVFNfRElS fS9EZXJpdmVkU291cmNlcy9KYXZhU2NyaXB0Q29yZVwiIiwKLQkJCQkJIlwiJHtCVUlMVF9QUk9E VUNUU19ESVJ9L0xMSW50T2Zmc2V0cy8ke0FSQ0hTfVwiIiwKLQkJCQkJIlwiJChKQVZBU0NSSVBU Q09SRV9GUkFNRVdPUktTX0RJUikvSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrL1ByaXZhdGVIZWFk ZXJzXCIiLAotCQkJCQkiJChpbmhlcml0ZWQpIiwKLQkJCQkpOwogCQkJfTsKIAkJCW5hbWUgPSBQ cm9maWxpbmc7CiAJCX07CkBAIC0xMDg0OCwxMiArMTA4MzAsNiBAQAogCQkJaXNhID0gWENCdWls ZENvbmZpZ3VyYXRpb247CiAJCQliYXNlQ29uZmlndXJhdGlvblJlZmVyZW5jZSA9IEJDMDIxQkYy MTM2OTAwQzMwMEZDNTQ2NyAvKiBUb29sRXhlY3V0YWJsZS54Y2NvbmZpZyAqLzsKIAkJCWJ1aWxk U2V0dGluZ3MgPSB7Ci0JCQkJSEVBREVSX1NFQVJDSF9QQVRIUyA9ICgKLQkJCQkJIlwiJHtCVUlM VF9QUk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL0phdmFTY3JpcHRDb3JlXCIiLAotCQkJCQki XCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vTExJbnRPZmZzZXRzLyR7QVJDSFN9XCIiLAotCQkJCQki XCIkKEpBVkFTQ1JJUFRDT1JFX0ZSQU1FV09SS1NfRElSKS9KYXZhU2NyaXB0Q29yZS5mcmFtZXdv cmsvUHJpdmF0ZUhlYWRlcnNcIiIsCi0JCQkJCSIkKGluaGVyaXRlZCkiLAotCQkJCSk7CiAJCQl9 OwogCQkJbmFtZSA9IFByb2R1Y3Rpb247CiAJCX07CkBAIC0xMDg2MSwxMCArMTA4MzcsNiBAQAog CQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247CiAJCQliYXNlQ29uZmlndXJhdGlvblJlZmVy ZW5jZSA9IEJDMDIxQkYyMTM2OTAwQzMwMEZDNTQ2NyAvKiBUb29sRXhlY3V0YWJsZS54Y2NvbmZp ZyAqLzsKIAkJCWJ1aWxkU2V0dGluZ3MgPSB7Ci0JCQkJSEVBREVSX1NFQVJDSF9QQVRIUyA9ICgK LQkJCQkJIlwiJChKQVZBU0NSSVBUQ09SRV9GUkFNRVdPUktTX0RJUikvSmF2YVNjcmlwdENvcmUu ZnJhbWV3b3JrL1ByaXZhdGVIZWFkZXJzXCIiLAotCQkJCQkiJChpbmhlcml0ZWQpIiwKLQkJCQkp OwogCQkJfTsKIAkJCW5hbWUgPSBEZWJ1ZzsKIAkJfTsKQEAgLTEwODcyLDEwICsxMDg0NCw2IEBA CiAJCQlpc2EgPSBYQ0J1aWxkQ29uZmlndXJhdGlvbjsKIAkJCWJhc2VDb25maWd1cmF0aW9uUmVm ZXJlbmNlID0gQkMwMjFCRjIxMzY5MDBDMzAwRkM1NDY3IC8qIFRvb2xFeGVjdXRhYmxlLnhjY29u ZmlnICovOwogCQkJYnVpbGRTZXR0aW5ncyA9IHsKLQkJCQlIRUFERVJfU0VBUkNIX1BBVEhTID0g KAotCQkJCQkiXCIkKEpBVkFTQ1JJUFRDT1JFX0ZSQU1FV09SS1NfRElSKS9KYXZhU2NyaXB0Q29y ZS5mcmFtZXdvcmsvUHJpdmF0ZUhlYWRlcnNcIiIsCi0JCQkJCSIkKGluaGVyaXRlZCkiLAotCQkJ CSk7CiAJCQl9OwogCQkJbmFtZSA9IFJlbGVhc2U7CiAJCX07CkBAIC0xMDg4MywxMCArMTA4NTEs NiBAQAogCQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247CiAJCQliYXNlQ29uZmlndXJhdGlv blJlZmVyZW5jZSA9IEJDMDIxQkYyMTM2OTAwQzMwMEZDNTQ2NyAvKiBUb29sRXhlY3V0YWJsZS54 Y2NvbmZpZyAqLzsKIAkJCWJ1aWxkU2V0dGluZ3MgPSB7Ci0JCQkJSEVBREVSX1NFQVJDSF9QQVRI UyA9ICgKLQkJCQkJIlwiJChKQVZBU0NSSVBUQ09SRV9GUkFNRVdPUktTX0RJUikvSmF2YVNjcmlw dENvcmUuZnJhbWV3b3JrL1ByaXZhdGVIZWFkZXJzXCIiLAotCQkJCQkiJChpbmhlcml0ZWQpIiwK LQkJCQkpOwogCQkJfTsKIAkJCW5hbWUgPSBQcm9kdWN0aW9uOwogCQl9OwpAQCAtMTEwMDUsMTIg KzEwOTY5LDYgQEAKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwogCQkJYmFzZUNvbmZp Z3VyYXRpb25SZWZlcmVuY2UgPSBCQzAyMUJGMjEzNjkwMEMzMDBGQzU0NjcgLyogVG9vbEV4ZWN1 dGFibGUueGNjb25maWcgKi87CiAJCQlidWlsZFNldHRpbmdzID0gewotCQkJCUhFQURFUl9TRUFS Q0hfUEFUSFMgPSAoCi0JCQkJCSJcIiR7QlVJTFRfUFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNl cy9KYXZhU2NyaXB0Q29yZVwiIiwKLQkJCQkJIlwiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L0xMSW50 T2Zmc2V0cy8ke0FSQ0hTfVwiIiwKLQkJCQkJIlwiJChKQVZBU0NSSVBUQ09SRV9GUkFNRVdPUktT X0RJUikvSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrL1ByaXZhdGVIZWFkZXJzXCIiLAotCQkJCQki JChpbmhlcml0ZWQpIiwKLQkJCQkpOwogCQkJCVBST0RVQ1RfTkFNRSA9ICIkKFRBUkdFVF9OQU1F KSI7CiAJCQl9OwogCQkJbmFtZSA9IERlYnVnOwpAQCAtMTEwMTksMTIgKzEwOTc3LDYgQEAKIAkJ CWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwogCQkJYmFzZUNvbmZpZ3VyYXRpb25SZWZlcmVu Y2UgPSBCQzAyMUJGMjEzNjkwMEMzMDBGQzU0NjcgLyogVG9vbEV4ZWN1dGFibGUueGNjb25maWcg Ki87CiAJCQlidWlsZFNldHRpbmdzID0gewotCQkJCUhFQURFUl9TRUFSQ0hfUEFUSFMgPSAoCi0J CQkJCSJcIiR7QlVJTFRfUFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9KYXZhU2NyaXB0Q29y ZVwiIiwKLQkJCQkJIlwiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L0xMSW50T2Zmc2V0cy8ke0FSQ0hT fVwiIiwKLQkJCQkJIlwiJChKQVZBU0NSSVBUQ09SRV9GUkFNRVdPUktTX0RJUikvSmF2YVNjcmlw dENvcmUuZnJhbWV3b3JrL1ByaXZhdGVIZWFkZXJzXCIiLAotCQkJCQkiJChpbmhlcml0ZWQpIiwK LQkJCQkpOwogCQkJCVBST0RVQ1RfTkFNRSA9ICIkKFRBUkdFVF9OQU1FKSI7CiAJCQl9OwogCQkJ bmFtZSA9IFJlbGVhc2U7CkBAIC0xMTAzMywxMiArMTA5ODUsNiBAQAogCQkJaXNhID0gWENCdWls ZENvbmZpZ3VyYXRpb247CiAJCQliYXNlQ29uZmlndXJhdGlvblJlZmVyZW5jZSA9IEJDMDIxQkYy MTM2OTAwQzMwMEZDNTQ2NyAvKiBUb29sRXhlY3V0YWJsZS54Y2NvbmZpZyAqLzsKIAkJCWJ1aWxk U2V0dGluZ3MgPSB7Ci0JCQkJSEVBREVSX1NFQVJDSF9QQVRIUyA9ICgKLQkJCQkJIlwiJHtCVUlM VF9QUk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL0phdmFTY3JpcHRDb3JlXCIiLAotCQkJCQki XCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vTExJbnRPZmZzZXRzLyR7QVJDSFN9XCIiLAotCQkJCQki XCIkKEpBVkFTQ1JJUFRDT1JFX0ZSQU1FV09SS1NfRElSKS9KYXZhU2NyaXB0Q29yZS5mcmFtZXdv cmsvUHJpdmF0ZUhlYWRlcnNcIiIsCi0JCQkJCSIkKGluaGVyaXRlZCkiLAotCQkJCSk7CiAJCQkJ UFJPRFVDVF9OQU1FID0gIiQoVEFSR0VUX05BTUUpIjsKIAkJCX07CiAJCQluYW1lID0gUHJvZmls aW5nOwpAQCAtMTEwNDcsMTIgKzEwOTkzLDYgQEAKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0 aW9uOwogCQkJYmFzZUNvbmZpZ3VyYXRpb25SZWZlcmVuY2UgPSBCQzAyMUJGMjEzNjkwMEMzMDBG QzU0NjcgLyogVG9vbEV4ZWN1dGFibGUueGNjb25maWcgKi87CiAJCQlidWlsZFNldHRpbmdzID0g ewotCQkJCUhFQURFUl9TRUFSQ0hfUEFUSFMgPSAoCi0JCQkJCSJcIiR7QlVJTFRfUFJPRFVDVFNf RElSfS9EZXJpdmVkU291cmNlcy9KYXZhU2NyaXB0Q29yZVwiIiwKLQkJCQkJIlwiJHtCVUlMVF9Q Uk9EVUNUU19ESVJ9L0xMSW50T2Zmc2V0cy8ke0FSQ0hTfVwiIiwKLQkJCQkJIlwiJChKQVZBU0NS SVBUQ09SRV9GUkFNRVdPUktTX0RJUikvSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrL1ByaXZhdGVI ZWFkZXJzXCIiLAotCQkJCQkiJChpbmhlcml0ZWQpIiwKLQkJCQkpOwogCQkJCVBST0RVQ1RfTkFN RSA9ICIkKFRBUkdFVF9OQU1FKSI7CiAJCQl9OwogCQkJbmFtZSA9IFByb2R1Y3Rpb247CkBAIC0x MTI5NSwxMCArMTEyMzUsNiBAQAogCQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247CiAJCQli YXNlQ29uZmlndXJhdGlvblJlZmVyZW5jZSA9IEJDMDIxQkYyMTM2OTAwQzMwMEZDNTQ2NyAvKiBU b29sRXhlY3V0YWJsZS54Y2NvbmZpZyAqLzsKIAkJCWJ1aWxkU2V0dGluZ3MgPSB7Ci0JCQkJSEVB REVSX1NFQVJDSF9QQVRIUyA9ICgKLQkJCQkJIlwiJChKQVZBU0NSSVBUQ09SRV9GUkFNRVdPUktT X0RJUikvSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrL1ByaXZhdGVIZWFkZXJzXCIiLAotCQkJCQki JChpbmhlcml0ZWQpIiwKLQkJCQkpOwogCQkJfTsKIAkJCW5hbWUgPSBQcm9maWxpbmc7CiAJCX07 Cg==