27857 2009-07-30 14:42:26 -0700 clean up build-webkit to use less copy/paste code and remove unneeded SVG warning 2009-07-31 14:14:17 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned oldest_to_newest 136016 0 eric 2009-07-30 14:42:26 -0700 clean up build-webkit to use less copy/paste code and remove unneeded SVG warning We no longer really need to warn about builds having SVG or not, now that SVG is turned on by default. Also found some copy/paste code which I abstracted a little. 136017 1 33842 eric 2009-07-30 14:43:02 -0700 Created attachment 33842 Patch v1 136018 2 eric 2009-07-30 14:43:41 -0700 The patch is almost all minus lines. 136067 3 33842 levin 2009-07-30 16:57:39 -0700 Comment on attachment 33842 Patch v1 I don't normally r+ perl, but this one is simple enough for me to verify. 136251 4 eric 2009-07-31 14:14:17 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/build-webkit Committed r46641 M WebKitTools/ChangeLog M WebKitTools/Scripts/build-webkit r46641 = 1ec97c4a8a6ff284eab75001b40068e8d0a95c1f (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46641 33842 2009-07-30 14:43:02 -0700 2009-07-30 16:57:39 -0700 Patch v1 bug-27857-20090730144301.patch text/plain 4129 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzOWYyNzAzLi5hNGZkZjdjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDct MzAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNsZWFuIHVwIGJ1aWxkLXdlYmtpdCB0byB1c2Ug bGVzcyBjb3B5L3Bhc3RlIGNvZGUgYW5kIHJlbW92ZSB1bm5lZWRlZCBTVkcgd2FybmluZworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc4NTcKKworICAg ICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorCiAyMDA5LTA3LTMwICBKYWt1YiBXaWVjem9y ZWsgIDxmYXcyMTdAZ21haWwuY29tPgogCiAgICAgICAgIFtRdF0gRml4IGJ1aWxkIHdpdGggR0ND IDQuNC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5kZXggOTQ0NWYyOS4uOTcxOTkyOSAxMDA3 NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKKysrIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy9idWlsZC13ZWJraXQKQEAgLTI0MCwzMCArMjQwLDI0IEBAIGlmIChpc0d0aygp KSB7CiAgICAgfQogCiAgICAgIyBDb3B5IGxpYnJhcnkgYW5kIGhlYWRlciBmcm9tIFdlYktpdExp YnJhcmllcyB0byBhIGZpbmRhYmxlIHBsYWNlIGluIHRoZSBwcm9kdWN0IGRpcmVjdG9yeS4KLSAg ICBteSAkc3JjTGliID0gIldlYktpdExpYnJhcmllcy9saWJXZWJLaXRTeXN0ZW1JbnRlcmZhY2VU aWdlci5hIjsKLSAgICBteSAkbGliID0gIiRwcm9kdWN0RGlyL2xpYldlYktpdFN5c3RlbUludGVy ZmFjZVRpZ2VyLmEiOwotICAgIGlmICghLWUgJGxpYiB8fCAtTSAkbGliID4gLU0gJHNyY0xpYikg ewotICAgICAgICBwcmludCAiVXBkYXRpbmcgJGxpYlxuIjsKLSAgICAgICAgc3lzdGVtICJkaXR0 byIsICRzcmNMaWIsICRsaWI7Ci0gICAgICAgIHN5c3RlbSAicmFubGliIiwgJGxpYjsKLSAgICB9 Ci0KLSAgICAkc3JjTGliID0gIldlYktpdExpYnJhcmllcy9saWJXZWJLaXRTeXN0ZW1JbnRlcmZh Y2VMZW9wYXJkLmEiOwotICAgICRsaWIgPSAiJHByb2R1Y3REaXIvbGliV2ViS2l0U3lzdGVtSW50 ZXJmYWNlTGVvcGFyZC5hIjsKLSAgICBpZiAoIS1lICRsaWIgfHwgLU0gJGxpYiA+IC1NICRzcmNM aWIpIHsKLSAgICAgICAgcHJpbnQgIlVwZGF0aW5nICRsaWJcbiI7Ci0gICAgICAgIHN5c3RlbSAi ZGl0dG8iLCAkc3JjTGliLCAkbGliOwotICAgICAgICBzeXN0ZW0gInJhbmxpYiIsICRsaWI7Ci0g ICAgfQogCi0gICAgJHNyY0xpYiA9ICJXZWJLaXRMaWJyYXJpZXMvbGliV2ViS2l0U3lzdGVtSW50 ZXJmYWNlU25vd0xlb3BhcmQuYSI7Ci0gICAgJGxpYiA9ICIkcHJvZHVjdERpci9saWJXZWJLaXRT eXN0ZW1JbnRlcmZhY2VTbm93TGVvcGFyZC5hIjsKLSAgICBpZiAoIS1lICRsaWIgfHwgLU0gJGxp YiA+IC1NICRzcmNMaWIpIHsKLSAgICAgICAgcHJpbnQgIlVwZGF0aW5nICRsaWJcbiI7Ci0gICAg ICAgIHN5c3RlbSAiZGl0dG8iLCAkc3JjTGliLCAkbGliOwotICAgICAgICBzeXN0ZW0gInJhbmxp YiIsICRsaWI7CisgICAgbXkgQGxpYnJhcmllc1RvQ29weSA9ICgKKyAgICAgICAgImxpYldlYktp dFN5c3RlbUludGVyZmFjZVRpZ2VyLmEiLAorICAgICAgICAibGliV2ViS2l0U3lzdGVtSW50ZXJm YWNlTGVvcGFyZC5hIiwKKyAgICAgICAgImxpYldlYktpdFN5c3RlbUludGVyZmFjZVNub3dMZW9w YXJkLmEiLAorICAgICAgICAibGliV2ViQ29yZVNRTGl0ZTMuYSIsCisgICAgKTsKKyAgICBmb3Jl YWNoIG15ICRsaWJOYW1lIChAbGlicmFyaWVzVG9Db3B5KSB7CisgICAgICAgIG15ICRzcmNMaWIg PSAiV2ViS2l0TGlicmFyaWVzLyIgLiAkbGliTmFtZTsKKyAgICAgICAgbXkgJGxpYiA9ICIkcHJv ZHVjdERpci8iIC4gJGxpYk5hbWU7CisgICAgICAgIGlmICghLWUgJGxpYiB8fCAtTSAkbGliID4g LU0gJHNyY0xpYikgeworICAgICAgICAgICAgcHJpbnQgIlVwZGF0aW5nICRsaWJcbiI7CisgICAg ICAgICAgICBzeXN0ZW0gImRpdHRvIiwgJHNyY0xpYiwgJGxpYjsKKyAgICAgICAgICAgIHN5c3Rl bSAicmFubGliIiwgJGxpYjsKKyAgICAgICAgfQogICAgIH0KIAorICAgICMgRklYTUU6IFRoaXMg Y29kZSBzaG91bGQgYmUgYWJzdHJhY3RlZCB0byBub3QgYmUgY29weS9wYXN0ZS4KICAgICBteSAk c3JjSGVhZGVyID0gIldlYktpdExpYnJhcmllcy9XZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaCI7CiAg ICAgbXkgJGhlYWRlciA9ICIkcHJvZHVjdERpci91c3IvbG9jYWwvaW5jbHVkZS9XZWJLaXRTeXN0 ZW1JbnRlcmZhY2UuaCI7CiAgICAgaWYgKCEtZSAkaGVhZGVyIHx8IC1NICRoZWFkZXIgPiAtTSAk c3JjSGVhZGVyKSB7CkBAIC0yNzIsMTQgKzI2Niw2IEBAIGlmIChpc0d0aygpKSB7CiAgICAgICAg IHN5c3RlbSAiZGl0dG8iLCAkc3JjSGVhZGVyLCAkaGVhZGVyOwogICAgIH0KIAotICAgICRzcmNM aWIgPSAiV2ViS2l0TGlicmFyaWVzL2xpYldlYkNvcmVTUUxpdGUzLmEiOwotICAgICRsaWIgPSAi JHByb2R1Y3REaXIvbGliV2ViQ29yZVNRTGl0ZTMuYSI7Ci0gICAgaWYgKCEtZSAkbGliIHx8IC1N ICRsaWIgPiAtTSAkc3JjTGliKSB7Ci0gICAgICAgIHByaW50ICJVcGRhdGluZyAkbGliXG4iOwot ICAgICAgICBzeXN0ZW0gImRpdHRvIiwgJHNyY0xpYiwgJGxpYjsKLSAgICAgICAgc3lzdGVtICJy YW5saWIiLCAkbGliOwotICAgIH0KLQogICAgIG15ICRzcmNIZWFkZXJEaXIgPSAiV2ViS2l0TGli cmFyaWVzL1dlYkNvcmVTUUxpdGUzIjsKICAgICBteSAkaGVhZGVyRGlyID0gIiRwcm9kdWN0RGly L1dlYkNvcmVTUUxpdGUzIjsKICAgICBpZiAoIS1lICRoZWFkZXJEaXIgfHwgLU0gJGhlYWRlckRp ciA+IC1NICRzcmNIZWFkZXJEaXIpIHsKQEAgLTM1MCwxOSArMzM2LDYgQEAgcHJpbnQgIlxuIjsK IHByaW50ICI9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PVxuIjsKIHByaW50ICIgV2ViS2l0IGlzIG5vdyBidWlsdC4gVG8gcnVuICRsYXVu Y2hlck5hbWUgd2l0aCB0aGlzIG5ld2x5LWJ1aWx0XG4iOwogcHJpbnQgIiBjb2RlLCB1c2UgdGhl IFwiJGxhdW5jaGVyUGF0aFwiIHNjcmlwdC5cbiI7Ci1pZiAoJHN2Z1N1cHBvcnQpIHsKLSAgICBw cmludCAiXG4gTk9URTogV2ViS2l0IGhhcyBiZWVuIGJ1aWx0IHdpdGggU1ZHIHN1cHBvcnQgZW5h YmxlZC5cbiI7Ci0gICAgcHJpbnQgIiAkbGF1bmNoZXJOYW1lIHdpbGwgaGF2ZSBTVkcgdmlld2lu ZyBjYXBhYmlsaXRpZXMuXG4iOwotfQotaWYgKCRzdmdBbmltYXRpb25TdXBwb3J0IG9yICRzdmdB c0ltYWdlU3VwcG9ydCBvciAkc3ZnRE9NT2JqQ0JpbmRpbmdzU3VwcG9ydCBvciAkc3ZnRm9udHNT dXBwb3J0IG9yICRzdmdGb3JlaWduT2JqZWN0U3VwcG9ydCBvciAkc3ZnVXNlU3VwcG9ydCkgewot ICAgIHByaW50ICIgWW91ciBidWlsZCBzdXBwb3J0cyB0aGUgZm9sbG93aW5nIChvcHRpb25hbCkg U1ZHIGZlYXR1cmVzOiBcbiI7Ci0gICAgcHJpbnQgIiAgKiBCYXNpYyBTVkcgYW5pbWF0aW9uLlxu IiBpZiAkc3ZnQW5pbWF0aW9uU3VwcG9ydDsKLSAgICBwcmludCAiICAqIFNWRyBhcyBpbWFnZS5c biIgaWYgJHN2Z0FzSW1hZ2VTdXBwb3J0OwotICAgIHByaW50ICIgICogU1ZHIERPTSBPYmplY3Rp dmUtQyBiaW5kaW5ncy5cbiIgaWYgJHN2Z0RPTU9iakNCaW5kaW5nc1N1cHBvcnQ7Ci0gICAgcHJp bnQgIiAgKiBTVkcgZm9udHMuXG4iIGlmICRzdmdGb250c1N1cHBvcnQ7Ci0gICAgcHJpbnQgIiAg KiBTVkcgZm9yZWlnbiBvYmplY3QuXG4iIGlmICRzdmdGb3JlaWduT2JqZWN0U3VwcG9ydDsKLSAg ICBwcmludCAiICAqIFNWRyA8dXNlPiBzdXBwb3J0LlxuIiBpZiAkc3ZnVXNlU3VwcG9ydDsKLX0K IHByaW50ICI9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PVxuIjsKIAogZXhpdCAwOw==