55074 2011-02-23 12:53:02 -0800 [Qt][WK2] Build Webkit2 using "-2" option on Qt 2011-04-01 18:46:13 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 cshu cshu commit-queue laszlo.gombos ossy oldest_to_newest 356334 0 cshu 2011-02-23 12:53:02 -0800 As Qt WebKit2 port is getting more attraction, it's nice to build WebKit2 by default through build-webkit script. 356336 1 83528 cshu 2011-02-23 12:55:53 -0800 Created attachment 83528 fix patch 356437 2 83528 laszlo.gombos 2011-02-23 14:48:06 -0800 Comment on attachment 83528 fix patch I think this needs to be qualified so that WebKit2 is only turned on by default for platforms where we intend to support WebKit2. In general, I think it is too early for turning this on by default even for Linux. 377949 3 cshu 2011-04-01 11:45:00 -0700 Add a shortcut option in command line to build webkit2. 377950 4 87890 cshu 2011-04-01 11:46:55 -0700 Created attachment 87890 fix patch 2 377952 5 cshu 2011-04-01 11:48:18 -0700 just too lazy to type the whole qmake thing. :) 378054 6 87890 ossy 2011-04-01 13:57:21 -0700 Comment on attachment 87890 fix patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=87890&action=review The idea is great, but we can make it simpler. Please fix it, and I'll r+ it. > Tools/Scripts/build-webkit:308 > + $noWebKit2 = !isWK2(); > + Remove this line. > Tools/Scripts/build-webkit:359 > + -2 build WebKit2 It affects only the Qt port, "Build WebKit2 (Qt only)" would be better comment > Tools/Scripts/build-webkit:511 > + push @options, "--qmakearg=CONFIG+=webkit2" if !$noWebKit2; push @options, "--qmakearg=CONFIG+=webkit2" if isWK2(); 378060 7 87911 cshu 2011-04-01 14:06:01 -0700 Created attachment 87911 fix patch 3: update based on review 378203 8 87911 commit-queue 2011-04-01 16:39:07 -0700 Comment on attachment 87911 fix patch 3: update based on review Clearing flags on attachment: 87911 Committed r82745: <http://trac.webkit.org/changeset/82745> 378204 9 commit-queue 2011-04-01 16:39:12 -0700 All reviewed patches have been landed. Closing bug. 378282 10 ossy 2011-04-01 18:46:13 -0700 Simpler fix was wrong, because @ARGV was copied to @options before isWK2() removed the "-2" from @ARGV and it was passed to qmake. Arghhhh. :-/ I fixed it: http://trac.webkit.org/changeset/82756 83528 2011-02-23 12:55:53 -0800 2011-04-01 11:46:55 -0700 fix patch 55074_1.patch text/plain 1145 cshu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc5NDc1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTIgQEAKKzIwMTEtMDItMjMgIENoYW5nIFNodSAgPGNzaHVAd2Via2l0Lm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWlsZCBXZWJraXQy IGJ5IGRlZmF1bHQgb24gUXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU1MDc0CisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKwogMjAx MS0wMi0yMyAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjc5Mzg3LgpJbmRleDogVG9vbHMvU2NyaXB0cy9idWlsZC13 ZWJraXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQJKHJldmlzaW9u IDc5NDQxKQorKysgVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQJKHdvcmtpbmcgY29weSkKQEAg LTQ3Nyw2ICs0NzcsNyBAQCBpZiAoaXNHdGsoKSkgewogICAgIHB1c2ggQG9wdGlvbnMsICItLWlu c3RhbGwtaGVhZGVycz0iIC4gJGluc3RhbGxIZWFkZXJzIGlmIGRlZmluZWQoJGluc3RhbGxIZWFk ZXJzKTsKICAgICBwdXNoIEBvcHRpb25zLCAiLS1pbnN0YWxsLWxpYnM9IiAuICRpbnN0YWxsTGli cyBpZiBkZWZpbmVkKCRpbnN0YWxsTGlicyk7CiAgICAgcHVzaCBAb3B0aW9ucywgIi0tbWFrZWFy Z3M9IiAuICRtYWtlQXJncyBpZiBkZWZpbmVkKCRtYWtlQXJncyk7CisgICAgcHVzaCBAb3B0aW9u cywgIi0tcW1ha2Vhcmc9Q09ORklHKz13ZWJraXQyIiBpZiAhJG5vV2ViS2l0MjsKIAogICAgIGZv cmVhY2ggKEBmZWF0dXJlcykgewogICAgICAgICBwdXNoIEBvcHRpb25zLCAiREVGSU5FUys9JF8t PntkZWZpbmV9PSR7JF8tPnt2YWx1ZX19IiBpZiAkeyRfLT57dmFsdWV9fSAhPSAkXy0+e2RlZmF1 bHR9Owo= 87890 2011-04-01 11:46:55 -0700 2011-04-01 14:06:01 -0700 fix patch 2 55074_2.patch text/plain 1905 cshu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDgyNjk5KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTIgQEAKKzIwMTEtMDQtMDEgIENoYW5nIFNodSAgPGNzaHVAd2Via2l0Lm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdW1dLMl0gQnVp bGQgV2Via2l0MiB1c2luZyAiLTIiIG9wdGlvbiBvbiBRdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUwNzQKKworICAgICAgICAqIFNjcmlwdHMvYnVp bGQtd2Via2l0OgorCiAyMDExLTAzLTMxICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShy ZXZpc2lvbiA4MjU5NCkKKysrIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3JraW5nIGNv cHkpCkBAIC0zMDQsNiArMzA0LDggQEAgaWYgKGlzUXQoKSkgewogICAgICAgICAgICAgc2V0UW1h a2VCaW5hcnlQYXRoKCQxKTsKICAgICAgICAgfQogICAgIH0KKyAgICAkbm9XZWJLaXQyID0gIWlz V0syKCk7CisKICAgICBteSAlcXREZWZhdWx0cyA9IHF0RmVhdHVyZURlZmF1bHRzKCk7CiAgICAg Zm9yZWFjaCAoQGZlYXR1cmVzKSB7CiAgICAgICAgICRfLT57ZGVmYXVsdH0gPSAkcXREZWZhdWx0 c3skXy0+e2RlZmluZX19IHx8IDA7CkBAIC0zNTQsNiArMzU2LDcgQEAgVXNhZ2U6ICRwcm9ncmFt TmFtZSBbb3B0aW9uc10gW29wdGlvbnMgdAogICAtLWluc3RhbGwtaGVhZGVycz08cGF0aD4gICAg ICAgICAgU2V0IGluc3RhbGxhdGlvbiBwYXRoIGZvciB0aGUgaGVhZGVycyAoUXQgb25seSkKICAg LS1pbnN0YWxsLWxpYnM9PHBhdGg+ICAgICAgICAgICAgIFNldCBpbnN0YWxsYXRpb24gcGF0aCBm b3IgdGhlIGxpYnJhcmllcyAoUXQgb25seSkKICAgLS12OCAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFVzZSBWOCBhcyBKYXZhU2NyaXB0IGVuZ2luZSAoUXQgb25seSkKKyAgLTIgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJ1aWxkIFdlYktpdDIKIAogICAtLXByZWZpeD08cGF0 aD4gICAgICAgICAgICAgICAgICAgU2V0IGluc3RhbGxhdGlvbiBwcmVmaXggdG8gdGhlIGdpdmVu IHBhdGggKEd0ay9FZmwgb25seSkKICAgLS1tYWtlYXJncz08YXJndW1lbnRzPiAgICAgICAgICAg IE9wdGlvbmFsIE1ha2VmaWxlIGZsYWdzCkBAIC01MDUsNiArNTA4LDcgQEAgaWYgKGlzR3RrKCkp IHsKICAgICBwdXNoIEBvcHRpb25zLCAiLS1pbnN0YWxsLWhlYWRlcnM9IiAuICRpbnN0YWxsSGVh ZGVycyBpZiBkZWZpbmVkKCRpbnN0YWxsSGVhZGVycyk7CiAgICAgcHVzaCBAb3B0aW9ucywgIi0t aW5zdGFsbC1saWJzPSIgLiAkaW5zdGFsbExpYnMgaWYgZGVmaW5lZCgkaW5zdGFsbExpYnMpOwog ICAgIHB1c2ggQG9wdGlvbnMsICItLW1ha2VhcmdzPSIgLiAkbWFrZUFyZ3MgaWYgJG1ha2VBcmdz OworICAgIHB1c2ggQG9wdGlvbnMsICItLXFtYWtlYXJnPUNPTkZJRys9d2Via2l0MiIgaWYgISRu b1dlYktpdDI7CiAKICAgICBmb3JlYWNoIChAZmVhdHVyZXMpIHsKICAgICAgICAgcHVzaCBAb3B0 aW9ucywgIkRFRklORVMrPSRfLT57ZGVmaW5lfT0keyRfLT57dmFsdWV9fSIgaWYgJHskXy0+e3Zh bHVlfX0gIT0gJF8tPntkZWZhdWx0fTsK 87911 2011-04-01 14:06:01 -0700 2011-04-01 16:39:07 -0700 fix patch 3: update based on review 55074_3.patch text/plain 1663 cshu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDgyNzE1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTIgQEAKKzIwMTEtMDQtMDEgIENoYW5nIFNodSAgPGNzaHVAd2Via2l0Lm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdW1dLMl0gQnVp bGQgV2Via2l0MiB1c2luZyAiLTIiIG9wdGlvbiBvbiBRdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUwNzQKKworICAgICAgICAqIFNjcmlwdHMvYnVp bGQtd2Via2l0OgorCiAyMDExLTA0LTAxICBDaGFuZyBTaHUgIDxjc2h1QHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBUb29scy9TY3JpcHRzL2J1 aWxkLXdlYmtpdAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkocmV2 aXNpb24gODI3MTUpCisrKyBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkod29ya2luZyBjb3B5 KQpAQCAtMzU0LDYgKzM1NCw3IEBAIFVzYWdlOiAkcHJvZ3JhbU5hbWUgW29wdGlvbnNdIFtvcHRp b25zIHQKICAgLS1pbnN0YWxsLWhlYWRlcnM9PHBhdGg+ICAgICAgICAgIFNldCBpbnN0YWxsYXRp b24gcGF0aCBmb3IgdGhlIGhlYWRlcnMgKFF0IG9ubHkpCiAgIC0taW5zdGFsbC1saWJzPTxwYXRo PiAgICAgICAgICAgICBTZXQgaW5zdGFsbGF0aW9uIHBhdGggZm9yIHRoZSBsaWJyYXJpZXMgKFF0 IG9ubHkpCiAgIC0tdjggICAgICAgICAgICAgICAgICAgICAgICAgICAgICBVc2UgVjggYXMgSmF2 YVNjcmlwdCBlbmdpbmUgKFF0IG9ubHkpCisgIC0yICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBidWlsZCBXZWJLaXQyIChRdCBvbmx5KQogCiAgIC0tcHJlZml4PTxwYXRoPiAgICAgICAg ICAgICAgICAgICBTZXQgaW5zdGFsbGF0aW9uIHByZWZpeCB0byB0aGUgZ2l2ZW4gcGF0aCAoR3Rr L0VmbCBvbmx5KQogICAtLW1ha2VhcmdzPTxhcmd1bWVudHM+ICAgICAgICAgICAgT3B0aW9uYWwg TWFrZWZpbGUgZmxhZ3MKQEAgLTUwNSw2ICs1MDYsNyBAQCBpZiAoaXNHdGsoKSkgewogICAgIHB1 c2ggQG9wdGlvbnMsICItLWluc3RhbGwtaGVhZGVycz0iIC4gJGluc3RhbGxIZWFkZXJzIGlmIGRl ZmluZWQoJGluc3RhbGxIZWFkZXJzKTsKICAgICBwdXNoIEBvcHRpb25zLCAiLS1pbnN0YWxsLWxp YnM9IiAuICRpbnN0YWxsTGlicyBpZiBkZWZpbmVkKCRpbnN0YWxsTGlicyk7CiAgICAgcHVzaCBA b3B0aW9ucywgIi0tbWFrZWFyZ3M9IiAuICRtYWtlQXJncyBpZiAkbWFrZUFyZ3M7CisgICAgcHVz aCBAb3B0aW9ucywgIi0tcW1ha2Vhcmc9Q09ORklHKz13ZWJraXQyIiBpZiBpc1dLMigpOwogCiAg ICAgZm9yZWFjaCAoQGZlYXR1cmVzKSB7CiAgICAgICAgIHB1c2ggQG9wdGlvbnMsICJERUZJTkVT Kz0kXy0+e2RlZmluZX09JHskXy0+e3ZhbHVlfX0iIGlmICR7JF8tPnt2YWx1ZX19ICE9ICRfLT57 ZGVmYXVsdH07Cg==