83212 2012-04-04 13:58:43 -0700 [CSS] Make makevalues.pl and makeprop.pl ignore '#'s. 2012-04-04 15:06:51 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rakuco rakuco abarth darin eric macpherson menard rniwa tony webkit.review.bot oldest_to_newest 595902 0 rakuco 2012-04-04 13:58:43 -0700 [CSS] Make makevalues.pl and makeprop.pl ignore '#'s. 595908 1 135673 rakuco 2012-04-04 14:03:29 -0700 Created attachment 135673 Patch 595933 2 tony 2012-04-04 14:21:21 -0700 By this point, haven't we already run the .in files through the preprocessor and the preprocessor already handled the lines beginning with # (e.g., #if/#endif). What's an example of a line starting with # that makes it through the preprocessor? 595942 3 rakuco 2012-04-04 14:26:53 -0700 (In reply to comment #2) > What's an example of a line starting with # that makes it through the preprocessor? The ones produced by the preprocessor when -P is not passed to it: # 1 "/home/rakuco/dev/webkit/WebKit/Source/WebCore/html/HTMLTagNames.in" # 1 "<command-line>" # 1 "/home/rakuco/dev/webkit/WebKit/Source/WebCore/html/HTMLTagNames.in" etc 595954 4 rakuco 2012-04-04 14:38:42 -0700 Just in case I wasn't clear enough: this patch is a side-effect of my intentions to make the CMake-based ports work with GCC 4.7 without changing the parameters currently passed to the preprocessor. "-P" is always being passed to the preprocessor, but this breaks dom/make_names.pl due to GCC not outputting empty lines with "-P" anymore; if I switch to never passing "-P" (my aim), the CSS scripts currently break because of the additional lines output by the preprocessor. 595963 5 tony 2012-04-04 14:43:54 -0700 I see, your plan is to remove -P in preprocessor.pm because -P causes you to lose empty lines which are needed by make_names.pl and InFilesParser.pm. This wasn't clear to me in the ChangeLog description. Would it be possible to have applyPreprocessor take a flag for whether it wants -P or not? Or more generally, maybe applyPreprocessor can take an optional argument that is flags to pass to gcc. If the argument is omitted, it adds "-E -P -x c++". 595965 6 rakuco 2012-04-04 14:46:44 -0700 (In reply to comment #5) > I see, your plan is to remove -P in preprocessor.pm because -P causes you to lose empty lines which are needed by make_names.pl and InFilesParser.pm. This wasn't clear to me in the ChangeLog description. > > Would it be possible to have applyPreprocessor take a flag for whether it wants -P or not? Or more generally, maybe applyPreprocessor can take an optional argument that is flags to pass to gcc. If the argument is omitted, it adds "-E -P -x c++". Actually, my plan is to remote -P from Source/cmake/OptionsCommon.cmake; the CMake-based ports always pass --preprocessor to the scripts, so the defaults aren't used. 595966 7 rakuco 2012-04-04 14:46:52 -0700 s/remote/remove/ 595984 8 135673 tony 2012-04-04 14:56:03 -0700 Comment on attachment 135673 Patch Ok, seems fine. I would rewrite the ChangeLog to be what you said in comment #4. 595989 9 135692 rakuco 2012-04-04 15:04:33 -0700 Created attachment 135692 Patch for landing 595994 10 rakuco 2012-04-04 15:06:51 -0700 Committed r113244: <http://trac.webkit.org/changeset/113244> 135673 2012-04-04 14:03:29 -0700 2012-04-04 15:04:26 -0700 Patch bug-83212-20120404180325.patch text/plain 2318 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDY2NjI0YmY1YTY3NDFi NjUyZmNlYmUwYjliYmYxZmNkNDM3OGZhNy4uMjFlODY2NTA1YWMzNTMyMTIyYjMzOTFlZmNlODEz YjhkZWFkOGY0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA0LTA0ICBSYXBo YWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29Ad2Via2l0Lm9yZz4KKworICAgICAgICBbQ1NTXSBN YWtlIG1ha2V2YWx1ZXMucGwgYW5kIG1ha2Vwcm9wLnBsIGlnbm9yZSAnIydzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODMyMTIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBwcmVwYXJhdGlvbiBmb3Ig bWFraW5nIGRvbS9tYWtlX25hbWVzLnBsIHdvcmsgd2l0aCBHQ0MgNC43IHdoZW4KKyAgICAgICAg LVAgaXMgcGFzc2VkIHRvIHRoZSBwcmVwcm9jZXNzb3IgKHRoZSBkZWZhdWx0IGZvciB0aGUgQ01h a2UtYmFzZWQKKyAgICAgICAgcG9ydHMpLCB0aGUgQ1NTIGdlbmVyYXRvciB0b29scyBzaG91bGQg YmUgYWJsZSB0byBpZ25vcmUgbGluZXMKKyAgICAgICAgc3RhcnRpbmcgd2l0aCAnIycsIGp1c3Qg bGlrZSBJbkZpbGVzUGFyc2VyLnBtIGFuZAorICAgICAgICBtYWtlLWNzcy1maWxlLWFycmF5cy5w bCBhbHJlYWR5IGRvLgorCisgICAgICAgIEdDQyA0LjcncyBwcmVwcm9jZXNzb3Igc2VlbXMgdG8g aWdub3JlIGVtcHR5IGxpbmVzIHdoZW4gLVAgaXMgbm90CisgICAgICAgIHBhc3NlZCwgd2hpY2gg YnJlYWtzIG1ha2VfbmFtZXMucGwgYW5kIEluRmlsZXNQYXJzZXIucG0ncworICAgICAgICBleHBl Y3RhdGlvbnMuIEluc3RlYWQgb2YgY2hhbmdpbmcgdGhlIENNYWtlIHNpZGUsIG1ha2luZyB0aGUg dG9vbHMKKyAgICAgICAgbW9yZSByZXNpbGllbnQgaW4gZ2VuZXJhbCBzb3VuZHMgbGlrZSBhIGdv b2QgaWRlYS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHRvb2xzIHBsdW1iaW5nLgorCisgICAg ICAgICogY3NzL21ha2Vwcm9wLnBsOgorICAgICAgICAqIGNzcy9tYWtldmFsdWVzLnBsOgorCiAy MDEyLTA0LTA0ICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBG aXggdXNhZ2Ugb2YgTGF5b3V0VW5pdHMgYW5kIHNuYXBwaW5nIGZvciBzY3JvbGxpbmcgaW4gUmVu ZGVyQm94CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKaW5kZXggNmRlN2I3ZDU2MmZmY2M5OGQwYjcyM2Zm OGM2YmRhNTMxODAwNDY4ZS4uNmYyY2I0MWNlOGEwYTMxMjZkMWNhYTg3NTMwMWZhZjAyY2ViMGMx ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbApAQCAtNDAsNiArNDAsOCBAQCBteSBAbmFtZXMgPSAo KTsKIG15IEBhbGlhc2VzID0gKCk7CiBmb3JlYWNoIChATkFNRVMpIHsKICAgbmV4dCBpZiAobS8o XlxzKiQpLyk7CisgIG5leHQgaWYgKC9eIy8pOworCiAgICMgSW5wdXQgbWF5IHVzZSBhIGRpZmZl cmVudCBFT0wgc2VxdWVuY2UgdGhhbiAkLywgc28gYXZvaWQgY2hvbXAuCiAgICRfID1+IHMvW1xy XG5dKyQvL2c7CiAgIGlmIChleGlzdHMgJG5hbWVzSGFzaHskX30pIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9tYWtldmFsdWVzLnBsIGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2V2 YWx1ZXMucGwKaW5kZXggY2VkMjQxNmFhZDIwYzQ1YTI5NDRkMDg1NDY3MDEwNjk2ZDIwYjVjYS4u MTU4MTNjMGQzNjQzYjRmOWViMTEwYTM1NDM1ZGZkMWMwOTdjNTEwMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL21ha2V2YWx1ZXMucGwKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL21h a2V2YWx1ZXMucGwKQEAgLTM5LDYgKzM5LDggQEAgbXkgQGR1cGxpY2F0ZXMgPSAoKTsKIG15IEBu YW1lcyA9ICgpOwogZm9yZWFjaCAoQE5BTUVTKSB7CiAgIG5leHQgaWYgKG0vKF5ccyokKS8pOwor ICBuZXh0IGlmICgvXiMvKTsKKwogICAjIElucHV0IG1heSB1c2UgYSBkaWZmZXJlbnQgRU9MIHNl cXVlbmNlIHRoYW4gJC8sIHNvIGF2b2lkIGNob21wLgogICAkXyA9fiBzL1tcclxuXSskLy9nOwog ICAjIENTUyB2YWx1ZXMgbmVlZCB0byBiZSBsb3dlciBjYXNlLgo= 135692 2012-04-04 15:04:33 -0700 2012-04-04 15:04:33 -0700 Patch for landing bug-83212-20120404190432.patch text/plain 2325 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDY2NjI0YmY1YTY3NDFi NjUyZmNlYmUwYjliYmYxZmNkNDM3OGZhNy4uOTNhMGJkMDFjMDRiZmViZTViODEzMWE4ZjdmNmY1 MjQ0Y2RiZTY4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTA0ICBSYXBo YWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29Ad2Via2l0Lm9yZz4KKworICAgICAgICBbQ1NTXSBN YWtlIG1ha2V2YWx1ZXMucGwgYW5kIG1ha2Vwcm9wLnBsIGlnbm9yZSAnIydzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODMyMTIKKworICAgICAgICBS ZXZpZXdlZCBieSBUb255IENoYW5nLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgYSBzaWRlLWVm ZmVjdCBvZiBteSBpbnRlbnRpb25zIHRvIG1ha2UgdGhlCisgICAgICAgIENNYWtlLWJhc2VkIHBv cnRzIHdvcmsgd2l0aCBHQ0MgNC43IHdpdGhvdXQgY2hhbmdpbmcgdGhlCisgICAgICAgIHBhcmFt ZXRlcnMgY3VycmVudGx5IHBhc3NlZCB0byB0aGUgcHJlcHJvY2Vzc29yLiAiLVAiIGlzIGFsd2F5 cworICAgICAgICBiZWluZyBwYXNzZWQgdG8gdGhlIHByZXByb2Nlc3NvciwgYnV0IHRoaXMgYnJl YWtzCisgICAgICAgIGRvbS9tYWtlX25hbWVzLnBsIGR1ZSB0byBHQ0Mgbm90IG91dHB1dHRpbmcg ZW1wdHkgbGluZXMgd2l0aCAiLVAiCisgICAgICAgIGFueW1vcmU7IGlmIEkgc3dpdGNoIHRvIG5l dmVyIHBhc3NpbmcgIi1QIiAobXkgYWltKSwgdGhlIENTUworICAgICAgICBzY3JpcHRzIGN1cnJl bnRseSBicmVhayBiZWNhdXNlIG9mIHRoZSBhZGRpdGlvbmFsIGxpbmVzIG91dHB1dCBieQorICAg ICAgICB0aGUgcHJlcHJvY2Vzc29yLiBJbkZpbGVzUGFyc2VyLnBtIGFuZCBtYWtlLWNzcy1maWxl LWFycmF5LnBsCisgICAgICAgIGFscmVhZHkgc2tpcCBsaW5lcyB3aGljaCBzdGFydCB3aXRoICcj JywgZm9yIGV4YW1wbGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB0b29scyBwbHVtYmluZy4K KworICAgICAgICAqIGNzcy9tYWtlcHJvcC5wbDoKKyAgICAgICAgKiBjc3MvbWFrZXZhbHVlcy5w bDoKKwogMjAxMi0wNC0wNCAgRW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgRml4IHVzYWdlIG9mIExheW91dFVuaXRzIGFuZCBzbmFwcGluZyBmb3Igc2Nyb2xsaW5n IGluIFJlbmRlckJveApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBs IGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCmluZGV4IDZkZTdiN2Q1NjJmZmNjOThk MGI3MjNmZjhjNmJkYTUzMTgwMDQ2OGUuLjZmMmNiNDFjZThhMGEzMTI2ZDFjYWE4NzUzMDFmYWYw MmNlYjBjMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKQEAgLTQwLDYgKzQwLDggQEAgbXkgQG5h bWVzID0gKCk7CiBteSBAYWxpYXNlcyA9ICgpOwogZm9yZWFjaCAoQE5BTUVTKSB7CiAgIG5leHQg aWYgKG0vKF5ccyokKS8pOworICBuZXh0IGlmICgvXiMvKTsKKwogICAjIElucHV0IG1heSB1c2Ug YSBkaWZmZXJlbnQgRU9MIHNlcXVlbmNlIHRoYW4gJC8sIHNvIGF2b2lkIGNob21wLgogICAkXyA9 fiBzL1tcclxuXSskLy9nOwogICBpZiAoZXhpc3RzICRuYW1lc0hhc2h7JF99KSB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXZhbHVlcy5wbCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9tYWtldmFsdWVzLnBsCmluZGV4IGNlZDI0MTZhYWQyMGM0NWEyOTQ0ZDA4NTQ2NzAxMDY5NmQy MGI1Y2EuLjE1ODEzYzBkMzY0M2I0ZjllYjExMGEzNTQzNWRmZDFjMDk3YzUxMDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtldmFsdWVzLnBsCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9tYWtldmFsdWVzLnBsCkBAIC0zOSw2ICszOSw4IEBAIG15IEBkdXBsaWNhdGVzID0gKCk7 CiBteSBAbmFtZXMgPSAoKTsKIGZvcmVhY2ggKEBOQU1FUykgewogICBuZXh0IGlmIChtLyheXHMq JCkvKTsKKyAgbmV4dCBpZiAoL14jLyk7CisKICAgIyBJbnB1dCBtYXkgdXNlIGEgZGlmZmVyZW50 IEVPTCBzZXF1ZW5jZSB0aGFuICQvLCBzbyBhdm9pZCBjaG9tcC4KICAgJF8gPX4gcy9bXHJcbl0r JC8vZzsKICAgIyBDU1MgdmFsdWVzIG5lZWQgdG8gYmUgbG93ZXIgY2FzZS4K