From: Petri Latvala Subject: [PATCH i-g-t 1/1] meson: Refactor get_option() calls for directories Date: Mon, 15 Jan 2018 13:11:07 +0200 Message-ID: <20180115111107.1006-1-petri.latvala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id F1BE789F89 for ; Mon, 15 Jan 2018 11:11:17 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RmV0Y2ggdGhlIGNvbmZpZ3VyYXRpb24gdmFsdWVzIGluIHRoZSB0b3BsZXZlbCBtZXNvbi5idWls ZCBmb3IgYWxsCnN1YmRpcnMgdG8gc2hhcmUuCgpTaWduZWQtb2ZmLWJ5OiBQZXRyaSBMYXR2YWxh IDxwZXRyaS5sYXR2YWxhQGludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0 ZXJAZmZ3bGwuY2g+Ci0tLQogYXNzZW1ibGVyL21lc29uLmJ1aWxkICB8ICA4ICsrKy0tLS0tCiBi ZW5jaG1hcmtzL21lc29uLmJ1aWxkIHwgIDYgKysrKy0tCiBsaWIvbWVzb24uYnVpbGQgICAgICAg IHwgIDMgKy0tCiBtYW4vbWVzb24uYnVpbGQgICAgICAgIHwgIDIgKy0KIG1lc29uLmJ1aWxkICAg ICAgICAgICAgfCAgOSArKysrKysrKysKIHRlc3RzL21lc29uLmJ1aWxkICAgICAgfCAgNiArLS0t LS0KIHRvb2xzL21lc29uLmJ1aWxkICAgICAgfCAxNCArKysrKy0tLS0tLS0tLQogNyBmaWxlcyBj aGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9h c3NlbWJsZXIvbWVzb24uYnVpbGQgYi9hc3NlbWJsZXIvbWVzb24uYnVpbGQKaW5kZXggYjVhYzY3 OGQuLjc1MTdkODJmIDEwMDY0NAotLS0gYS9hc3NlbWJsZXIvbWVzb24uYnVpbGQKKysrIGIvYXNz ZW1ibGVyL21lc29uLmJ1aWxkCkBAIC0zNSwxMyArMzUsMTEgQEAgZXhlY3V0YWJsZSgnaW50ZWwt Z2VuNGFzbScsICdtYWluLmMnLCBsZmlsZXMsIHBmaWxlcywKIGV4ZWN1dGFibGUoJ2ludGVsLWdl bjRkaXNhc20nLCAnZGlzYXNtLW1haW4uYycsCiAJICAgbGlua193aXRoIDogbGliX2JydywgaW5z dGFsbCA6IHRydWUpCiAKLXBrZ2NvbmZpZ2RpciA9IGpvaW5fcGF0aHMoZ2V0X29wdGlvbignbGli ZGlyJyksICdwZ2tjb25maWcnKQotCiBjb25mX2RhdGEgPSBjb25maWd1cmF0aW9uX2RhdGEoKQot Y29uZl9kYXRhLnNldCgncHJlZml4JywgZ2V0X29wdGlvbigncHJlZml4JykpCitjb25mX2RhdGEu c2V0KCdwcmVmaXgnLCBwcmVmaXgpCiBjb25mX2RhdGEuc2V0KCdleGVjX3ByZWZpeCcsICcke3By ZWZpeH0nKQotY29uZl9kYXRhLnNldCgnbGliZGlyJywgam9pbl9wYXRocygnJHtwcmVmaXh9Jywg Z2V0X29wdGlvbignbGliZGlyJykpKQotY29uZl9kYXRhLnNldCgnaW5jbHVkZWRpcicsIGpvaW5f cGF0aHMoJyR7cHJlZml4fScsIGdldF9vcHRpb24oJ2luY2x1ZGVkaXInKSkpCitjb25mX2RhdGEu c2V0KCdsaWJkaXInLCBqb2luX3BhdGhzKCcke3ByZWZpeH0nLCBsaWJkaXIpKQorY29uZl9kYXRh LnNldCgnaW5jbHVkZWRpcicsIGpvaW5fcGF0aHMoJyR7cHJlZml4fScsIGluY2x1ZGVkaXIpKQog Y29uZl9kYXRhLnNldCgnVkVSU0lPTicsIG1lc29uLnByb2plY3RfdmVyc2lvbigpKQogY29uZmln dXJlX2ZpbGUoaW5wdXQgOiAnaW50ZWwtZ2VuNGFzbS5wYy5pbicsIG91dHB1dCA6ICdpbnRlbC1n ZW40YXNtLnBjJywKIAkgICAgICAgY29uZmlndXJhdGlvbiA6IGNvbmZfZGF0YSwgaW5zdGFsbF9k aXIgOiBwa2djb25maWdkaXIpCmRpZmYgLS1naXQgYS9iZW5jaG1hcmtzL21lc29uLmJ1aWxkIGIv YmVuY2htYXJrcy9tZXNvbi5idWlsZAppbmRleCAyNmQ2NWM0Yi4uMjc4MzZjMWQgMTAwNjQ0Ci0t LSBhL2JlbmNobWFya3MvbWVzb24uYnVpbGQKKysrIGIvYmVuY2htYXJrcy9tZXNvbi5idWlsZApA QCAtMjcsMTYgKzI3LDE4IEBAIGlmIGxpYmRybV9pbnRlbC5mb3VuZCgpCiAJXQogZW5kaWYKIAor YmVuY2htYXJrc2RpciA9IGpvaW5fcGF0aHMobGliZXhlY2RpciwgJ2JlbmNobWFya3MnKQorCiBm b3JlYWNoIHByb2cgOiBiZW5jaG1hcmtfcHJvZ3MKIAkjIEZJWE1FIG1lc29uIGRvZXNuJ3QgbGlr ZSBiaW5hcmllcyB3aXRoIHRoZSBzYW1lIG5hbWUKIAkjIG1lYW53aGlsZSBqdXN0IHN1ZmZpeCB3 aXRoIF9iZW5jaAogCWV4ZWN1dGFibGUocHJvZyArICdfYmVuY2gnLCBwcm9nICsgJy5jJywKIAkJ ICAgaW5zdGFsbCA6IHRydWUsCi0JCSAgIGluc3RhbGxfZGlyIDogam9pbl9wYXRocyhnZXRfb3B0 aW9uKCdsaWJleGVjZGlyJyksICdpbnRlbC1ncHUtdG9vbHMnLCAnYmVuY2htYXJrcycpLAorCQkg ICBpbnN0YWxsX2RpciA6IGJlbmNobWFya3NkaXIsCiAJCSAgIGRlcGVuZGVuY2llcyA6IHRlc3Rf ZGVwcykKIGVuZGZvcmVhY2gKIAogZXhlY3V0YWJsZSgnZ2VtX3dzaW1fYmVuY2gnLCAnZ2VtX3dz aW0uYycsCiAJICAgaW5zdGFsbCA6IHRydWUsCi0JICAgaW5zdGFsbF9kaXIgOiBqb2luX3BhdGhz KGdldF9vcHRpb24oJ2xpYmV4ZWNkaXInKSwgJ2ludGVsLWdwdS10b29scycsICdiZW5jaG1hcmtz JyksCisJICAgaW5zdGFsbF9kaXIgOiBiZW5jaG1hcmtzZGlyLAogCSAgIGRlcGVuZGVuY2llcyA6 IHRlc3RfZGVwcyArIFsgbGliX2lndF9wZXJmIF0pCmRpZmYgLS1naXQgYS9saWIvbWVzb24uYnVp bGQgYi9saWIvbWVzb24uYnVpbGQKaW5kZXggMzExZTIzNDIuLmIzYmJjMzExIDEwMDY0NAotLS0g YS9saWIvbWVzb24uYnVpbGQKKysrIGIvbGliL21lc29uLmJ1aWxkCkBAIC0xNDUsNyArMTQ1LDYg QEAgaWYgY2hhbWVsaXVtLmZvdW5kKCkKIAlsaWJfc291cmNlcyArPSAnaWd0X2NoYW1lbGl1bS5j JwogZW5kaWYKIAotcGtnZGF0YWRpciA9IGpvaW5fcGF0aHMoZ2V0X29wdGlvbigncHJlZml4Jyks IGdldF9vcHRpb24oJ2RhdGFkaXInKSwgJ2ludGVsLWdwdS10b29scycpCiBzcmNkaXIgPSBqb2lu X3BhdGhzKG1lc29uLnNvdXJjZV9yb290KCksICd0ZXN0cycpCiAKIGxpYl92ZXJzaW9uID0gdmNz X3RhZyhpbnB1dCA6ICd2ZXJzaW9uLmguaW4nLCBvdXRwdXQgOiAndmVyc2lvbi5oJywKQEAgLTE2 MCw3ICsxNTksNyBAQCBmb3JlYWNoIGY6IGxpYl9zb3VyY2VzCiAJaW5jbHVkZV9kaXJlY3Rvcmll czogaW5jLAogCWRlcGVuZGVuY2llcyA6IGxpYl9kZXBzLAogCWNfYXJncyA6IFsKLQkgICAgJy1E SUdUX0RBVEFESVI9IkAwQCInLmZvcm1hdChwa2dkYXRhZGlyKSwKKwkgICAgJy1ESUdUX0RBVEFE SVI9IkAwQCInLmZvcm1hdChkYXRhZGlyKSwKIAkgICAgJy1ESUdUX1NSQ0RJUj0iQDBAIicuZm9y bWF0KHNyY2RpciksCiAJICAgICctRElHVF9MT0dfRE9NQUlOPSJAMEAiJy5mb3JtYXQoZi5zcGxp dCgnLicpWzBdKSwKIAldKQpkaWZmIC0tZ2l0IGEvbWFuL21lc29uLmJ1aWxkIGIvbWFuL21lc29u LmJ1aWxkCmluZGV4IDM1MWQwMjViLi40OWIwNjg2YSAxMDA2NDQKLS0tIGEvbWFuL21lc29uLmJ1 aWxkCisrKyBiL21hbi9tZXNvbi5idWlsZApAQCAtMzQsNiArMzQsNiBAQCBpZiByc3QybWFuLmZv dW5kKCkKIAkJCQlpbnB1dDogbWFucGFnZSArICcucnN0JywKIAkJCQlvdXRwdXQgOiBtYW5wYWdl ICsgJy4xLmd6JywKIAkJCQlpbnN0YWxsIDogdHJ1ZSwKLQkJCQlpbnN0YWxsX2RpciA6IGpvaW5f cGF0aHMoZ2V0X29wdGlvbignbWFuZGlyJyksICdtYW4xJykpCisJCQkJaW5zdGFsbF9kaXIgOiBq b2luX3BhdGhzKG1hbmRpciwgJ21hbjEnKSkKIAllbmRmb3JlYWNoCiBlbmRpZgpkaWZmIC0tZ2l0 IGEvbWVzb24uYnVpbGQgYi9tZXNvbi5idWlsZAppbmRleCAwOTUwZDNjNy4uZDQwM2JhNWIgMTAw NjQ0Ci0tLSBhL21lc29uLmJ1aWxkCisrKyBiL21lc29uLmJ1aWxkCkBAIC0xMjcsNiArMTI3LDE1 IEBAIGNvbmZpZy5zZXRfcXVvdGVkKCdUQVJHRVRfQ1BVX1BMQVRGT1JNJywgaG9zdF9tYWNoaW5l LmNwdV9mYW1pbHkoKSkKIAogY29uZmlndXJlX2ZpbGUob3V0cHV0OiAnY29uZmlnLmgnLCBpbnN0 YWxsOiBmYWxzZSwgY29uZmlndXJhdGlvbjogY29uZmlnKQogCitwcmVmaXggPSBnZXRfb3B0aW9u KCdwcmVmaXgnKQorYmluZGlyID0gZ2V0X29wdGlvbignYmluZGlyJykKK2RhdGFkaXIgPSBqb2lu X3BhdGhzKGdldF9vcHRpb24oJ2RhdGFkaXInKSwgJ2ludGVsLWdwdS10b29scycpCitpbmNsdWRl ZGlyID0gZ2V0X29wdGlvbignaW5jbHVkZWRpcicpCitsaWJkaXIgPSBnZXRfb3B0aW9uKCdsaWJk aXInKQorbGliZXhlY2RpciA9IGpvaW5fcGF0aHMoZ2V0X29wdGlvbignbGliZXhlY2RpcicpLCAn aW50ZWwtZ3B1LXRvb2xzJykKK21hbmRpciA9IGdldF9vcHRpb24oJ21hbmRpcicpCitwa2djb25m aWdkaXIgPSBqb2luX3BhdGhzKGxpYmRpciwgJ3BrZ2NvbmZpZycpCisKIHN1YmRpcignbGliJykK IHN1YmRpcigndGVzdHMnKQogc3ViZGlyKCdiZW5jaG1hcmtzJykKZGlmZiAtLWdpdCBhL3Rlc3Rz L21lc29uLmJ1aWxkIGIvdGVzdHMvbWVzb24uYnVpbGQKaW5kZXggNGM0YmVlMWQuLjIzMjIyMTdk IDEwMDY0NAotLS0gYS90ZXN0cy9tZXNvbi5idWlsZAorKysgYi90ZXN0cy9tZXNvbi5idWlsZApA QCAtMjU1LDggKzI1NSw2IEBAIGlmIGFsc2EuZm91bmQoKSBhbmQgZ3NsLmZvdW5kKCkKIAl0ZXN0 X2RlcHMgKz0gYWxzYQogZW5kaWYKIAotbGliZXhlY2RpciA9IGpvaW5fcGF0aHMoZ2V0X29wdGlv bigncHJlZml4JyksIGdldF9vcHRpb24oJ2xpYmV4ZWNkaXInKSwgJ2ludGVsLWdwdS10b29scycp Ci0KIHRlc3RfZXhlY3V0YWJsZXMgPSBbXQogCiBmb3JlYWNoIHByb2cgOiB0ZXN0X3Byb2dzCkBA IC0yNzgsOCArMjc2LDYgQEAgZXhlY3V0YWJsZSgndGVzdGRpc3BsYXknLCBbJ3Rlc3RkaXNwbGF5 LmMnLCAndGVzdGRpc3BsYXlfaG90cGx1Zy5jJ10sCiAJICAgaW5zdGFsbCA6IHRydWUpCiB0ZXN0 X3Byb2dzICs9ICd0ZXN0ZGlzcGxheScKIAotcGtnZGF0YWRpciA9IGpvaW5fcGF0aHMoZ2V0X29w dGlvbigncHJlZml4JyksIGdldF9vcHRpb24oJ2RhdGFkaXInKSwgJ2ludGVsLWdwdS10b29scycp Ci0KIGdlbl90ZXN0bGlzdCA9IGZpbmRfcHJvZ3JhbSgnZ2VuZXJhdGVfdGVzdGxpc3Quc2gnKQog dGVzdF9saXN0ID0gY3VzdG9tX3RhcmdldCgndGVzdGxpc3QnLAogCSAgICAgIG91dHB1dCA6ICd0 ZXN0LWxpc3QudHh0JywKQEAgLTMxOCw2ICszMTQsNiBAQCBpbWFnZV9maWxlcyA9IFsKICAgJzEw ODBwLXJpZ2h0LnBuZycsCiAgICdwYXNzLnBuZycsCiBdCi1pbnN0YWxsX2RhdGEoc291cmNlcyA6 IGltYWdlX2ZpbGVzLCBpbnN0YWxsX2RpciA6IHBrZ2RhdGFkaXIpCitpbnN0YWxsX2RhdGEoc291 cmNlcyA6IGltYWdlX2ZpbGVzLCBpbnN0YWxsX2RpciA6IGRhdGFkaXIpCiAKIHN1YmRpcignaW50 ZWwtY2knKQpkaWZmIC0tZ2l0IGEvdG9vbHMvbWVzb24uYnVpbGQgYi90b29scy9tZXNvbi5idWls ZAppbmRleCA3ZmM1MzkwYS4uZGY2NWUwZjggMTAwNjQ0Ci0tLSBhL3Rvb2xzL21lc29uLmJ1aWxk CisrKyBiL3Rvb2xzL21lc29uLmJ1aWxkCkBAIC01NSw4ICs1NSw2IEBAIGZvcmVhY2ggcHJvZyA6 IHRvb2xzX3Byb2dzCiAJCSAgIGluc3RhbGwgOiB0cnVlKQogZW5kZm9yZWFjaAogCi1wa2dkYXRh ZGlyID0gam9pbl9wYXRocyhnZXRfb3B0aW9uKCdwcmVmaXgnKSwgZ2V0X29wdGlvbignZGF0YWRp cicpLCAnaW50ZWwtZ3B1LXRvb2xzJykKLQogaWYgbGlidWRldi5mb3VuZCgpCiAJaW50ZWxfZHBf Y29tcGxpYW5jZV9zcmMgPSBbCiAJCSdpbnRlbF9kcF9jb21wbGlhbmNlLmMnLApAQCAtNzcsMTQg Kzc1LDEyIEBAIGV4ZWN1dGFibGUoJ2ludGVsX3JlZycsIHNvdXJjZXMgOiBpbnRlbF9yZWdfc3Jj LAogCSAgIGRlcGVuZGVuY2llcyA6IHRvb2xfZGVwcywKIAkgICBpbnN0YWxsIDogdHJ1ZSwKIAkg ICBjX2FyZ3MgOiBbCi0JICAgICAnLURJR1RfREFUQURJUj0iQDBAIicuZm9ybWF0KHBrZ2RhdGFk aXIpLAorCSAgICAgJy1ESUdUX0RBVEFESVI9IkAwQCInLmZvcm1hdChkYXRhZGlyKSwKIAkgICBd KQogCi1iaW5kaXIgPSBqb2luX3BhdGhzKGdldF9vcHRpb24oJ3ByZWZpeCcpLCBnZXRfb3B0aW9u KCdiaW5kaXInKSkKLQogaW5zdGFsbF9kYXRhKCdpbnRlbF9ncHVfYWJydCcsIGluc3RhbGxfZGly IDogYmluZGlyKQogCi1pbnN0YWxsX3N1YmRpcigncmVnaXN0ZXJzJywgaW5zdGFsbF9kaXIgOiBw a2dkYXRhZGlyLAoraW5zdGFsbF9zdWJkaXIoJ3JlZ2lzdGVycycsIGluc3RhbGxfZGlyIDogZGF0 YWRpciwKIAkgICAgICAgZXhjbHVkZV9maWxlcyA6IFsKIAkJICdNYWtlZmlsZScsICdNYWtlZmls ZS5pbicsICdNYWtlZmlsZS5hbScsCiAJICAgICAgIF0pCkBAIC05NSwxMCArOTEsMTAgQEAgc2hh cmVkX2xpYnJhcnkoJ2ludGVsX2F1YmR1bXAnLCAnYXViZHVtcC5jJywKIAkgICAgICAgaW5zdGFs bCA6IHRydWUpCiAKIGNvbmZfZGF0YSA9IGNvbmZpZ3VyYXRpb25fZGF0YSgpCi1jb25mX2RhdGEu c2V0KCdwcmVmaXgnLCBnZXRfb3B0aW9uKCdwcmVmaXgnKSkKK2NvbmZfZGF0YS5zZXQoJ3ByZWZp eCcsIHByZWZpeCkKIGNvbmZfZGF0YS5zZXQoJ2V4ZWNfcHJlZml4JywgJyR7cHJlZml4fScpCi1j b25mX2RhdGEuc2V0KCdsaWJkaXInLCBqb2luX3BhdGhzKCcke3ByZWZpeH0nLCBnZXRfb3B0aW9u KCdsaWJkaXInKSkpCitjb25mX2RhdGEuc2V0KCdsaWJkaXInLCBqb2luX3BhdGhzKCcke3ByZWZp eH0nLCBsaWJkaXIpKQogY29uZmlndXJlX2ZpbGUoaW5wdXQgOiAnaW50ZWxfYXViZHVtcC5pbics IG91dHB1dCA6ICdpbnRlbF9hdWJkdW1wJywKLSAgICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb24g OiBjb25mX2RhdGEsIGluc3RhbGxfZGlyIDogZ2V0X29wdGlvbignYmluZGlyJykpCisgICAgICAg ICAgICAgICBjb25maWd1cmF0aW9uIDogY29uZl9kYXRhLCBpbnN0YWxsX2RpciA6IGJpbmRpcikK IAogc3ViZGlyKCdudWxsX3N0YXRlX2dlbicpCi0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=