From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petri Latvala Subject: [PATCH i-g-t v2 1/1] meson: Refactor get_option() calls for directories Date: Mon, 15 Jan 2018 13:14:56 +0200 Message-ID: <20180115111456.1674-1-petri.latvala@intel.com> References: <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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 884FE89F1B for ; Mon, 15 Jan 2018 11:15:00 +0000 (UTC) In-Reply-To: <20180115111107.1006-1-petri.latvala@intel.com> 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 ZCBmb3IgYWxsCnN1YmRpcnMgdG8gc2hhcmUuCgp2MjogQWxzbyByZW1lbWJlciB0ZXN0cy9pbnRl bC1jaS9tZXNvbi5idWlsZAoKU2lnbmVkLW9mZi1ieTogUGV0cmkgTGF0dmFsYSA8cGV0cmkubGF0 dmFsYUBpbnRlbC5jb20+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNo PgotLS0KIGFzc2VtYmxlci9tZXNvbi5idWlsZCAgICAgIHwgIDggKysrLS0tLS0KIGJlbmNobWFy a3MvbWVzb24uYnVpbGQgICAgIHwgIDYgKysrKy0tCiBsaWIvbWVzb24uYnVpbGQgICAgICAgICAg ICB8ICAzICstLQogbWFuL21lc29uLmJ1aWxkICAgICAgICAgICAgfCAgMiArLQogbWVzb24uYnVp bGQgICAgICAgICAgICAgICAgfCAgOSArKysrKysrKysKIHRlc3RzL2ludGVsLWNpL21lc29uLmJ1 aWxkIHwgIDIgKy0KIHRlc3RzL21lc29uLmJ1aWxkICAgICAgICAgIHwgIDYgKy0tLS0tCiB0b29s cy9tZXNvbi5idWlsZCAgICAgICAgICB8IDE0ICsrKysrLS0tLS0tLS0tCiA4IGZpbGVzIGNoYW5n ZWQsIDI1IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Fzc2Vt Ymxlci9tZXNvbi5idWlsZCBiL2Fzc2VtYmxlci9tZXNvbi5idWlsZAppbmRleCBiNWFjNjc4ZC4u NzUxN2Q4MmYgMTAwNjQ0Ci0tLSBhL2Fzc2VtYmxlci9tZXNvbi5idWlsZAorKysgYi9hc3NlbWJs ZXIvbWVzb24uYnVpbGQKQEAgLTM1LDEzICszNSwxMSBAQCBleGVjdXRhYmxlKCdpbnRlbC1nZW40 YXNtJywgJ21haW4uYycsIGxmaWxlcywgcGZpbGVzLAogZXhlY3V0YWJsZSgnaW50ZWwtZ2VuNGRp c2FzbScsICdkaXNhc20tbWFpbi5jJywKIAkgICBsaW5rX3dpdGggOiBsaWJfYnJ3LCBpbnN0YWxs IDogdHJ1ZSkKIAotcGtnY29uZmlnZGlyID0gam9pbl9wYXRocyhnZXRfb3B0aW9uKCdsaWJkaXIn KSwgJ3Bna2NvbmZpZycpCi0KIGNvbmZfZGF0YSA9IGNvbmZpZ3VyYXRpb25fZGF0YSgpCi1jb25m X2RhdGEuc2V0KCdwcmVmaXgnLCBnZXRfb3B0aW9uKCdwcmVmaXgnKSkKK2NvbmZfZGF0YS5zZXQo J3ByZWZpeCcsIHByZWZpeCkKIGNvbmZfZGF0YS5zZXQoJ2V4ZWNfcHJlZml4JywgJyR7cHJlZml4 fScpCi1jb25mX2RhdGEuc2V0KCdsaWJkaXInLCBqb2luX3BhdGhzKCcke3ByZWZpeH0nLCBnZXRf b3B0aW9uKCdsaWJkaXInKSkpCi1jb25mX2RhdGEuc2V0KCdpbmNsdWRlZGlyJywgam9pbl9wYXRo cygnJHtwcmVmaXh9JywgZ2V0X29wdGlvbignaW5jbHVkZWRpcicpKSkKK2NvbmZfZGF0YS5zZXQo J2xpYmRpcicsIGpvaW5fcGF0aHMoJyR7cHJlZml4fScsIGxpYmRpcikpCitjb25mX2RhdGEuc2V0 KCdpbmNsdWRlZGlyJywgam9pbl9wYXRocygnJHtwcmVmaXh9JywgaW5jbHVkZWRpcikpCiBjb25m X2RhdGEuc2V0KCdWRVJTSU9OJywgbWVzb24ucHJvamVjdF92ZXJzaW9uKCkpCiBjb25maWd1cmVf ZmlsZShpbnB1dCA6ICdpbnRlbC1nZW40YXNtLnBjLmluJywgb3V0cHV0IDogJ2ludGVsLWdlbjRh c20ucGMnLAogCSAgICAgICBjb25maWd1cmF0aW9uIDogY29uZl9kYXRhLCBpbnN0YWxsX2RpciA6 IHBrZ2NvbmZpZ2RpcikKZGlmZiAtLWdpdCBhL2JlbmNobWFya3MvbWVzb24uYnVpbGQgYi9iZW5j aG1hcmtzL21lc29uLmJ1aWxkCmluZGV4IDI2ZDY1YzRiLi4yNzgzNmMxZCAxMDA2NDQKLS0tIGEv YmVuY2htYXJrcy9tZXNvbi5idWlsZAorKysgYi9iZW5jaG1hcmtzL21lc29uLmJ1aWxkCkBAIC0y NywxNiArMjcsMTggQEAgaWYgbGliZHJtX2ludGVsLmZvdW5kKCkKIAldCiBlbmRpZgogCitiZW5j aG1hcmtzZGlyID0gam9pbl9wYXRocyhsaWJleGVjZGlyLCAnYmVuY2htYXJrcycpCisKIGZvcmVh Y2ggcHJvZyA6IGJlbmNobWFya19wcm9ncwogCSMgRklYTUUgbWVzb24gZG9lc24ndCBsaWtlIGJp bmFyaWVzIHdpdGggdGhlIHNhbWUgbmFtZQogCSMgbWVhbndoaWxlIGp1c3Qgc3VmZml4IHdpdGgg X2JlbmNoCiAJZXhlY3V0YWJsZShwcm9nICsgJ19iZW5jaCcsIHByb2cgKyAnLmMnLAogCQkgICBp bnN0YWxsIDogdHJ1ZSwKLQkJICAgaW5zdGFsbF9kaXIgOiBqb2luX3BhdGhzKGdldF9vcHRpb24o J2xpYmV4ZWNkaXInKSwgJ2ludGVsLWdwdS10b29scycsICdiZW5jaG1hcmtzJyksCisJCSAgIGlu c3RhbGxfZGlyIDogYmVuY2htYXJrc2RpciwKIAkJICAgZGVwZW5kZW5jaWVzIDogdGVzdF9kZXBz KQogZW5kZm9yZWFjaAogCiBleGVjdXRhYmxlKCdnZW1fd3NpbV9iZW5jaCcsICdnZW1fd3NpbS5j JywKIAkgICBpbnN0YWxsIDogdHJ1ZSwKLQkgICBpbnN0YWxsX2RpciA6IGpvaW5fcGF0aHMoZ2V0 X29wdGlvbignbGliZXhlY2RpcicpLCAnaW50ZWwtZ3B1LXRvb2xzJywgJ2JlbmNobWFya3MnKSwK KwkgICBpbnN0YWxsX2RpciA6IGJlbmNobWFya3NkaXIsCiAJICAgZGVwZW5kZW5jaWVzIDogdGVz dF9kZXBzICsgWyBsaWJfaWd0X3BlcmYgXSkKZGlmZiAtLWdpdCBhL2xpYi9tZXNvbi5idWlsZCBi L2xpYi9tZXNvbi5idWlsZAppbmRleCAzMTFlMjM0Mi4uYjNiYmMzMTEgMTAwNjQ0Ci0tLSBhL2xp Yi9tZXNvbi5idWlsZAorKysgYi9saWIvbWVzb24uYnVpbGQKQEAgLTE0NSw3ICsxNDUsNiBAQCBp ZiBjaGFtZWxpdW0uZm91bmQoKQogCWxpYl9zb3VyY2VzICs9ICdpZ3RfY2hhbWVsaXVtLmMnCiBl bmRpZgogCi1wa2dkYXRhZGlyID0gam9pbl9wYXRocyhnZXRfb3B0aW9uKCdwcmVmaXgnKSwgZ2V0 X29wdGlvbignZGF0YWRpcicpLCAnaW50ZWwtZ3B1LXRvb2xzJykKIHNyY2RpciA9IGpvaW5fcGF0 aHMobWVzb24uc291cmNlX3Jvb3QoKSwgJ3Rlc3RzJykKIAogbGliX3ZlcnNpb24gPSB2Y3NfdGFn KGlucHV0IDogJ3ZlcnNpb24uaC5pbicsIG91dHB1dCA6ICd2ZXJzaW9uLmgnLApAQCAtMTYwLDcg KzE1OSw3IEBAIGZvcmVhY2ggZjogbGliX3NvdXJjZXMKIAlpbmNsdWRlX2RpcmVjdG9yaWVzOiBp bmMsCiAJZGVwZW5kZW5jaWVzIDogbGliX2RlcHMsCiAJY19hcmdzIDogWwotCSAgICAnLURJR1Rf REFUQURJUj0iQDBAIicuZm9ybWF0KHBrZ2RhdGFkaXIpLAorCSAgICAnLURJR1RfREFUQURJUj0i QDBAIicuZm9ybWF0KGRhdGFkaXIpLAogCSAgICAnLURJR1RfU1JDRElSPSJAMEAiJy5mb3JtYXQo c3JjZGlyKSwKIAkgICAgJy1ESUdUX0xPR19ET01BSU49IkAwQCInLmZvcm1hdChmLnNwbGl0KCcu JylbMF0pLAogCV0pCmRpZmYgLS1naXQgYS9tYW4vbWVzb24uYnVpbGQgYi9tYW4vbWVzb24uYnVp bGQKaW5kZXggMzUxZDAyNWIuLjQ5YjA2ODZhIDEwMDY0NAotLS0gYS9tYW4vbWVzb24uYnVpbGQK KysrIGIvbWFuL21lc29uLmJ1aWxkCkBAIC0zNCw2ICszNCw2IEBAIGlmIHJzdDJtYW4uZm91bmQo KQogCQkJCWlucHV0OiBtYW5wYWdlICsgJy5yc3QnLAogCQkJCW91dHB1dCA6IG1hbnBhZ2UgKyAn LjEuZ3onLAogCQkJCWluc3RhbGwgOiB0cnVlLAotCQkJCWluc3RhbGxfZGlyIDogam9pbl9wYXRo cyhnZXRfb3B0aW9uKCdtYW5kaXInKSwgJ21hbjEnKSkKKwkJCQlpbnN0YWxsX2RpciA6IGpvaW5f cGF0aHMobWFuZGlyLCAnbWFuMScpKQogCWVuZGZvcmVhY2gKIGVuZGlmCmRpZmYgLS1naXQgYS9t ZXNvbi5idWlsZCBiL21lc29uLmJ1aWxkCmluZGV4IDA5NTBkM2M3Li5kNDAzYmE1YiAxMDA2NDQK LS0tIGEvbWVzb24uYnVpbGQKKysrIGIvbWVzb24uYnVpbGQKQEAgLTEyNyw2ICsxMjcsMTUgQEAg Y29uZmlnLnNldF9xdW90ZWQoJ1RBUkdFVF9DUFVfUExBVEZPUk0nLCBob3N0X21hY2hpbmUuY3B1 X2ZhbWlseSgpKQogCiBjb25maWd1cmVfZmlsZShvdXRwdXQ6ICdjb25maWcuaCcsIGluc3RhbGw6 IGZhbHNlLCBjb25maWd1cmF0aW9uOiBjb25maWcpCiAKK3ByZWZpeCA9IGdldF9vcHRpb24oJ3By ZWZpeCcpCitiaW5kaXIgPSBnZXRfb3B0aW9uKCdiaW5kaXInKQorZGF0YWRpciA9IGpvaW5fcGF0 aHMoZ2V0X29wdGlvbignZGF0YWRpcicpLCAnaW50ZWwtZ3B1LXRvb2xzJykKK2luY2x1ZGVkaXIg PSBnZXRfb3B0aW9uKCdpbmNsdWRlZGlyJykKK2xpYmRpciA9IGdldF9vcHRpb24oJ2xpYmRpcicp CitsaWJleGVjZGlyID0gam9pbl9wYXRocyhnZXRfb3B0aW9uKCdsaWJleGVjZGlyJyksICdpbnRl bC1ncHUtdG9vbHMnKQorbWFuZGlyID0gZ2V0X29wdGlvbignbWFuZGlyJykKK3BrZ2NvbmZpZ2Rp ciA9IGpvaW5fcGF0aHMobGliZGlyLCAncGtnY29uZmlnJykKKwogc3ViZGlyKCdsaWInKQogc3Vi ZGlyKCd0ZXN0cycpCiBzdWJkaXIoJ2JlbmNobWFya3MnKQpkaWZmIC0tZ2l0IGEvdGVzdHMvaW50 ZWwtY2kvbWVzb24uYnVpbGQgYi90ZXN0cy9pbnRlbC1jaS9tZXNvbi5idWlsZAppbmRleCA1Mzk0 YTJmZi4uYjNhYmI4NDggMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ludGVsLWNpL21lc29uLmJ1aWxkCisr KyBiL3Rlc3RzL2ludGVsLWNpL21lc29uLmJ1aWxkCkBAIC01LDQgKzUsNCBAQCBpbnRlbGNpX2Zp bGVzID0gWwogICAnUkVBRE1FJywKIF0KIAotaW5zdGFsbF9kYXRhKHNvdXJjZXMgOiBpbnRlbGNp X2ZpbGVzLCBpbnN0YWxsX2RpciA6IHBrZ2RhdGFkaXIpCitpbnN0YWxsX2RhdGEoc291cmNlcyA6 IGludGVsY2lfZmlsZXMsIGluc3RhbGxfZGlyIDogZGF0YWRpcikKZGlmZiAtLWdpdCBhL3Rlc3Rz 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=