132733 2014-05-09 03:14:35 -0700 [WK2] Make generate-forwarding-headers.pl work after WebKit2.framework -> WebKit.framework rename 2014-05-09 05:50:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P1 Blocker --- 1 ossy mhodovan.u-szeged commit-queue oldest_to_newest 1007933 0 ossy 2014-05-09 03:14:35 -0700 Here is the announcement about it: [webkit-dev] PSA: WebKit2.framework -> WebKit.framework https://lists.webkit.org/pipermail/webkit-dev/2014-May/026552.html Now the generate-forwarding-headers.pl does these steps: - searches all framework style includes in this format: <JavaScriptCore/*.h>, <WebCore/*.h> and <WebKit2/*.h> - find the proper header in JavaScriptCore, WebCore and WebKit2 - generate forwarding headers, for example: <somewhere-in-WebKitBuild>/WebKit2/foo.h: #include <WebKit2/real-path-of-the-header/.../.../foo.h> After the change mentioned the announcemnet, generate-forwarding-headers.pl should - search <WebKit/*.h> styled includes in WebKit2 - find the proper header in WebKit2, not in WebKit as the framework name - generate forwarding headers, for example: <somewhere-in-WebKitBuild>/WebKit/foo.h: #include <WebKit2/real-path-of-the-header/.../.../foo.h> It means WebKit2 needs to be handled differently from this change, because the directory name will be different from the framework name. 1007947 1 231143 mhodovan.u-szeged 2014-05-09 05:02:33 -0700 Created attachment 231143 Proposed patch 1007950 2 231143 ossy 2014-05-09 05:12:15 -0700 Comment on attachment 231143 Proposed patch LGTM, r=me. Thanks for the quick fix. 1007955 3 231143 commit-queue 2014-05-09 05:49:59 -0700 Comment on attachment 231143 Proposed patch Clearing flags on attachment: 231143 Committed r168525: <http://trac.webkit.org/changeset/168525> 1007956 4 commit-queue 2014-05-09 05:50:01 -0700 All reviewed patches have been landed. Closing bug. 231143 2014-05-09 05:02:33 -0700 2014-05-09 05:49:58 -0700 Proposed patch 0001-WebKit2-framework-rename.patch text/plain 4194 mhodovan.u-szeged RnJvbSAzZmMyOTg3ODViZWMxOWQ5ZDdhMTRkODNiZjFmMGUyMjY3ZjM0ODcwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBtYXJ0aW4gPG1ob2RvdmFuLnUtc3plZ2VkQHBhcnRuZXIuc2Ft c3VuZy5jb20+CkRhdGU6IEZyaSwgOSBNYXkgMjAxNCAxMzo1NjoyOCArMDIwMApTdWJqZWN0OiBb UEFUQ0hdIFdlYktpdDIgZnJhbWV3b3JrIHJlbmFtZQoKLS0tCiBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IDE4ICsrKysrKysrKysrKysrKysr KwogU291cmNlL1dlYktpdDIvU2NyaXB0cy9nZW5lcmF0ZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwg fCAxMCArKysrKystLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDQgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGRmYWU5YzAuLjM5YWExOWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMSBAQAorMjAxNC0wNS0wOSAgTWFydGluIEhvZG92YW4gIDxtaG9kb3Zhbi51LXN6 ZWdlZEBwYXJ0bmVyLnNhbXN1bmcuY29tPgorCisgICAgICAgIFtXSzJdIE1ha2UgZ2VuZXJhdGUt Zm9yd2FyZGluZy1oZWFkZXJzLnBsIHdvcmsgYWZ0ZXIgV2ViS2l0Mi5mcmFtZXdvcmsgLT4gV2Vi S2l0LmZyYW1ld29yayByZW5hbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzMjczMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJld3JpdGUgZnJhbWV3b3JrJ3MgZGlyZWN0b3J5IG5hbWUgdG8gV2ViS2l0 MiBpZiB0aGUgZnJhbWV3b3JrIGlzIFdlYktpdCAoZm9ybWVyIFdlYktpdDIpCisgICAgICAgIGFu ZCB0aGVuIGNvbGxlY3QgaGVhZGVycyBpbnNpZGUgdGhlIGZpeGVkIGZyYW1ld29yayBkaXJlY3Rv cnkgYW5kIGdlbmVyYXRlIGZvcndhcmRpbmcKKyAgICAgICAgaGVhZGVycyBwb2ludCB0byB0aGUg Zml4ZWQgZGlyZWN0b3J5LgorCisgICAgICAgIExlYXZlIFdlYktpdDIgaW4gQGZyYW1ld29ya3Mg bGlzdCBkdXJpbmcgdGhlIHRyYW5zaXRpb24uIEl0IGNhbiBiZSByZW1vdmVkCisgICAgICAgIG9u Y2UgPFdlYktpdDIvZm9vLmg+IHN0eWxlIGluY2x1ZGVzIHdlcmUgcmVuYW1lZCB0byA8V2ViS2l0 L2Zvby5oPiBldmVyeXdoZXJlLgorCisgICAgICAgICogU2NyaXB0cy9nZW5lcmF0ZS1mb3J3YXJk aW5nLWhlYWRlcnMucGw6CisgICAgICAgIChjb2xsZWN0RmFtZXdvcmtIZWFkZXJQYXRocyk6Cisg ICAgICAgIChjcmVhdGVGb3J3YXJkaW5nSGVhZGVyc0ZvckZyYW1ld29yayk6CisKIDIwMTQtMDUt MDcgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBb Q29vcmRpbmF0ZWRHcmFwaGljc11bV0syXSBTY2FsZSBmYWN0b3IgYW5kIHNjcm9sbCBwb3NpdGlv biBpcyBub3QgYmVpbmcgcmVzdG9yZWQgcHJvcGVybHkgaW4gYSBiYWNrL2ZvcndhcmQgbG9hZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2NyaXB0cy9nZW5lcmF0ZS1mb3J3YXJkaW5nLWhl YWRlcnMucGwgYi9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL2dlbmVyYXRlLWZvcndhcmRpbmctaGVh ZGVycy5wbAppbmRleCA3MzY3NWIzLi40MDFhYTQ3IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TY3JpcHRzL2dlbmVyYXRlLWZvcndhcmRpbmctaGVhZGVycy5wbAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9TY3JpcHRzL2dlbmVyYXRlLWZvcndhcmRpbmctaGVhZGVycy5wbApAQCAtMzYsMTAgKzM2 LDExIEBAIHVzZSBGaWxlOjpTcGVjOjpGdW5jdGlvbnM7CiBteSAkc3JjUm9vdCA9IHJlYWxwYXRo KEZpbGU6OlNwZWMtPmNhdGZpbGUoZGlybmFtZShhYnNfcGF0aCgkMCkpLCAiLi4vLi4iKSk7CiBt eSAkaW5jRnJvbVJvb3QgPSBhYnNfcGF0aCgkQVJHVlswXSk7CiBteSBAcGxhdGZvcm1QcmVmaXhl cyA9ICgiY2YiLCAiQ29jb2EiLCAiQ29vcmRpbmF0ZWRHcmFwaGljcyIsICJjdXJsIiwgImVmbCIs ICJndGsiLCAibWFjIiwgInNvdXAiLCAid2luIik7Ci1teSBAZnJhbWV3b3JrcyA9ICgiSmF2YVNj cmlwdENvcmUiLCAiV2ViQ29yZSIsICJXZWJLaXQyIik7CitteSBAZnJhbWV3b3JrcyA9ICgiSmF2 YVNjcmlwdENvcmUiLCAiV2ViQ29yZSIsICJXZWJLaXQiLCAiV2ViS2l0MiIpOwogbXkgQHNraXBw ZWRQcmVmaXhlczsKIG15IEBmcmFtZXdvcmtIZWFkZXJzOwogbXkgJGZyYW1ld29yazsKK215ICRm cmFtZXdvcmtEaXJlY3RvcnlOYW1lOwogbXkgJW5lZWRlZEhlYWRlcnM7CiAKIHNoaWZ0OwpAQCAt NTMsMTEgKzU0LDEyIEBAIGZvcmVhY2ggbXkgJHByZWZpeCAoQHBsYXRmb3JtUHJlZml4ZXMpIHsK IAogZm9yZWFjaCAoQGZyYW1ld29ya3MpIHsKICAgICAkZnJhbWV3b3JrID0gJF87CisgICAgJGZy YW1ld29ya0RpcmVjdG9yeU5hbWUgPSAoJGZyYW1ld29yayBlcSAiV2ViS2l0IikgPyAiV2ViS2l0 MiIgOiAkZnJhbWV3b3JrOwogICAgIEBmcmFtZXdvcmtIZWFkZXJzID0gKCk7CiAgICAgJW5lZWRl ZEhlYWRlcnMgPSAoKTsKIAogICAgIGZpbmQoXCZjb2xsZWN0TmVlZGVkSGVhZGVycywgJGluY0Zy b21Sb290KTsKLSAgICBmaW5kKFwmY29sbGVjdEZhbWV3b3JrSGVhZGVyUGF0aHMsIEZpbGU6OlNw ZWMtPmNhdGZpbGUoJHNyY1Jvb3QsICRmcmFtZXdvcmspKTsKKyAgICBmaW5kKFwmY29sbGVjdEZh bWV3b3JrSGVhZGVyUGF0aHMsIEZpbGU6OlNwZWMtPmNhdGZpbGUoJHNyY1Jvb3QsICRmcmFtZXdv cmtEaXJlY3RvcnlOYW1lKSk7CiAgICAgY3JlYXRlRm9yd2FyZGluZ0hlYWRlcnNGb3JGcmFtZXdv cmsoKTsKIH0KIApAQCAtNzksNyArODEsNyBAQCBzdWIgY29sbGVjdEZhbWV3b3JrSGVhZGVyUGF0 aHMgewogICAgIG15ICRmaWxlUGF0aCA9ICRGaWxlOjpGaW5kOjpuYW1lOwogICAgIG15ICRmaWxl ID0gJF87CiAgICAgaWYgKCRmaWxlUGF0aCA9fiAnXC5oJCcgJiYgJGZpbGVQYXRoICF+ICJGb3J3 YXJkaW5nSGVhZGVycyIgJiYgZ3JlcHskZmlsZSBlcSAkX30ga2V5cyAlbmVlZGVkSGVhZGVycykg ewotICAgICAgICBteSAkaGVhZGVyUGF0aCA9IHN1YnN0cigkZmlsZVBhdGgsIGxlbmd0aChGaWxl OjpTcGVjLT5jYXRmaWxlKCRzcmNSb290LCAkZnJhbWV3b3JrKSkgKyAxICk7CisgICAgICAgIG15 ICRoZWFkZXJQYXRoID0gc3Vic3RyKCRmaWxlUGF0aCwgbGVuZ3RoKEZpbGU6OlNwZWMtPmNhdGZp bGUoJHNyY1Jvb3QsICRmcmFtZXdvcmtEaXJlY3RvcnlOYW1lKSkgKyAxICk7CiAgICAgICAgIHB1 c2goQGZyYW1ld29ya0hlYWRlcnMsICRoZWFkZXJQYXRoKSB1bmxlc3MgKGdyZXAoJGhlYWRlclBh dGggPX4gIiRfLyIsIEBza2lwcGVkUHJlZml4ZXMpIHx8ICRoZWFkZXJQYXRoID1+ICJjb25maWcu aCIpOwogICAgIH0KIH0KQEAgLTkzLDcgKzk1LDcgQEAgc3ViIGNyZWF0ZUZvcndhcmRpbmdIZWFk ZXJzRm9yRnJhbWV3b3JrIHsKICAgICAgICAgIyBJZiB3ZSBmb3VuZCBtb3JlIGhlYWRlcnMgd2l0 aCB0aGUgc2FtZSBuYW1lLCBvbmx5IGdlbmVyYXRlIGEgZm9yd2FyZGluZyBoZWFkZXIgZm9yIHRo ZSBjdXJyZW50IHBsYXRmb3JtCiAgICAgICAgIGlmKGdyZXAoJF8gPX4gIi8kaGVhZGVyTmFtZVwk IiwgQGZyYW1ld29ya0hlYWRlcnMpID09IDEgfHwgJGhlYWRlciA9fiAiLyRwbGF0Zm9ybS8iICkg ewogICAgICAgICAgICAgbXkgJGZvcndhcmRpbmdIZWFkZXJQYXRoID0gRmlsZTo6U3BlYy0+Y2F0 ZmlsZSgkdGFyZ2V0RGlyZWN0b3J5LCAkaGVhZGVyTmFtZSk7Ci0gICAgICAgICAgICBteSAkZXhw ZWN0ZWRJbmNsdWRlU3RhdGVtZW50ID0gIiNpbmNsdWRlIFwiJGZyYW1ld29yay8kaGVhZGVyXCIi OworICAgICAgICAgICAgbXkgJGV4cGVjdGVkSW5jbHVkZVN0YXRlbWVudCA9ICIjaW5jbHVkZSBc IiRmcmFtZXdvcmtEaXJlY3RvcnlOYW1lLyRoZWFkZXJcIiI7CiAgICAgICAgICAgICBteSAkZm91 bmRJbmNsdWRlU3RhdGVtZW50ID0gMDsKIAogICAgICAgICAgICAgJGZvdW5kSW5jbHVkZVN0YXRl bWVudCA9IDxFWElTVElOR19IRUFERVI+IGlmIG9wZW4oRVhJU1RJTkdfSEVBREVSLCAiPCRmb3J3 YXJkaW5nSGVhZGVyUGF0aCIpOwotLSAKMS44LjEuMgoK