110215 2013-02-19 06:18:58 -0800 [Qt] Skip the build with a warning if certain tools cannot be found in the PATH 2013-02-19 06:45:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann hausmann abecsi vestbo webkit.review.bot oldest_to_newest 836309 0 hausmann 2013-02-19 06:18:58 -0800 [Qt] Skip the build with a warning if certain tools cannot be found in the PATH 836311 1 189073 hausmann 2013-02-19 06:20:57 -0800 Created attachment 189073 Patch 836330 2 189073 ossi 2013-02-19 06:36:28 -0800 Comment on attachment 189073 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189073&action=review > Tools/qmake/mkspecs/features/configure.prf:120 > + for(program, requiredPrograms):!programExistsInPath($$program) { weird style. either put it all on one line, or nest properly. consider line continuations: for(): \ !exists(): \ addReason() > Tools/qmake/mkspecs/features/configure.prf:240 > + log("$${EOL}The WebKit build is unfortunately disabled for the following reasons: " $$skipBuildReason "$${EOL}$${EOL}") "was disabled". omit the "unfortunately", it feels ridiculous to read something like that. it's not necessary to "interrupt" the quoting. > Tools/qmake/mkspecs/features/functions.prf:207 > + unset(program) remove this line > Tools/qmake/mkspecs/features/functions.prf:211 > + PATH="$$(PATH)" should add spaces around the equal signs. everywhere. > Tools/qmake/mkspecs/features/functions.prf:215 > + exists($$GNUTOOLS_DIR): paths = $$paths $$GNUTOOLS_DIR paths += > Tools/qmake/mkspecs/features/functions.prf:217 > + for(p, paths): exists($$p$$QMAKE_DIR_SEP$$program):return(true) just use slash for the separator > Tools/qmake/mkspecs/features/functions.prf:222 > + skipBuildReason = $$skipBuildReason$${EOL}" * "$$1 i think it would be cleaner to put the entire string into quotes instead 836341 3 hausmann 2013-02-19 06:45:27 -0800 Landed with Ossi's proposed changes Committed r143326: <http://trac.webkit.org/changeset/143326> 189073 2013-02-19 06:20:57 -0800 2013-02-19 06:36:28 -0800 Patch bug-110215-20130219151835.patch text/plain 3552 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMzA4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWIyMDFhNmUwMDVlN2IxODQzNjQ4Yzk1ZjZlNTU1OWI4 NDcxMzNkNC4uZTJjZTgzNzZhYzM1ZWFlZjE0ZDdiNTE3Yzg0OTAxMDE2MzdjMWVkZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEzLTAyLTE5ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQGRpZ2lhLmNv bT4KKworICAgICAgICBbUXRdIFNraXAgdGhlIGJ1aWxkIHdpdGggYSB3YXJuaW5nIGlmIGNlcnRh aW4gdG9vbHMgY2Fubm90IGJlIGZvdW5kIGluIHRoZSBQQVRICisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAyMTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGVjayB0aGF0IGdwZXJmLCBweXRob24sIHJ1 YnksIHBlcmwsIGJpc29uIGFuZCBmbGV4IGFyZSBpbiB0aGUgUEFUSCBiZWZvcmUKKyAgICAgICAg Y29udGludWluZyB0aGUgYnVpbGQuIE90aGVyd2lzZSBza2lwIHdpdGggYW4gZXJyb3IgbWVzc2Fn ZSBleHBsYWluaW5nIHdoaWNoCisgICAgICAgIHByb2dyYW1zIGFyZSBtaXNzaW5nIGZyb20gdGhl IGJ1aWxkLgorCisgICAgICAgICogcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9jb25maWd1cmUucHJm OgorICAgICAgICAqIHFtYWtlL21rc3BlY3MvZmVhdHVyZXMvZnVuY3Rpb25zLnByZjoKKwogMjAx My0wMi0xOCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZC4gQWRqdXN0IGV4cGVjdGF0aW9ucy4KZGlmZiAtLWdpdCBhL1Rvb2xzL3Ft YWtlL21rc3BlY3MvZmVhdHVyZXMvY29uZmlndXJlLnByZiBiL1Rvb2xzL3FtYWtlL21rc3BlY3Mv ZmVhdHVyZXMvY29uZmlndXJlLnByZgppbmRleCA0MzAyZmM5NzU5M2Y0YTIwYjYyZTJlN2EwYmFl NTYyNjVjYWZlYjdlLi5kNjc4OWY0OTc2NmU2ZGM1Njk4ZjJhZDcwMzYzZGE3MGIzODAyNzEzIDEw MDY0NAotLS0gYS9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2NvbmZpZ3VyZS5wcmYKKysr IGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9jb25maWd1cmUucHJmCkBAIC0xMTEsMTAg KzExMSwxNCBAQCBkZWZpbmVUZXN0KGZpbmFsaXplQ29uZmlndXJlKSB7CiAKICAgICAjIFNhbml0 eSBjaGVja3MgdGhhdCB3b3VsZCBwcmV2ZW50IHVzIGZyb20gYnVpbGRpbmcgdGhlIHdob2xlIHBy b2plY3QgYWx0b2dldGhlci4KICAgICAhbWFjOiFjb250YWlucyhRVF9DT05GSUcsaWN1KSB7Ci0g ICAgICAgIHNraXBCdWlsZFJlYXNvbiA9ICJJQ1UgaXMgcmVxdWlyZWQuIFRvIGJ1aWxkIFF0V2Vi S2l0IHdpdGggUXQgNSB5b3UgbmVlZCB0byBidWlsZCBRdCA1IHdpdGggbGliSUNVIHN1cHBvcnQu IENoZWNrIGZvciBJQ1Ugc3VwcG9ydCBiZWluZyBtZW50aW9uZWQgaW4gcXRiYXNlL2NvbmZpZy5z dW1tYXJ5LiIpCisgICAgICAgIGFkZFJlYXNvbkZvclNraXBwaW5nQnVpbGQoIklDVSBpcyByZXF1 aXJlZC4gVG8gYnVpbGQgUXRXZWJLaXQgd2l0aCBRdCA1IHlvdSBuZWVkIHRvIGJ1aWxkIFF0IDUg d2l0aCBsaWJJQ1Ugc3VwcG9ydC4gQ2hlY2sgZm9yIElDVSBzdXBwb3J0IGJlaW5nIG1lbnRpb25l ZCBpbiBxdGJhc2UvY29uZmlnLnN1bW1hcnkuIikKICAgICB9CiAgICAgcHJvZHVjdGlvbl9idWls ZDpibGFja2JlcnJ5IHsKLSAgICAgICAgc2tpcEJ1aWxkUmVhc29uID0gIkJ1aWxkIG5vdCBzdXBw b3J0ZWQgb24gQkIxMCB5ZXQuIgorICAgICAgICBhZGRSZWFzb25Gb3JTa2lwcGluZ0J1aWxkKCJC dWlsZCBub3Qgc3VwcG9ydGVkIG9uIEJCMTAgeWV0LiIpCisgICAgfQorICAgIHJlcXVpcmVkUHJv Z3JhbXMgPSBncGVyZiBweXRob24gcGVybCBiaXNvbiBydWJ5IGZsZXgKKyAgICBmb3IocHJvZ3Jh bSwgcmVxdWlyZWRQcm9ncmFtcyk6IXByb2dyYW1FeGlzdHNJblBhdGgoJCRwcm9ncmFtKSB7Cisg ICAgICAgIGFkZFJlYXNvbkZvclNraXBwaW5nQnVpbGQoIk1pc3NpbmcgJCRwcm9ncmFtIGZyb20g UEFUSCIpCiAgICAgfQogCiAgICAgIyBEZXRlY3QgY2hhbmdlcyB0byB0aGUgY29uZmlndXJhdGlv bi4gQ2hhbmdlcyBuZWVkIGEgY2xlYW4gYnVpbGQuCkBAIC0yMzMsNyArMjM3LDcgQEAgZGVmaW5l VGVzdChmaW5hbGl6ZUNvbmZpZ3VyZSkgewogICAgICAgICB9CiAKICAgICAgICAgIWlzRW1wdHko c2tpcEJ1aWxkUmVhc29uKSB7Ci0gICAgICAgICAgICBsb2coIiQke0VPTH1XZWJLaXQgYnVpbGQg ZGlzYWJsZWQ6ICIgJCRza2lwQnVpbGRSZWFzb24gIiQke0VPTH0kJHtFT0x9IikKKyAgICAgICAg ICAgIGxvZygiJCR7RU9MfVRoZSBXZWJLaXQgYnVpbGQgaXMgdW5mb3J0dW5hdGVseSBkaXNhYmxl ZCBmb3IgdGhlIGZvbGxvd2luZyByZWFzb25zOiAiICQkc2tpcEJ1aWxkUmVhc29uICIkJHtFT0x9 JCR7RU9MfSIpCiAgICAgICAgICAgICBTVUJESVJTPQogICAgICAgICAgICAgZXhwb3J0KFNVQkRJ UlMpCiAgICAgICAgIH0gZWxzZSB7CmRpZmYgLS1naXQgYS9Ub29scy9xbWFrZS9ta3NwZWNzL2Zl YXR1cmVzL2Z1bmN0aW9ucy5wcmYgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2Z1bmN0 aW9ucy5wcmYKaW5kZXggYThiMjNhYzQyMTBmZjMxNzUyNDRhNmFlYTc1OWFhNWUwZTg0NjE4Zi4u MTlhZGNmZjBjNmE2Yzk1MTQ3ODg0NDEzOGVhMGMyNTdmZjMyY2ZmZiAxMDA2NDQKLS0tIGEvVG9v bHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mdW5jdGlvbnMucHJmCisrKyBiL1Rvb2xzL3FtYWtl L21rc3BlY3MvZmVhdHVyZXMvZnVuY3Rpb25zLnByZgpAQCAtMjAzLDYgKzIwMywyNiBAQCBkZWZp bmVUZXN0KGhhdmVRdE1vZHVsZSkgewogICAgIHJldHVybihmYWxzZSkKIH0KIAorZGVmaW5lVGVz dChwcm9ncmFtRXhpc3RzSW5QYXRoKSB7CisgICAgdW5zZXQocHJvZ3JhbSkKKyAgICB3aW5fY21k X3NoZWxsOiBwcm9ncmFtID0gJCR7MX0uZXhlCisgICAgZWxzZTogcHJvZ3JhbSA9ICQkMQorCisg ICAgUEFUSD0iJCQoUEFUSCkiCisgICAgcGF0aHM9JCRzcGxpdChQQVRILCAkJFFNQUtFX0RJUkxJ U1RfU0VQKQorCisgICAgR05VVE9PTFNfRElSPSQkW1FUX0hPU1RfREFUQV0vLi4vZ251d2luMzIv YmluCisgICAgZXhpc3RzKCQkR05VVE9PTFNfRElSKTogcGF0aHMgPSAkJHBhdGhzICQkR05VVE9P TFNfRElSCisKKyAgICBmb3IocCwgcGF0aHMpOiBleGlzdHMoJCRwJCRRTUFLRV9ESVJfU0VQJCRw cm9ncmFtKTpyZXR1cm4odHJ1ZSkKKyAgICByZXR1cm4oZmFsc2UpCit9CisKK2RlZmluZVRlc3Qo YWRkUmVhc29uRm9yU2tpcHBpbmdCdWlsZCkgeworICAgIHNraXBCdWlsZFJlYXNvbiA9ICQkc2tp cEJ1aWxkUmVhc29uJCR7RU9MfSIgICAgKiAiJCQxCisgICAgZXhwb3J0KHNraXBCdWlsZFJlYXNv bikKK30KKwogZGVmaW5lVGVzdChwcmVwZW5kRWFjaCkgewogICAgIHVuc2V0KHZhcmlhYmxlKQog ICAgIHVuc2V0KHByZWZpeCkK