58869 2011-04-19 01:03:01 -0700 [Qt] Cleanup includepath adjustment for generated files 2011-04-20 06:47:02 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 kbalazs webkit-unassigned abecsi ossy oldest_to_newest 388349 0 kbalazs 2011-04-19 01:03:01 -0700 After a build issue that has been worked around by r84174 I took a look at this. We need to find a better way to fix it that is compatible with the standalone_package path. Furthermore there is a lot of useless logic in the pro/pri files. 388353 1 90164 kbalazs 2011-04-19 01:18:26 -0700 Created attachment 90164 Patch 388362 2 kbalazs 2011-04-19 01:52:16 -0700 Note: I cannot test the standalone_package path, somebody should take a look. 388418 3 90164 abecsi 2011-04-19 05:09:15 -0700 Comment on attachment 90164 Patch LGTM. To test-build the standalone_package path: Tools/Scripts/build-webkit --qt --makeargs=-j24 CONFIG+=standalone_package CONFIG+=webkit2 should do the trick. I just checked this, declarative and the WK2 Api tests do not build currently on trunk in standalone_package mode, but the library build succeeds. I also checked your patch, and it works for the library, too. The above issues need another fix, and I'm not even sure whether they need to be built in standalone_package configuration. 389144 4 90164 ossy 2011-04-20 04:13:08 -0700 Comment on attachment 90164 Patch Nice cleanup, r=me. 389145 5 ossy 2011-04-20 04:14:05 -0700 (In reply to comment #3) > (From update of attachment 90164 [details]) > LGTM. > > To test-build the standalone_package path: > > Tools/Scripts/build-webkit --qt --makeargs=-j24 CONFIG+=standalone_package CONFIG+=webkit2 > > should do the trick. > > I just checked this, declarative and the WK2 Api tests do not build currently on trunk in standalone_package mode, but the library build succeeds. > > I also checked your patch, and it works for the library, too. The above issues need another fix, and I'm not even sure whether they need to be built in standalone_package configuration. Could you file a new bug report to fix standalone_package build? 389179 6 kbalazs 2011-04-20 06:40:38 -0700 (In reply to comment #5) > (In reply to comment #3) > > (From update of attachment 90164 [details] [details]) > > LGTM. > > > > To test-build the standalone_package path: > > > > Tools/Scripts/build-webkit --qt --makeargs=-j24 CONFIG+=standalone_package CONFIG+=webkit2 > > > > should do the trick. > > > > I just checked this, declarative and the WK2 Api tests do not build currently on trunk in standalone_package mode, but the library build succeeds. > > > > I also checked your patch, and it works for the library, too. The above issues need another fix, and I'm not even sure whether they need to be built in standalone_package configuration. > > Could you file a new bug report to fix standalone_package build? I will test it and file the bug if it is broken. 389185 7 90164 kbalazs 2011-04-20 06:46:55 -0700 Comment on attachment 90164 Patch Clearing flags on attachment: 90164 Committed r84364: <http://trac.webkit.org/changeset/84364> 389186 8 kbalazs 2011-04-20 06:47:02 -0700 All reviewed patches have been landed. Closing bug. 90164 2011-04-19 01:18:26 -0700 2011-04-20 06:46:55 -0700 Patch bug-58869-20110419081825.patch text/plain 6416 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogODQyMjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGM3 OTU0M2Y2OTcyZTE1YjJiNDJmZWUwYjZiMDA0OGNhNDVkNTZlZDUuLjcwMTI0YjVkYTllYTg5NThk ZmFiNDYzMDNmNDVjYmNhZjlhMTI1MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEzIEBACisyMDExLTA0LTE5ICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRd IENsZWFudXAgaW5jbHVkZXBhdGggYWRqdXN0bWVudCBmb3IgZ2VuZXJhdGVkIGZpbGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODg2OQorCisgICAg ICAgICogSmF2YVNjcmlwdENvcmUucHJpOiAgQWRkIHRoZSBkaXJlY3Rvcnkgb2YgZ2VuZXJhdGVk IGZpbGVzIHRvIHRoZSBpbmNsdWRlCisgICAgICAgIHBhdGggd2l0aCBhYnNvbHV0ZSBwYXRoIHRv IG1ha2UgaXQgdmFsaWQgaW4gdGhlIGZpbmFsIGJ1aWxkIHN0ZXAuCisKIDIwMTEtMDQtMTggIE9s aXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHYXZp biBCYXJyYWNsb3VnaC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2Ny aXB0Q29yZS5wcmkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUucHJpCmlu ZGV4IGMzNDI5MzY2ZDBkNDkyOTdiMTYxNzdmZDEwOTVjOTY3MDg0MWYxNzcuLmVkNGNmMmUyNzMw YTEwZmRhNDhlM2ExYTU4ZGNmZTVkOTJmNjgxYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5wcmkKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0ph dmFTY3JpcHRDb3JlLnByaQpAQCAtMTUsNyArMTUsNyBAQCBlbHNlOiBKQVZBU0NSSVBUQ09SRV9E RVNURElSID0gcmVsZWFzZQogQ09ORklHKHN0YW5kYWxvbmVfcGFja2FnZSkgewogICAgIGlzRW1w dHkoSlNDX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUik6SlNDX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUiA9 ICQkUFdEL2dlbmVyYXRlZAogfSBlbHNlIHsKLSAgICBpc0VtcHR5KEpTQ19HRU5FUkFURURfU09V UkNFU19ESVIpOkpTQ19HRU5FUkFURURfU09VUkNFU19ESVIgPSBnZW5lcmF0ZWQKKyAgICBpc0Vt cHR5KEpTQ19HRU5FUkFURURfU09VUkNFU19ESVIpOkpTQ19HRU5FUkFURURfU09VUkNFU19ESVIg PSAkJE9VVFBVVF9ESVIvSmF2YVNjcmlwdENvcmUvZ2VuZXJhdGVkCiB9CiAKIEpBVkFTQ1JJUFRD T1JFX0lOQ0xVREVQQVRIID0gXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDg1YTViNzNkYmFlM2I1MzllMTQzMzNj MWE2YTQ3OWNjNGUyZjhkMTMuLjE3YzkzMjgwNDg2NmFmZjU5MzlkMjFiNTE4NzkwNTJiYzExOTQ4 MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wNC0xOSAgQmFsYXpzIEtlbGVt ZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBDbGVhbnVwIGluY2x1ZGVwYXRoIGFkanVzdG1lbnQgZm9y IGdlbmVyYXRlZCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTg4NjkKKworICAgICAgICBCdWlsZCBjbGVhbnVwLCBubyBuZXcgdGVzdHMuCisK KyAgICAgICAgKiBXZWJDb3JlLnByaTogQWRkIHRoZSBkaXJlY3Rvcnkgb2YgZ2VuZXJhdGVkIGZp bGVzIHRvIHRoZSBpbmNsdWRlIHBhdGgKKyAgICAgICAgd2l0aCBhYnNvbHV0ZSBwYXRoIHRvIG1h a2UgaXQgdmFsaWQgaW4gdGhlIGZpbmFsIGJ1aWxkIHN0ZXAuIFJlbW92ZQorICAgICAgICB1bm5l Y2Vzc2FyeSBsb2dpYy4KKwogMjAxMS0wNC0xOCAgRG9taW5pYyBDb29uZXkgIDxkb21pbmljY0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcmkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnByaQppbmRleCAzMDE3NTcwZjZjZTViZjdiNmE3ZDMzYmJhMTQ5MDVhNWM3NDMwMWEyLi41 NDJiMWRjNDNiYzg5ZGM2Y2JhZmY0NjY1NzFmZTBhODIyMDJmOTFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnByaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQpA QCAtMjIsMTIgKzIyLDEwIEBAIGVsc2U6IFdFQkNPUkVfREVTVERJUiA9IHJlbGVhc2UKIAogQ09O RklHKHN0YW5kYWxvbmVfcGFja2FnZSkgewogICAgIGlzRW1wdHkoV0NfR0VORVJBVEVEX1NPVVJD RVNfRElSKTpXQ19HRU5FUkFURURfU09VUkNFU19ESVIgPSAkJFBXRC8uLi9XZWJDb3JlL2dlbmVy YXRlZAotICAgIGlzRW1wdHkoSlNDX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUik6SlNDX0dFTkVSQVRF RF9TT1VSQ0VTX0RJUiA9ICQkUFdELy4uL0phdmFTY3JpcHRDb3JlL2dlbmVyYXRlZAogCiAgICAg UFJFQ09NUElMRURfSEVBREVSID0gJCRQV0QvLi4vV2ViS2l0L3F0L1dlYktpdF9wY2guaAogfSBl bHNlIHsKLSAgICBpc0VtcHR5KFdDX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUik6V0NfR0VORVJBVEVE X1NPVVJDRVNfRElSID0gLi4vV2ViQ29yZS9nZW5lcmF0ZWQKLSAgICBpc0VtcHR5KEpTQ19HRU5F UkFURURfU09VUkNFU19ESVIpOkpTQ19HRU5FUkFURURfU09VUkNFU19ESVIgPSAuLi9KYXZhU2Ny aXB0Q29yZS9nZW5lcmF0ZWQKKyAgICBpc0VtcHR5KFdDX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUik6 V0NfR0VORVJBVEVEX1NPVVJDRVNfRElSID0gJCRPVVRQVVRfRElSL1dlYkNvcmUvZ2VuZXJhdGVk CiB9CiAKIFY4X0RJUiA9ICIkJFtRVF9JTlNUQUxMX1BSRUZJWF0vc3JjLzNyZHBhcnR5L3Y4Igpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwppbmRleCA4MjI1OTIxMzMwMzQ0ZGVhZGZjMjJiNzIxODMxZWIyNDZhYWYwNWFk Li5mZWRlYWY0YTYwZTQxNzhjZTk4YzNmMmEzYmY4MTc5YmE4MDBmYjlmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTA0LTE5ICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNA d2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIENsZWFudXAgaW5jbHVkZXBhdGggYWRqdXN0bWVudCBmb3IgZ2VuZXJhdGVkIGZp bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODg2 OQorCisgICAgICAgICogUXRXZWJLaXQucHJvOiBSZXZlcnQgdGhlIGhhY2t5IGZpeCBpbiByODQx NzQuIFJlbW92ZQorICAgICAgICB1bm5lY2Vzc2FyeSBsb2dpYy4KKwogMjAxMS0wNC0xOCAgQ3Nh YmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV0syXSBV bnJldmlld2VkIGJ1aWxkZml4IGFmdGVyIHI4NDE3NC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvcXQvUXRXZWJLaXQucHJvIGIvU291cmNlL1dlYktpdC9xdC9RdFdlYktpdC5wcm8KaW5kZXgg NzUyOWFjZWQyYjA2YmE2NzNhYzVhNmJlOGYwNGQyNmY3ZTA0MDVjYy4uZjE3MzY4ZjY3ODJkMTIy YTI5OGM1ZmNiMTU4ZDRlNDBlODQ4NzMwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9R dFdlYktpdC5wcm8KKysrIGIvU291cmNlL1dlYktpdC9xdC9RdFdlYktpdC5wcm8KQEAgLTE1LDIz ICsxNSwxMiBAQCBlbHNlOiBDT05GSUdfRElSID0gcmVsZWFzZQogCiBTT1VSQ0VfRElSID0gJCRy ZXBsYWNlKFBXRCwgL1dlYktpdC9xdCwgIiIpCiAKLUNPTkZJRyhzdGFuZGFsb25lX3BhY2thZ2Up IHsKLSAgICBpc0VtcHR5KFdFQktJVDJfR0VORVJBVEVEX1NPVVJDRVNfRElSKTpKU0NfR0VORVJB VEVEX1NPVVJDRVNfRElSID0gJCRQV0QvLi4vLi4vSmF2YVNjcmlwdENvcmUvZ2VuZXJhdGVkCi0g ICAgaXNFbXB0eShXQ19HRU5FUkFURURfU09VUkNFU19ESVIpOldDX0dFTkVSQVRFRF9TT1VSQ0VT X0RJUiA9ICQkUFdELy4uLy4uL1dlYkNvcmUvZ2VuZXJhdGVkCi0gICAgaXNFbXB0eShXQ19HRU5F UkFURURfU09VUkNFU19ESVIpOldFQktJVDJfR0VORVJBVEVEX1NPVVJDRVNfRElSID0gJCRQV0Qv Li4vLi4vV2ViS2l0Mi9nZW5lcmF0ZWQKLX0gZWxzZSB7Ci0gICAgaXNFbXB0eShXRUJLSVQyX0dF TkVSQVRFRF9TT1VSQ0VTX0RJUik6SlNDX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUiA9IC4uLy4uL0ph dmFTY3JpcHRDb3JlL2dlbmVyYXRlZAotICAgIGlzRW1wdHkoV0NfR0VORVJBVEVEX1NPVVJDRVNf RElSKTpXQ19HRU5FUkFURURfU09VUkNFU19ESVIgPSAuLi8uLi9XZWJDb3JlL2dlbmVyYXRlZAot ICAgIGlzRW1wdHkoV0NfR0VORVJBVEVEX1NPVVJDRVNfRElSKTpXRUJLSVQyX0dFTkVSQVRFRF9T T1VSQ0VTX0RJUiA9IC4uLy4uL1dlYktpdDIvZ2VuZXJhdGVkCi19Ci0KIGluY2x1ZGUoJCRQV0Qv QXBpL2hlYWRlcnMucHJpKQogaW5jbHVkZSgkJFNPVVJDRV9ESVIvV2ViS2l0LnByaSkKIGluY2x1 ZGUoJCRTT1VSQ0VfRElSL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnByaSkKIHdlYmtp dDIgewogICAgIGluY2x1ZGUoJCRTT1VSQ0VfRElSL1dlYktpdDIvV2ViS2l0Mi5wcmkpCiAgICAg aW5jbHVkZSgkJFNPVVJDRV9ESVIvV2ViS2l0Mi9XZWJLaXQyQVBJLnByaSkKLSAgICBJTkNMVURF UEFUSCArPSAkJE9VVFBVVF9ESVIvV2ViS2l0Mi9nZW5lcmF0ZWQKIH0KIGluY2x1ZGUoJCRTT1VS Q0VfRElSL1dlYkNvcmUvV2ViQ29yZS5wcmkpCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA2YzZlOWJiOGUyZDE4 ZjdjYWY2MzhkZTMzNzYyOGZjODhjNTExNjY2Li5mOGQ3MGU2NWYwZmJhZjVjMDBjY2EzNGVjZGRh YmNlYTRjZDk4MGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMTkgIEJh bGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQ2xlYW51cCBpbmNsdWRlcGF0aCBhZGp1 c3RtZW50IGZvciBnZW5lcmF0ZWQgZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU4ODY5CisKKyAgICAgICAgKiBXZWJLaXQyLnByaTogQWRkIHRo ZSBkaXJlY3Rvcnkgb2YgZ2VuZXJhdGVkIGZpbGVzIHRvIHRoZSBpbmNsdWRlCisgICAgICAgIHBh dGggd2l0aCBhYnNvbHV0ZSBwYXRoIHRvIG1ha2UgaXQgdmFsaWQgaW4gdGhlIGZpbmFsIGJ1aWxk IHN0ZXAuCisKIDIwMTEtMDQtMTggIEppYSBQdSAgPGpwdUBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgTWFyayBSb3dlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViS2l0 Mi5wcmkgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnByaQppbmRleCBjNmFlNzkyYjE4OGRjZTJl ZWUyOGNiMDc4MGI4ZjQ2ZGEyZDM0MGEwLi5kZTI3ZGE5NzBhYTAyNDEzZjkxMDc2MDQ1NjgzMGJm ODUzYzE0ZTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnByaQorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnByaQpAQCAtMTMsNyArMTMsNyBAQCBlbHNlOiBXRUJLSVQy X0RFU1RESVIgPSByZWxlYXNlCiBDT05GSUcoc3RhbmRhbG9uZV9wYWNrYWdlKSB7CiAgICAgaXNF bXB0eShXRUJLSVQyX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUik6V0VCS0lUMl9HRU5FUkFURURfU09V UkNFU19ESVIgPSAkJFBXRC9nZW5lcmF0ZWQKIH0gZWxzZSB7Ci0gICAgaXNFbXB0eShXRUJLSVQy X0dFTkVSQVRFRF9TT1VSQ0VTX0RJUik6V0VCS0lUMl9HRU5FUkFURURfU09VUkNFU19ESVIgPSBn ZW5lcmF0ZWQKKyAgICBpc0VtcHR5KFdFQktJVDJfR0VORVJBVEVEX1NPVVJDRVNfRElSKTpXRUJL SVQyX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUiA9ICQkT1VUUFVUX0RJUi9XZWJLaXQyL2dlbmVyYXRl ZAogfQogCiBXRUJLSVQyX0lOQ0xVREVQQVRIID0gXAo=