38207 2010-04-27 11:32:10 -0700 [V8] Handle OR ('|') conditional in action_derivedsourcesallinone.py 2010-04-27 16:24:35 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 0 kinuko webkit-unassigned dglazkov dimich jianli yaar oldest_to_newest 217803 0 kinuko 2010-04-27 11:32:10 -0700 Recently we introduced '|' as OR conditional (like '&' for AND) and v8's DerivedSources generation also needs to support it. See bug 37998 for details. 217817 1 54438 kinuko 2010-04-27 11:56:25 -0700 Created attachment 54438 Patch 217819 2 54439 kinuko 2010-04-27 11:59:12 -0700 Created attachment 54439 Patch 217826 3 kinuko 2010-04-27 12:02:21 -0700 The proposed patch worked for me in my chromium build with FileError.idl, that has OR '|' in its definition. 217945 4 yaar 2010-04-27 14:28:46 -0700 LGTM though I'm not a reviewer. 217958 5 54439 jianli 2010-04-27 14:42:01 -0700 Comment on attachment 54439 Patch r=me Please land with the following fix. WebCore/WebCore.gyp/scripts/action_derivedsourcesallinone.py:85 + # Wraps conditional with ENABLE() and && if more than one conditional is specified. Please update the comment. 218029 6 kinuko 2010-04-27 16:24:35 -0700 Committed r58352: <http://trac.webkit.org/changeset/58352> 54438 2010-04-27 11:56:25 -0700 2010-04-27 11:59:08 -0700 Patch bug-38207-20100427115624.patch text/plain 1496 kinuko ZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5neXAvc2NyaXB0cy9hY3Rpb25fZGVyaXZlZHNv dXJjZXNhbGxpbm9uZS5weSBiL1dlYkNvcmUvV2ViQ29yZS5neXAvc2NyaXB0cy9hY3Rpb25fZGVy aXZlZHNvdXJjZXNhbGxpbm9uZS5weQppbmRleCA2YTExNDE0YzVkMmJlY2I5NThkZWIxZTU3NjRj YTc0ZTk3NjcyNWQwLi44YmU4ZmM0N2JjNWM3ZmFlZWJlOTUxNmRiYTgxMTY1MGQzODZhNzc4IDEw MDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUuZ3lwL3NjcmlwdHMvYWN0aW9uX2Rlcml2ZWRzb3Vy Y2VzYWxsaW5vbmUucHkKKysrIGIvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRzL2FjdGlvbl9k ZXJpdmVkc291cmNlc2FsbGlub25lLnB5CkBAIC00OSw3ICs0OSw3IEBAIGltcG9ydCBzdWJwcm9j ZXNzCiBpbXBvcnQgc3lzCiAKICMgQSByZWdleHAgZm9yIGZpbmRpbmcgQ29uZGl0aW9uYWwgYXR0 cmlidXRlcyBpbiBpbnRlcmZhY2UgZGVmaW5pdGlvbnMuCi1jb25kaXRpb25hbFBhdHRlcm4gPSBy ZS5jb21waWxlKCdpbnRlcmZhY2VbXHNdKlxbW15cXV0qQ29uZGl0aW9uYWw9KFtcXzAtOWEtekEt WiZdKiknKQorY29uZGl0aW9uYWxQYXR0ZXJuID0gcmUuY29tcGlsZSgnaW50ZXJmYWNlW1xzXSpc W1teXF1dKkNvbmRpdGlvbmFsPShbXF8wLTlhLXpBLVomfF0qKScpCiAKIGNvcHlyaWdodFRlbXBs YXRlID0gIiIiLyoKICAqIFRISVMgRklMRSBXQVMgQVVUT01BVElDQUxMWSBHRU5FUkFURUQsIERP IE5PVCBFRElULgpAQCAtODUsOCArODUsMTAgQEAgY29weXJpZ2h0VGVtcGxhdGUgPSAiIiIvKgog IyBXcmFwcyBjb25kaXRpb25hbCB3aXRoIEVOQUJMRSgpIGFuZCAmJiBpZiBtb3JlIHRoYW4gb25l IGNvbmRpdGlvbmFsIGlzIHNwZWNpZmllZC4KIGRlZiBmb3JtYXRDb25kaXRpb25hbChjb25kaXRp b25hbCk6CiAgICAgZGVmIHdyYXBXaXRoRW5hYmxlKHMpOgorICAgICAgICBpZiByZS5tYXRjaCgn W3wmXSQnLCBzKToKKyAgICAgICAgICAgIHJldHVybiBzICogMgogICAgICAgICByZXR1cm4gJ0VO QUJMRSgnICsgcyArICcpJwotICAgIHJldHVybiAnICYmICcuam9pbihtYXAod3JhcFdpdGhFbmFi bGUsIGNvbmRpdGlvbmFsKSkKKyAgICByZXR1cm4gJyAnLmpvaW4obWFwKHdyYXBXaXRoRW5hYmxl LCBjb25kaXRpb25hbCkpCiAKIAogIyBGaW5kIHRoZSBjb25kaXRpb25hbCBpbnRlcmZhY2UgYXR0 cmlidXRlLgpAQCAtMTAxLDcgKzEwMyw3IEBAIGRlZiBleHRyYWN0Q29uZGl0aW9uYWwoaWRsRmls ZVBhdGgpOgogICAgIG1hdGNoID0gY29uZGl0aW9uYWxQYXR0ZXJuLnNlYXJjaChpZGxDb250ZW50 cykKICAgICBpZiBtYXRjaDoKICAgICAgICAgY29uZGl0aW9uYWwgPSBtYXRjaC5ncm91cCgxKQot ICAgICAgICBjb25kaXRpb25hbCA9IGNvbmRpdGlvbmFsLnNwbGl0KCcmJykKKyAgICAgICAgY29u ZGl0aW9uYWwgPSByZS5zcGxpdCgnKFt8Jl0pJywgY29uZGl0aW9uYWwpCiAKICAgICByZXR1cm4g Y29uZGl0aW9uYWwKIAo= 54439 2010-04-27 11:59:12 -0700 2010-04-27 14:42:01 -0700 Patch bug-38207-20100427115911.patch text/plain 2111 kinuko ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Y2Q1M2E1ZDJhMzQ4ZGRmN2I5MDBjZmQ0ZGZmYzAxZTU4OTIwNDVkZi4uMzA4MjBmMWY5MDdjNjAx ZjI0OGMxMmMyODE4OTk2ZGYxNTdiZmJhYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNC0yNyAgS2lu dWtvIFlhc3VkYSAgPGtpbnVrb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1Y4XSBIYW5kbGUgT1IgKCd8JykgY29uZGl0aW9u YWwgaW4gYWN0aW9uX2Rlcml2ZWRzb3VyY2VzYWxsaW5vbmUucHkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MjA3CisKKyAgICAgICAgTm8gbmV3IHRl c3RzLgorCisgICAgICAgICogV2ViQ29yZS5neXAvc2NyaXB0cy9hY3Rpb25fZGVyaXZlZHNvdXJj ZXNhbGxpbm9uZS5weToKKwogMjAxMC0wNC0yNiAgUm9tYW4gR2Vyc2htYW4gIDxyb21hbmdlQGdv b2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvV2ViQ29yZS5neXAvc2NyaXB0cy9hY3Rpb25fZGVyaXZlZHNvdXJjZXNhbGxpbm9u ZS5weSBiL1dlYkNvcmUvV2ViQ29yZS5neXAvc2NyaXB0cy9hY3Rpb25fZGVyaXZlZHNvdXJjZXNh bGxpbm9uZS5weQppbmRleCA2YTExNDE0YzVkMmJlY2I5NThkZWIxZTU3NjRjYTc0ZTk3NjcyNWQw Li44YmU4ZmM0N2JjNWM3ZmFlZWJlOTUxNmRiYTgxMTY1MGQzODZhNzc4IDEwMDY0NAotLS0gYS9X ZWJDb3JlL1dlYkNvcmUuZ3lwL3NjcmlwdHMvYWN0aW9uX2Rlcml2ZWRzb3VyY2VzYWxsaW5vbmUu cHkKKysrIGIvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRzL2FjdGlvbl9kZXJpdmVkc291cmNl c2FsbGlub25lLnB5CkBAIC00OSw3ICs0OSw3IEBAIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQg c3lzCiAKICMgQSByZWdleHAgZm9yIGZpbmRpbmcgQ29uZGl0aW9uYWwgYXR0cmlidXRlcyBpbiBp bnRlcmZhY2UgZGVmaW5pdGlvbnMuCi1jb25kaXRpb25hbFBhdHRlcm4gPSByZS5jb21waWxlKCdp bnRlcmZhY2VbXHNdKlxbW15cXV0qQ29uZGl0aW9uYWw9KFtcXzAtOWEtekEtWiZdKiknKQorY29u ZGl0aW9uYWxQYXR0ZXJuID0gcmUuY29tcGlsZSgnaW50ZXJmYWNlW1xzXSpcW1teXF1dKkNvbmRp dGlvbmFsPShbXF8wLTlhLXpBLVomfF0qKScpCiAKIGNvcHlyaWdodFRlbXBsYXRlID0gIiIiLyoK ICAqIFRISVMgRklMRSBXQVMgQVVUT01BVElDQUxMWSBHRU5FUkFURUQsIERPIE5PVCBFRElULgpA QCAtODUsOCArODUsMTAgQEAgY29weXJpZ2h0VGVtcGxhdGUgPSAiIiIvKgogIyBXcmFwcyBjb25k aXRpb25hbCB3aXRoIEVOQUJMRSgpIGFuZCAmJiBpZiBtb3JlIHRoYW4gb25lIGNvbmRpdGlvbmFs IGlzIHNwZWNpZmllZC4KIGRlZiBmb3JtYXRDb25kaXRpb25hbChjb25kaXRpb25hbCk6CiAgICAg ZGVmIHdyYXBXaXRoRW5hYmxlKHMpOgorICAgICAgICBpZiByZS5tYXRjaCgnW3wmXSQnLCBzKToK KyAgICAgICAgICAgIHJldHVybiBzICogMgogICAgICAgICByZXR1cm4gJ0VOQUJMRSgnICsgcyAr ICcpJwotICAgIHJldHVybiAnICYmICcuam9pbihtYXAod3JhcFdpdGhFbmFibGUsIGNvbmRpdGlv bmFsKSkKKyAgICByZXR1cm4gJyAnLmpvaW4obWFwKHdyYXBXaXRoRW5hYmxlLCBjb25kaXRpb25h bCkpCiAKIAogIyBGaW5kIHRoZSBjb25kaXRpb25hbCBpbnRlcmZhY2UgYXR0cmlidXRlLgpAQCAt MTAxLDcgKzEwMyw3IEBAIGRlZiBleHRyYWN0Q29uZGl0aW9uYWwoaWRsRmlsZVBhdGgpOgogICAg IG1hdGNoID0gY29uZGl0aW9uYWxQYXR0ZXJuLnNlYXJjaChpZGxDb250ZW50cykKICAgICBpZiBt YXRjaDoKICAgICAgICAgY29uZGl0aW9uYWwgPSBtYXRjaC5ncm91cCgxKQotICAgICAgICBjb25k aXRpb25hbCA9IGNvbmRpdGlvbmFsLnNwbGl0KCcmJykKKyAgICAgICAgY29uZGl0aW9uYWwgPSBy ZS5zcGxpdCgnKFt8Jl0pJywgY29uZGl0aW9uYWwpCiAKICAgICByZXR1cm4gY29uZGl0aW9uYWwK IAo=