188932 2018-08-24 14:44:01 -0700 Improve unified source generator script logging and error messages 2018-08-24 15:55:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton ggaren keith_miller simon.fraser webkit-bug-importer oldest_to_newest 1453577 0 thorton 2018-08-24 14:44:01 -0700 Improve unified source generator script logging and error messages 1453578 1 348040 thorton 2018-08-24 14:44:48 -0700 Created attachment 348040 Patch 1453601 2 348040 simon.fraser 2018-08-24 15:44:54 -0700 Comment on attachment 348040 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348040&action=review > Source/WTF/ChangeLog:8 > + * Scripts/generate-unified-source-bundles.rb: Why isn't this in Tools/Scripts? > Source/WTF/Scripts/generate-unified-source-bundles.rb:306 > +# Add trailing semicolon since CMake dislikes not having it. Maybe just # Add trailing semicolon for CMake 1453605 3 thorton 2018-08-24 15:48:27 -0700 (In reply to Simon Fraser (smfr) from comment #2) > Comment on attachment 348040 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=348040&action=review > > > Source/WTF/ChangeLog:8 > > + * Scripts/generate-unified-source-bundles.rb: > > Why isn't this in Tools/Scripts? Scripts that are used at build time can't be in Tools/Scripts because that's not available for Apple production builds (because each Source/ subdirectory is built separately and without access to the others). > > Source/WTF/Scripts/generate-unified-source-bundles.rb:306 > > +# Add trailing semicolon since CMake dislikes not having it. > > Maybe just # Add trailing semicolon for CMake Sure. 1453610 4 thorton 2018-08-24 15:54:43 -0700 https://trac.webkit.org/changeset/235336/webkit 1453612 5 webkit-bug-importer 2018-08-24 15:55:18 -0700 <rdar://problem/43700805> 348040 2018-08-24 14:44:48 -0700 2018-08-24 15:44:54 -0700 Patch bug-188932-20180824144447.patch text/plain 6363 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ2YThjYzk4ZjE0YzAzNjIxMDFmZTBk NDY2NWQxYTA1MDAzN2IyOWEuLjQ4ZThjNGIxNDkwNmIyNGQyMTczZjZiNzU3MGY2ZmI4NDhkNzYx NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTgtMDgtMjQgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZSB1bmlmaWVkIHNvdXJjZSBnZW5l cmF0b3Igc2NyaXB0IGxvZ2dpbmcgYW5kIGVycm9yIG1lc3NhZ2VzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODg5MzIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvZ2VuZXJhdGUtdW5pZmll ZC1zb3VyY2UtYnVuZGxlcy5yYjoKKyAgICAgICAgQWRkIHRoZSBhYmlsaXR5IHRvIGV4cGxhaW4g d2h5IHlvdSdyZSBnZXR0aW5nIHVzYWdlKCkgaW5zdGVhZCBvZiBqdXN0IHByaW50aW5nIGl0Lgor ICAgICAgICBDYXBpdGFsaXplIGxvZyBtZXNzYWdlcywgYW5kIGltcHJvdmUgdGhlIHdvcmRpbmcg aW4gYSBmZXcgcGxhY2VzLgorCiAyMDE4LTA4LTI0ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFw cGxlLmNvbT4KIAogICAgICAgICBBbGxvdyBjcmVhdGluZyBXZWFrUHRycyB0byBjb25zdCBvYmpl Y3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL1NjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3Vy Y2UtYnVuZGxlcy5yYiBiL1NvdXJjZS9XVEYvU2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJj ZS1idW5kbGVzLnJiCmluZGV4IDhkYjc4NTY3MTU4OWJiNDQzMTg0YmY2OTEwZWQ5MzVkYWQwNTY4 ZmYuLjFlZjkwODEzMDk4ZGNlOWE5NmFkYmZlYzNmMmZmYzY3ODViYzNlYzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XVEYvU2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZS1idW5kbGVzLnJiCisr KyBiL1NvdXJjZS9XVEYvU2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZS1idW5kbGVzLnJi CkBAIC0yOCw3ICsyOCwxMiBAQCByZXF1aXJlICdnZXRvcHRsb25nJwogU0NSSVBUX05BTUUgPSBG aWxlLmJhc2VuYW1lKCQwKQogQ09NTUVOVF9SRUdFWFAgPSAvXC9cLy8KIAotZGVmIHVzYWdlCitk ZWYgdXNhZ2UobWVzc2FnZSkKKyAgICBpZiBtZXNzYWdlCisgICAgICAgIHB1dHMgIkVycm9yOiAj e21lc3NhZ2V9IgorICAgICAgICBwdXRzCisgICAgZW5kCisKICAgICBwdXRzICJ1c2FnZTogI3tT Q1JJUFRfTkFNRX0gW29wdGlvbnNdIDxzb3VyY2VzLWxpc3QtZmlsZT4uLi4iCiAgICAgcHV0cyAi PHNvdXJjZXMtbGlzdC1maWxlPiBtYXkgYmUgc2VwYXJhdGUgYXJndW1lbnRzIG9yIG9uZSBzZW1p Y29sb24gc2VwYXJhdGVkIHN0cmluZyIKICAgICBwdXRzICItLWhlbHAgICAgICAgICAgICAgICAg ICAgICAgICAgICgtaCkgUHJpbnQgdGhpcyBtZXNzYWdlIgpAQCAtNzIsNyArNzcsNyBAQCBHZXRv cHRMb25nLm5ldyhbJy0taGVscCcsICctaCcsIEdldG9wdExvbmc6Ok5PX0FSR1VNRU5UXSwKICAg ICB8IG9wdCwgYXJnIHwKICAgICBjYXNlIG9wdAogICAgIHdoZW4gJy0taGVscCcKLSAgICAgICAg dXNhZ2UKKyAgICAgICAgdXNhZ2UobmlsKQogICAgIHdoZW4gJy0tdmVyYm9zZScKICAgICAgICAg JHZlcmJvc2UgPSB0cnVlCiAgICAgd2hlbiAnLS1kZXJpdmVkLXNvdXJjZXMtcGF0aCcKQEAgLTgx LDcgKzg2LDcgQEAgR2V0b3B0TG9uZy5uZXcoWyctLWhlbHAnLCAnLWgnLCBHZXRvcHRMb25nOjpO T19BUkdVTUVOVF0sCiAgICAgICAgIEZpbGVVdGlscy5ta3BhdGgoJHVuaWZpZWRTb3VyY2VPdXRw dXRQYXRoKSBpZiAhJHVuaWZpZWRTb3VyY2VPdXRwdXRQYXRoLmV4aXN0PwogICAgIHdoZW4gJy0t c291cmNlLXRyZWUtcGF0aCcKICAgICAgICAgJHNvdXJjZVRyZWVQYXRoID0gUGF0aG5hbWUubmV3 KGFyZykKLSAgICAgICAgdXNhZ2UgaWYgISRzb3VyY2VUcmVlUGF0aC5leGlzdD8KKyAgICAgICAg dXNhZ2UoIlNvdXJjZSB0cmVlICN7YXJnfSBkb2VzIG5vdCBleGlzdC4iKSBpZiAhJHNvdXJjZVRy ZWVQYXRoLmV4aXN0PwogICAgIHdoZW4gJy0tZmVhdHVyZS1mbGFncycKICAgICAgICAgYXJnLmdz dWIoL1xzKy8sICI7Iikuc3BsaXQoIjsiKS5tYXAgeyB8eHwgJGZlYXR1cmVGbGFnc1t4XSA9IHRy dWUgfQogICAgIHdoZW4gJy0tcHJpbnQtYnVuZGxlZC1zb3VyY2VzJwpAQCAtOTMsMTQgKzk4LDE1 IEBAIEdldG9wdExvbmcubmV3KFsnLS1oZWxwJywgJy1oJywgR2V0b3B0TG9uZzo6Tk9fQVJHVU1F TlRdLAogICAgIGVuZAogfQogCi11c2FnZSBpZiAhJHVuaWZpZWRTb3VyY2VPdXRwdXRQYXRoIHx8 ICEkc291cmNlVHJlZVBhdGgKLWxvZygicHV0dGluZyB1bmlmaWVkIHNvdXJjZXMgaW4gI3skdW5p ZmllZFNvdXJjZU91dHB1dFBhdGh9IikKK3VzYWdlKCItLWRlcml2ZWQtc291cmNlcy1wYXRoIG11 c3QgYmUgc3BlY2lmaWVkLiIpIGlmICEkdW5pZmllZFNvdXJjZU91dHB1dFBhdGgKK3VzYWdlKCIt LXNvdXJjZS10cmVlLXBhdGggbXVzdCBiZSBzcGVjaWZpZWQuIikgaWYgISRzb3VyY2VUcmVlUGF0 aAorbG9nKCJQdXR0aW5nIHVuaWZpZWQgc291cmNlcyBpbiAjeyR1bmlmaWVkU291cmNlT3V0cHV0 UGF0aH0iKQogbG9nKCJBY3RpdmUgRmVhdHVyZSBmbGFnczogI3skZmVhdHVyZUZsYWdzLmtleXMu aW5zcGVjdH0iKQogCi11c2FnZSBpZiBBUkdWLmxlbmd0aCA9PSAwCit1c2FnZSgiQXQgbGVhc3Qg b25lIHNvdXJjZSBsaXN0IGZpbGUgbXVzdCBiZSBzcGVjaWZpZWQuIikgaWYgQVJHVi5sZW5ndGgg PT0gMAogIyBFdmVuIHRob3VnaCBDTWFrZSB3aWxsIG9ubHkgcGFzcyB1cyBhIHNpbmdsZSBzZW1p Y29sb24gc2VwYXJhdGVkIGFyZ3VlbW50cywgd2Ugc2VwYXJhdGUgYWxsIHRoZSBhcmd1bWVudHMg Zm9yIHNpbXBsaWNpdHkuCiBzb3VyY2VMaXN0RmlsZXMgPSBBUkdWLnRvX2EubWFwIHsgfCBzb3Vy Y2VGaWxlTGlzdCB8IHNvdXJjZUZpbGVMaXN0LnNwbGl0KCI7IikgfS5mbGF0dGVuCi1sb2coInNv dXJjZSBmaWxlczogI3tzb3VyY2VMaXN0RmlsZXN9IikKK2xvZygiU291cmNlIGZpbGVzOiAje3Nv dXJjZUxpc3RGaWxlc30iKQogJGdlbmVyYXRlZFNvdXJjZXMgPSBbXQogCiBjbGFzcyBTb3VyY2VG aWxlCkBAIC0xNjIsNyArMTY4LDcgQEAgY2xhc3MgQnVuZGxlTWFuYWdlcgogICAgIGRlZiB3cml0 ZUZpbGUoZmlsZSwgdGV4dCkKICAgICAgICAgYnVuZGxlRmlsZSA9ICR1bmlmaWVkU291cmNlT3V0 cHV0UGF0aCArIGZpbGUKICAgICAgICAgaWYgKCFidW5kbGVGaWxlLmV4aXN0PyB8fCBJTzo6cmVh ZChidW5kbGVGaWxlKSAhPSBAY3VycmVudEJ1bmRsZVRleHQpCi0gICAgICAgICAgICBsb2coIndy aXRpbmcgYnVuZGxlICN7YnVuZGxlRmlsZX0gd2l0aDogXG4je0BjdXJyZW50QnVuZGxlVGV4dH0i KQorICAgICAgICAgICAgbG9nKCJXcml0aW5nIGJ1bmRsZSAje2J1bmRsZUZpbGV9IHdpdGg6IFxu I3tAY3VycmVudEJ1bmRsZVRleHR9IikKICAgICAgICAgICAgIElPOjp3cml0ZShidW5kbGVGaWxl LCBAY3VycmVudEJ1bmRsZVRleHQpCiAgICAgICAgIGVuZAogICAgIGVuZApAQCAtMTk2LDcgKzIw Miw3IEBAIGNsYXNzIEJ1bmRsZU1hbmFnZXIKICAgICAgICAgcGF0aCA9IHNvdXJjZUZpbGUucGF0 aAogICAgICAgICByYWlzZSAid3JvbmcgZXh0ZW5zaW9uOiAje3BhdGguZXh0bmFtZX0gZXhwZWN0 ZWQgI3tAZXh0ZW5zaW9ufSIgdW5sZXNzIHBhdGguZXh0bmFtZSA9PSAiLiN7QGV4dGVuc2lvbn0i CiAgICAgICAgIGlmIEBmaWxlQ291bnQgPT0gTUFYX0JVTkRMRV9TSVpFCi0gICAgICAgICAgICBs b2coImZsdXNoaW5nIGJlY2F1c2UgbmV3IGJ1bmRsZSBpcyBmdWxsICN7QGZpbGVDb3VudH0iKQor ICAgICAgICAgICAgbG9nKCJGbHVzaGluZyBiZWNhdXNlIG5ldyBidW5kbGUgaXMgZnVsbCAoI3tA ZmlsZUNvdW50fSBzb3VyY2VzKSIpCiAgICAgICAgICAgICBmbHVzaAogICAgICAgICBlbmQKICAg ICAgICAgQGN1cnJlbnRCdW5kbGVUZXh0ICs9ICIjaW5jbHVkZSBcIiN7c291cmNlRmlsZX1cIlxu IgpAQCAtMjA3LDE0ICsyMTMsMTcgQEAgZW5kCiBkZWYgUHJvY2Vzc0ZpbGVGb3JVbmlmaWVkU291 cmNlR2VuZXJhdGlvbihzb3VyY2VGaWxlKQogICAgIHBhdGggPSBzb3VyY2VGaWxlLnBhdGgKICAg ICBpZiAoJGN1cnJlbnREaXJlY3RvcnkgIT0gcGF0aC5kaXJuYW1lKQotICAgICAgICBsb2coImZs dXNoaW5nIGJlY2F1c2UgbmV3IGRpcm5hbWUgb2xkOiAjeyRjdXJyZW50RGlyZWN0b3J5fSwgbmV3 OiAje3BhdGguZGlybmFtZX0iKQorICAgICAgICBsb2coIkZsdXNoaW5nIGJlY2F1c2UgbmV3IGRp cm5hbWU7IG9sZDogI3skY3VycmVudERpcmVjdG9yeX0sIG5ldzogI3twYXRoLmRpcm5hbWV9IikK ICAgICAgICAgJGJ1bmRsZU1hbmFnZXJzLmVhY2hfdmFsdWUgeyB8eHwgeC5mbHVzaCB9CiAgICAg ICAgICRjdXJyZW50RGlyZWN0b3J5ID0gcGF0aC5kaXJuYW1lCiAgICAgZW5kCiAKICAgICBidW5k bGUgPSAkYnVuZGxlTWFuYWdlcnNbcGF0aC5leHRuYW1lXQotICAgIGlmICFidW5kbGUgfHwgIXNv dXJjZUZpbGUudW5pZmlhYmxlCi0gICAgICAgIGxvZygiTm8gYnVuZGxlIGZvciAje3BhdGguZXh0 bmFtZX0gZmlsZXMgYnVpbGRpbmcgI3twYXRofSBzdGFuZGFsb25lIikKKyAgICBpZiAhYnVuZGxl CisgICAgICAgIGxvZygiTm8gYnVuZGxlIGZvciAje3BhdGguZXh0bmFtZX0gZmlsZXMsIGJ1aWxk aW5nICN7cGF0aH0gc3RhbmRhbG9uZSIpCisgICAgICAgICRnZW5lcmF0ZWRTb3VyY2VzIDw8IHNv dXJjZUZpbGUKKyAgICBlbHNpZiAhc291cmNlRmlsZS51bmlmaWFibGUKKyAgICAgICAgbG9nKCJO b3QgYWxsb3dlZCB0byB1bmlmeSAje3BhdGh9LCBidWlsZGluZyBzdGFuZGFsb25lIikKICAgICAg ICAgJGdlbmVyYXRlZFNvdXJjZXMgPDwgc291cmNlRmlsZQogICAgIGVsc2UKICAgICAgICAgYnVu ZGxlLmFkZEZpbGUoc291cmNlRmlsZSkKQEAgLTIzMSwxNiArMjQwLDE2IEBAIHNvdXJjZUZpbGVz ID0gW10KIAogc291cmNlTGlzdEZpbGVzLmVhY2hfd2l0aF9pbmRleCB7CiAgICAgfCBwYXRoLCBz b3VyY2VGaWxlSW5kZXggfAotICAgIGxvZygicmVhZGluZyAje3BhdGh9IikKKyAgICBsb2coIlJl YWRpbmcgI3twYXRofSIpCiAgICAgcmVzdWx0ID0gW10KICAgICBpbkRpc2FibGVkTGluZXMgPSBm YWxzZQogICAgIEZpbGUucmVhZChwYXRoKS5saW5lcy5lYWNoIHsKICAgICAgICAgfCBsaW5lIHwK ICAgICAgICAgY29tbWVudFN0YXJ0ID0gbGluZSA9fiBDT01NRU5UX1JFR0VYUAotICAgICAgICBs b2coImJlZm9yZTogI3tsaW5lfSIpCisgICAgICAgIGxvZygiQmVmb3JlOiAje2xpbmV9IikKICAg ICAgICAgaWYgY29tbWVudFN0YXJ0ICE9IG5pbAogICAgICAgICAgICAgbGluZSA9IGxpbmUuc2xp Y2UoMCwgY29tbWVudFN0YXJ0KQotICAgICAgICAgICAgbG9nKCJhZnRlcjogI3tsaW5lfSIpCisg ICAgICAgICAgICBsb2coIkFmdGVyOiAje2xpbmV9IikKICAgICAgICAgZW5kCiAgICAgICAgIGxp bmUuc3RyaXAhCiAgICAgICAgIGlmIGxpbmUgPT0gIiNlbmRpZiIKQEAgLTI2MSw3ICsyNzAsNyBA QCBzb3VyY2VMaXN0RmlsZXMuZWFjaF93aXRoX2luZGV4IHsKICAgICB9CiAgICAgcmFpc2UgIkNv dWxkbid0IGZpbmQgY2xvc2luZyBcIiNlbmRpZlwiIiBpZiBpbkRpc2FibGVkTGluZXMKIAotICAg IGxvZygiZm91bmQgI3tyZXN1bHQubGVuZ3RofSBzb3VyY2UgZmlsZXMgaW4gI3twYXRofSIpCisg ICAgbG9nKCJGb3VuZCAje3Jlc3VsdC5sZW5ndGh9IHNvdXJjZSBmaWxlcyBpbiAje3BhdGh9IikK ICAgICBzb3VyY2VGaWxlcyArPSByZXN1bHQKIH0KIApAQCAtMjk0LDcgKzMwMyw3IEBAICRidW5k bGVNYW5hZ2Vycy5lYWNoX3ZhbHVlIHsKIH0KIAogIyBXZSB1c2Ugc3Rkb3V0IHRvIHJlcG9ydCBv dXIgdW5pZmllZCBzb3VyY2UgbGlzdCB0byBDTWFrZS4KLSMgQWRkIHRyYWlsaW5nIHNlbWljb2xv biBzaW5jZSBDTWFrZSBzZWVtcyBkaXNsaWtlcyBub3QgaGF2aW5nIGl0LgorIyBBZGQgdHJhaWxp bmcgc2VtaWNvbG9uIHNpbmNlIENNYWtlIGRpc2xpa2VzIG5vdCBoYXZpbmcgaXQuCiAjIEFsc28s IG1ha2Ugc3VyZSB3ZSB1c2UgcHJpbnQgaW5zdGVhZCBvZiBwdXRzIGJlY2F1c2UgQ01ha2Ugd2ls bCB0aGluayB0aGUgXG4gaXMgYSBzb3VyY2UgZmlsZSBhbmQgZmFpbCB0byBidWlsZC4KIAogbG9n KCRnZW5lcmF0ZWRTb3VyY2VzLmpvaW4oIjsiKSArICI7IikK