232493 2021-10-29 10:14:13 -0700 generate-xcfilelists doesn't work if build path contains a `+` 2021-11-05 12:08:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton ap ews-watchlist glenn jbedard simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1810123 0 thorton 2021-10-29 10:14:13 -0700 generate-xcfilelists doesn't work if build path contains a `+` 1810125 1 442832 thorton 2021-10-29 10:14:50 -0700 Created attachment 442832 Patch 1812168 2 webkit-bug-importer 2021-11-05 10:15:21 -0700 <rdar://problem/85075614> 1812203 3 ews-feeder 2021-11-05 12:08:46 -0700 Committed r285349 (243910@main): <https://commits.webkit.org/243910@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442832. 442832 2021-10-29 10:14:50 -0700 2021-11-05 12:08:47 -0700 Patch bug-232493-20211029101449.patch text/plain 4638 thorton SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4NTAzNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTEwLTI5ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgorCisgICAgICAgIGdlbmVyYXRlLXhjZmlsZWxpc3RzIGRvZXNuJ3Qgd29yayBpZiBidWls ZCBwYXRoIGNvbnRhaW5zIGEgYCtgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzI0OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvZ2VuZXJhdGVfeGNmaWxlbGlzdHNfbGli L2dlbmVyYXRvcnMucHk6CisgICAgICAgIChCYXNlR2VuZXJhdG9yLl9nZW5lcmF0ZV9kZXJpdmVk KToKKyAgICAgICAgKEJhc2VHZW5lcmF0b3IuX3JlcGxhY2VTaW5nbGVQcmVmaXgpOgorICAgICAg ICAoQmFzZUdlbmVyYXRvci5fcmVwbGFjZVByZWZpeCk6CisgICAgICAgIChCYXNlR2VuZXJhdG9y Ll91bmV4cGFuZC5fdHJ5X3VuZXhwYW5kKToKKyAgICAgICAgKEJhc2VHZW5lcmF0b3IuX3JlcGxh Y2UpOiBEZWxldGVkLgorICAgICAgICBUaGUgeGNmaWxlbGlzdCBnZW5lcmF0b3IgaGFkIGEgcmVn ZXggaW5qZWN0aW9uIGlzc3VlIHRoYXQgcmVzdWx0ZWQgaW4KKyAgICAgICAgcGF0aHMgd2l0aCBu b3QtdmVyeS1zcGVjaWFsIGNoYXJhY3RlcnMgY2F1c2luZyBpdCB0byBpbmZpbml0ZWx5CisgICAg ICAgIHJlZ2VuZXJhdGUgdGhlIHhjZmlsZWxpc3RzOyB3ZSBjYW4ganVzdCB1c2Ugc2ltcGxlIHN0 cmluZyBwcmVmaXgKKyAgICAgICAgcmVwbGFjZW1lbnQgaW5zdGVhZC4KKwogMjAyMS0xMC0yOSAg Sm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW3dlYmtpdHNj bXB5XSBBc3NpZ24gUFIgdG8gYXV0aG9yCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2dl bmVyYXRlX3hjZmlsZWxpc3RzX2xpYi9nZW5lcmF0b3JzLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvZ2VuZXJhdGVfeGNmaWxlbGlzdHNfbGliL2dlbmVyYXRvcnMucHkJ KHJldmlzaW9uIDI4NTAzNSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvZ2VuZXJhdGVfeGNm aWxlbGlzdHNfbGliL2dlbmVyYXRvcnMucHkJKHdvcmtpbmcgY29weSkKQEAgLTI3OCwxMCArMjc4 LDEwIEBAIGNsYXNzIEJhc2VHZW5lcmF0b3Iob2JqZWN0KToKICAgICAgICAgICAgIGlucHV0X2xp bmVzID0gc2VsZi5fZ2V0X2ZpbGVfbGluZXMoaW5wdXQubmFtZSkKICAgICAgICAgICAgIG91dHB1 dF9saW5lcyA9IHNlbGYuX2dldF9maWxlX2xpbmVzKG91dHB1dC5uYW1lKQogCi0gICAgICAgICAg ICBpbnB1dF9saW5lcyA9IHNlbGYuX3JlcGxhY2UoaW5wdXRfbGluZXMsICJeSmF2YVNjcmlwdENv cmUvIiwgICAgICAgICAgICAgICAiJChQUk9KRUNUX0RJUikvIikKLSAgICAgICAgICAgIGlucHV0 X2xpbmVzID0gc2VsZi5fcmVwbGFjZShpbnB1dF9saW5lcywgIl5KYXZhU2NyaXB0Q29yZVByaXZh dGVIZWFkZXJzLyIsICIkKEpBVkFTQ1JJUFRDT1JFX1BSSVZBVEVfSEVBREVSU19ESVIpLyIpCi0g ICAgICAgICAgICBpbnB1dF9saW5lcyA9IHNlbGYuX3JlcGxhY2UoaW5wdXRfbGluZXMsICJeV2Vi Q29yZS8iLCAgICAgICAgICAgICAgICAgICAgICAiJChQUk9KRUNUX0RJUikvIikKLSAgICAgICAg ICAgIGlucHV0X2xpbmVzID0gc2VsZi5fcmVwbGFjZShpbnB1dF9saW5lcywgIl5XZWJLaXQyUHJp dmF0ZUhlYWRlcnMvIiwgICAgICAgICIkKFdFQktJVDJfUFJJVkFURV9IRUFERVJTX0RJUikvIikK KyAgICAgICAgICAgIGlucHV0X2xpbmVzID0gc2VsZi5fcmVwbGFjZVByZWZpeChpbnB1dF9saW5l cywgIkphdmFTY3JpcHRDb3JlLyIsICAgICAgICAgICAgICAgIiQoUFJPSkVDVF9ESVIpLyIpCisg ICAgICAgICAgICBpbnB1dF9saW5lcyA9IHNlbGYuX3JlcGxhY2VQcmVmaXgoaW5wdXRfbGluZXMs ICJKYXZhU2NyaXB0Q29yZVByaXZhdGVIZWFkZXJzLyIsICIkKEpBVkFTQ1JJUFRDT1JFX1BSSVZB VEVfSEVBREVSU19ESVIpLyIpCisgICAgICAgICAgICBpbnB1dF9saW5lcyA9IHNlbGYuX3JlcGxh Y2VQcmVmaXgoaW5wdXRfbGluZXMsICJXZWJDb3JlLyIsICAgICAgICAgICAgICAgICAgICAgICIk KFBST0pFQ1RfRElSKS8iKQorICAgICAgICAgICAgaW5wdXRfbGluZXMgPSBzZWxmLl9yZXBsYWNl UHJlZml4KGlucHV0X2xpbmVzLCAiV2ViS2l0MlByaXZhdGVIZWFkZXJzLyIsICAgICAgICAiJChX RUJLSVQyX1BSSVZBVEVfSEVBREVSU19ESVIpLyIpCiAKICAgICAgICAgICAgIGlucHV0X2xpbmVz ID0gc2VsZi5fdW5leHBhbmQoaW5wdXRfbGluZXMsICJKQVZBU0NSSVBUQ09SRV9QUklWQVRFX0hF QURFUlNfRElSIikKICAgICAgICAgICAgIGlucHV0X2xpbmVzID0gc2VsZi5fdW5leHBhbmQoaW5w dXRfbGluZXMsICJQUk9KRUNUX0RJUiIpCkBAIC0yOTAsNyArMjkwLDcgQEAgY2xhc3MgQmFzZUdl bmVyYXRvcihvYmplY3QpOgogICAgICAgICAgICAgaW5wdXRfbGluZXMgPSBzZWxmLl91bmV4cGFu ZChpbnB1dF9saW5lcywgIldFQktJVEFERElUSU9OU19IRUFERVJTX0ZPTERFUl9QQVRIIikKICAg ICAgICAgICAgIGlucHV0X2xpbmVzID0gc2VsZi5fdW5leHBhbmQoaW5wdXRfbGluZXMsICJCVUlM VF9QUk9EVUNUU19ESVIiKSAgICAjIERvIHRoaXMgbGFzdCwgc2luY2UgaXQncyBhIHByZWZpeCBv ZiBzb21lIG90aGVyIHZhcmlhYmxlcyBhbmQgd2lsbCAiaW50ZXJjZXB0IiB0aGVtIGlmIGV4ZWN1 dGVkIGVhcmxpZXIgdGhhbiB0aGVtLgogCi0gICAgICAgICAgICBvdXRwdXRfbGluZXMgPSBzZWxm Ll9yZXBsYWNlKG91dHB1dF9saW5lcywgIl4iLCBzZWxmLl9nZXRfZGVyaXZlZF9zb3VyY2VzX2Rp cigpICsgIi8iKQorICAgICAgICAgICAgb3V0cHV0X2xpbmVzID0gW3NlbGYuX2dldF9kZXJpdmVk X3NvdXJjZXNfZGlyKCkgKyAiLyIgKyBsaW5lIGZvciBsaW5lIGluIG91dHB1dF9saW5lc10KICAg ICAgICAgICAgIG91dHB1dF9saW5lcyA9IHNlbGYuX3VuZXhwYW5kKG91dHB1dF9saW5lcywgIkJV SUxUX1BST0RVQ1RTX0RJUiIpCiAKICAgICAgICAgICAgIHNlbGYuYWRkZWRfbGluZXNfaW5wdXRf ZGVyaXZlZCA9IHNlbGYuX2ZpbmRfYWRkZWRfbGluZXMoaW5wdXRfbGluZXMsIHNlbGYuX2dldF9p bnB1dF9kZXJpdmVkX3hjZmlsZWxpc3RfcHJvamVjdF9wYXRoKCkpCkBAIC0zNDMsOSArMzQzLDE0 IEBAIGNsYXNzIEJhc2VHZW5lcmF0b3Iob2JqZWN0KToKICAgICAjIFV0aWxpdHkgZm9yIHBvc3Qt cHJvY2Vzc2luZyB0aGUgaW5pdGlhbCAueGNmaWxlbGlzdCBjb250ZW50LiBVc2VkIHRvCiAgICAg IyByZXBsYWNlIHRleHQgaW4gdGhlIGZpbGUuCiAKKyAgICBkZWYgX3JlcGxhY2VTaW5nbGVQcmVm aXgoc2VsZiwgbGluZSwgcHJlZml4LCByZXBsYWNlX3dpdGgpOgorICAgICAgICBpZiBsaW5lLnN0 YXJ0c3dpdGgocHJlZml4KToKKyAgICAgICAgICAgIHJldHVybiByZXBsYWNlX3dpdGggKyBsaW5l W2xlbihwcmVmaXgpOl0KKyAgICAgICAgcmV0dXJuIGxpbmUKKwogICAgIEB1dGlsLkxvZ0VudHJ5 RXhpdAotICAgIGRlZiBfcmVwbGFjZShzZWxmLCBsaW5lcywgdG9fcmVwbGFjZSwgcmVwbGFjZV93 aXRoKToKLSAgICAgICAgcmV0dXJuIHNldChbcmUuc3ViKHRvX3JlcGxhY2UsIHJlcGxhY2Vfd2l0 aCwgbGluZSkgZm9yIGxpbmUgaW4gbGluZXNdKQorICAgIGRlZiBfcmVwbGFjZVByZWZpeChzZWxm LCBsaW5lcywgdG9fcmVwbGFjZSwgcmVwbGFjZV93aXRoKToKKyAgICAgICAgcmV0dXJuIHNldChb c2VsZi5fcmVwbGFjZVNpbmdsZVByZWZpeChsaW5lLCB0b19yZXBsYWNlLCByZXBsYWNlX3dpdGgp IGZvciBsaW5lIGluIGxpbmVzXSkKIAogICAgICMgVXRpbGl0eSBmb3IgcG9zdC1wcm9jZXNzaW5n IHRoZSBpbml0aWFsIC54Y2ZpbGVsaXN0IGNvbnRlbnQuIFVzZWQgdG8KICAgICAjIHJlcGxhY2Ug ZmlsZSBwYXRoIHNlZ21lbnRzIHdpdGggdGhlIHZhcmlhYmxlcyB0aGF0IHJlcHJlc2VudCB0aG9z ZSBwYXRoCkBAIC00MTcsNyArNDIyLDcgQEAgY2xhc3MgQmFzZUdlbmVyYXRvcihvYmplY3QpOgog ICAgICAgICAgICAgcmV0dXJuICh4IGZvciB4IGluIF9nZW4ocGF0aCkpCiAKICAgICAgICAgZGVm IF90cnlfdW5leHBhbmQocHJlZml4LCBsaW5lKToKLSAgICAgICAgICAgIG5ld19saW5lID0gcmUu c3ViKCJee30vIi5mb3JtYXQocHJlZml4KSwgIiQoe30pLyIuZm9ybWF0KHZhcmlhYmxlX25hbWUp LCBsaW5lKQorICAgICAgICAgICAgbmV3X2xpbmUgPSBzZWxmLl9yZXBsYWNlU2luZ2xlUHJlZml4 KGxpbmUsIHByZWZpeCArICIvIiwgIiQoe30pLyIuZm9ybWF0KHZhcmlhYmxlX25hbWUpKQogICAg ICAgICAgICAgcmV0dXJuIG5ld19saW5lICE9IGxpbmUsIG5ld19saW5lCiAKICAgICAgICAgZGVm IF9kb191bmV4cGFuZChsaW5lKToK