81844 2012-03-21 16:45:35 -0700 Actually move WTF files to their new home 2012-03-22 18:19:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 81884 82001 75673 81999 1 eric eric abarth cgarcia dbates gyuyoung.kim jberlin mitz morrita mrowe ossy rakuco sfalken oldest_to_newest 584763 0 eric 2012-03-21 16:45:35 -0700 Actually move WTF files to their new home 584764 1 eric 2012-03-21 16:46:53 -0700 Sad. It silently failed to add the patch. 584768 2 133143 eric 2012-03-21 16:49:29 -0700 Created attachment 133143 First attempt for the EWS bots 584769 3 eric 2012-03-21 16:51:53 -0700 I may try creating a github branch instead of trying to use patches, as this is gonna get ridiculous real fast. 584776 4 eric 2012-03-21 17:12:17 -0700 This is some sort of svn-apply "add" bug again. 584782 5 abarth 2012-03-21 17:15:13 -0700 I wonder if you should just land the patch and then try to pick up the pieces. Given that the header change is now landed, it might not be too bad... 584813 6 eric 2012-03-21 17:32:40 -0700 I suspect it won't be too bad. I'd been trying to avoid creating ire, but just telling folks when I'm going to land it is probably the better choice at this point. Our tools are just not designed for this kind of huge move. 585020 7 morrita 2012-03-22 00:18:10 -0700 FYI: I tried this locally with XCode4.2 + Mac SL, I didn't build. On WTF, NDEBUG is defined even for the debug build, that makes some symbols unavailable. I poked around a bit, but couldn't figure out why. 585088 8 cgarcia 2012-03-22 02:50:50 -0700 I managed to build the gtk port with a few changes in top of the patch and patch attached to bug #81884. I'll make another patch with the changes I made. 585102 9 133212 cgarcia 2012-03-22 03:25:30 -0700 Created attachment 133212 Patch to fix GTK+ build Applied on top of eric's patch and patch attached to bug #81884, this one fixes the GTK+ build. 585598 10 eric 2012-03-22 12:45:17 -0700 I've fixed Mac locally as well. I'll update the patch shortly. As announced on webkit-dev, I still plan to land this around 4PM this afternoon, and debug the buildbots from there. If others wish to pre-flight their various ports before then, I welcome the additional patches. 585600 11 133212 eric 2012-03-22 12:50:17 -0700 Comment on attachment 133212 Patch to fix GTK+ build View in context: https://bugs.webkit.org/attachment.cgi?id=133212&action=review > Source/WTF/GNUmakefile.am:35 > + -I$(srcdir)/Source/WTF/wtf I would not expect this to be necessary. 585602 12 cgarcia 2012-03-22 12:53:59 -0700 (In reply to comment #11) > (From update of attachment 133212 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133212&action=review > > > Source/WTF/GNUmakefile.am:35 > > + -I$(srcdir)/Source/WTF/wtf > > I would not expect this to be necessary. I don't remember exactly where, but there were headers included without the wtf/ inside WTF. 585616 13 133212 eric 2012-03-22 13:13:02 -0700 Comment on attachment 133212 Patch to fix GTK+ build View in context: https://bugs.webkit.org/attachment.cgi?id=133212&action=review >>> Source/WTF/GNUmakefile.am:35 >>> + -I$(srcdir)/Source/WTF/wtf >> >> I would not expect this to be necessary. > > I don't remember exactly where, but there were headers included without the wtf/ inside WTF. Ah, my bad. Yes, this seems totally necessary for *building* wtf. I was thinking it was another project trying to include wtf headers. wtf cpp files can just use "foo.h" and expect it to work. 585621 14 cgarcia 2012-03-22 13:15:15 -0700 (In reply to comment #13) > (From update of attachment 133212 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133212&action=review > > >>> Source/WTF/GNUmakefile.am:35 > >>> + -I$(srcdir)/Source/WTF/wtf > >> > >> I would not expect this to be necessary. > > > > I don't remember exactly where, but there were headers included without the wtf/ inside WTF. > > Ah, my bad. Yes, this seems totally necessary for *building* wtf. I was thinking it was another project trying to include wtf headers. wtf cpp files can just use "foo.h" and expect it to work. exactly :-) wtf_cppflags is only used by WTF itself. 585675 15 rakuco 2012-03-22 14:09:17 -0700 (In reply to comment #10) > If others wish to pre-flight their various ports before then, I welcome the additional patches. I couldn't use webkit-patch apply-from-bug to test this patch locally: Failed to run "[u'/home/rakuco/dev/webkit/WebKit/Tools/Scripts/svn-apply', u'--force']" exit_code: 2 cwd: /home/rakuco/dev/webkit/WebKit/ Last 500 characters of output: ictionVerifier.h patching file Source/WTF/wtf/ThreadSafeRefCounted.h patching file Source/WTF/wtf/ThreadSpecific.h patching file Source/WTF/wtf/ThreadSpecificWin.cpp patching file Source/WTF/wtf/Threading.cpp patching file Source/WTF/wtf/Threading.h patch: **** Only garbage was found in the patch input. fatal: pathspec 'Source/WTF/wtf/ThreadingNone.cpp' did not match any files Failed to git add Source/WTF/wtf/ThreadingNone.cpp. at /home/rakuco/dev/webkit/WebKit/Tools/Scripts/svn-apply line 444. Failed to run "[u'/home/rakuco/dev/webkit/WebKit/Tools/Scripts/svn-apply', u'--force']" exit_code: 2 cwd: /home/rakuco/dev/webkit/WebKit/ Any hints? 585740 16 ossy 2012-03-22 15:00:27 -0700 (In reply to comment #4) > This is some sort of svn-apply "add" bug again. If you remove these line, it will be applieable: diff --git a/Source/JavaScriptCore/wtf/ThreadingNone.cpp b/Source/JavaScriptCore/wtf/ThreadingNone.cpp deleted file mode 100644 index e69de29..0000000 585783 17 ossy 2012-03-22 15:29:38 -0700 *** Bug 79783 has been marked as a duplicate of this bug. *** 585791 18 133367 ossy 2012-03-22 15:34:51 -0700 Created attachment 133367 Qt buildfix for "First attempt for the EWS bots" 585798 19 133369 ossy 2012-03-22 15:40:38 -0700 Created attachment 133369 Qt buildfix with "First attempt for the EWS bots" for EWS Additionally I removed the entry I mentioned to make svn-apply happy. 585803 20 ossy 2012-03-22 15:44:31 -0700 I missed to test Qt-WK2 build, I'm on it now. 585813 21 eric 2012-03-22 15:55:17 -0700 I attempted to incorporate these changes in my local copy. Landing now. I will be around fixing bots until they're all building. I appreciate all of your help in this effort! 585819 22 eric 2012-03-22 16:01:17 -0700 Committed r111778: <http://trac.webkit.org/changeset/111778> 585840 23 mitz 2012-03-22 16:20:41 -0700 (In reply to comment #22) > Committed r111778: <http://trac.webkit.org/changeset/111778> This appears to have broken the Snow Leopard and Lion builds. 585842 24 eric 2012-03-22 16:22:00 -0700 Yup. Investigating. 585857 25 mitz 2012-03-22 16:36:37 -0700 Committed a build fix in <http://trac.webkit.org/r111782>. 585863 26 ossy 2012-03-22 16:39:53 -0700 Qt buildfixes landed in: http://trac.webkit.org/changeset/111780 http://trac.webkit.org/changeset/111783 585870 27 eric 2012-03-22 16:56:42 -0700 I don't know how to fix EFL/Cmake. It looks like at least JavaScriptCore/CMakeLists.txt needs to remove the ADD_SUBDIRECTORY(wtf) call. I'm not sure if the root CMakeList is already building Source/WTF and if it knows to build it before building JavaScriptCore. 585934 28 rakuco 2012-03-22 17:58:02 -0700 (In reply to comment #27) > I don't know how to fix EFL/Cmake. It looks like at least JavaScriptCore/CMakeLists.txt needs to remove the ADD_SUBDIRECTORY(wtf) call. I'm not sure if the root CMakeList is already building Source/WTF and if it knows to build it before building JavaScriptCore. Hopefully fixed with http://trac.webkit.org/r111799 133143 2012-03-21 16:49:29 -0700 2012-03-21 16:49:29 -0700 First attempt for the EWS bots big.patch text/plain 0 eric 133212 2012-03-22 03:25:30 -0700 2012-03-22 13:13:02 -0700 Patch to fix GTK+ build wtf-move.diff text/plain 2569 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5saXN0LmFtIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL0dOVW1ha2VmaWxlLmxpc3QuYW0KaW5kZXggNmJiNmMwOS4u YmM0MzdhYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5s aXN0LmFtCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCkBA IC01ODIsMTAgKzU4Miw5IEBAIGphdmFzY3JpcHRjb3JlX3NvdXJjZXMgKz0gXAogICAgICAgIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJTeW50YXhDaGVja2VyLmNwcCBcCiAgICAgICAg U291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyclN5bnRheENoZWNrZXIuaAogCi1pZiBUQVJH RVRfV0lOMzIKLWVsc2UKK2lmICFUQVJHRVRfV0lOMzIKIGphdmFzY3JpcHRjb3JlX3NvdXJjZXMg Kz0gXAotICAgICAgIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvRXhlY3V0YWJsZUFsbG9jYXRv ckZpeGVkVk1Qb29sLmNwcCBcCisgICAgICAgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9FeGVj dXRhYmxlQWxsb2NhdG9yRml4ZWRWTVBvb2wuY3BwCiBlbmRpZgogCiAjIG1pbmlkb20KZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KU0NUeXBlZEFycmF5U3R1YnMuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9KU0NUeXBlZEFycmF5U3R1YnMuaAppbmRleCBlMzU0NmVlLi4xNDNm YTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSlNDVHlwZWRBcnJheVN0dWJz LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0pTQ1R5cGVkQXJyYXlTdHVicy5oCkBAIC0y NiwxNiArMjYsOSBAQAogI2lmbmRlZiBKU0NUeXBlZEFycmF5U3R1YnNfaAogI2RlZmluZSBKU0NU eXBlZEFycmF5U3R1YnNfaAogCi0jaW5jbHVkZSAiRmxvYXQzMkFycmF5LmgiCi0jaW5jbHVkZSAi RmxvYXQ2NEFycmF5LmgiCi0jaW5jbHVkZSAiSW50MTZBcnJheS5oIgotI2luY2x1ZGUgIkludDMy QXJyYXkuaCIKLSNpbmNsdWRlICJJbnQ4QXJyYXkuaCIKICNpbmNsdWRlICJKU09iamVjdC5oIgog I2luY2x1ZGUgIk9iamVjdFByb3RvdHlwZS5oIgotI2luY2x1ZGUgIlVpbnQxNkFycmF5LmgiCi0j aW5jbHVkZSAiVWludDMyQXJyYXkuaCIKLSNpbmNsdWRlICJVaW50OEFycmF5LmgiCisjaW5jbHVk ZSA8d3RmL0ZvcndhcmQuaD4KIAogbmFtZXNwYWNlIEpTQyB7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAK aW5kZXggMTUxODRmOS4uY2IwODEyNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2pzYy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAKQEAgLTMzLDEyICsz MywxMiBAQAogI2luY2x1ZGUgIkpTRnVuY3Rpb24uaCIKICNpbmNsdWRlICJKU0xvY2suaCIKICNp bmNsdWRlICJKU1N0cmluZy5oIgotI2luY2x1ZGUgIk1haW5UaHJlYWQuaCIKICNpbmNsdWRlICJT YW1wbGluZ1Rvb2wuaCIKICNpbmNsdWRlIDxtYXRoLmg+CiAjaW5jbHVkZSA8c3RkaW8uaD4KICNp bmNsdWRlIDxzdGRsaWIuaD4KICNpbmNsdWRlIDxzdHJpbmcuaD4KKyNpbmNsdWRlIDx3dGYvTWFp blRocmVhZC5oPgogCiAjaWYgIU9TKFdJTkRPV1MpCiAjaW5jbHVkZSA8dW5pc3RkLmg+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV1RGL0dOVW1ha2VmaWxlLmFtIGIvU291cmNlL1dURi9HTlVtYWtlZmls ZS5hbQppbmRleCAwNzBmYjkwLi5hY2I0NDc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0dOVW1h a2VmaWxlLmFtCisrKyBiL1NvdXJjZS9XVEYvR05VbWFrZWZpbGUuYW0KQEAgLTMxLDcgKzMxLDgg QEAgbGliV1RGX2xhX0NGTEFHUyA9IFwKIAogd3RmX2NwcGZsYWdzICs9IFwKICAgICAgICAtSSQo c3JjZGlyKS9Tb3VyY2UgXAotICAgICAgIC1JJChzcmNkaXIpL1NvdXJjZS9XVEYKKyAgICAgICAt SSQoc3JjZGlyKS9Tb3VyY2UvV1RGIFwKKyAgICAgICAtSSQoc3JjZGlyKS9Tb3VyY2UvV1RGL3d0 ZgogCiBsaWJXVEZfbGFfQ1BQRkxBR1MgPSBcCiAgICAgICAgJChnbG9iYWxfY3BwZmxhZ3MpIFwK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvR05VbWFrZWZpbGUubGlzdC5hbSBiL1NvdXJjZS9XVEYv R05VbWFrZWZpbGUubGlzdC5hbQppbmRleCAwNzExYmYxLi4wOTA1MWE1IDEwMDY0NAotLS0gYS9T b3VyY2UvV1RGL0dOVW1ha2VmaWxlLmxpc3QuYW0KKysrIGIvU291cmNlL1dURi9HTlVtYWtlZmls ZS5saXN0LmFtCkBAIC0yMTYsNyArMjE2LDcgQEAgd3RmX3NvdXJjZXMgKz0gXAogICAgIFNvdXJj ZS9XVEYvd3RmL3VuaWNvZGUvQ29sbGF0b3JEZWZhdWx0LmNwcCBcCiAgICAgU291cmNlL1dURi93 dGYvdW5pY29kZS9VVEY4LmNwcCBcCiAgICAgU291cmNlL1dURi93dGYvdW5pY29kZS9VVEY4Lmgg XAotICAgIFNvdXJjZS9XVEYvd3RmL3VuaWNvZGUvVW5pY29kZS5oIFwKKyAgICBTb3VyY2UvV1RG L3d0Zi91bmljb2RlL1VuaWNvZGUuaAogCiBpZiBUQVJHRVRfV0lOMzIKIHd0Zl9zb3VyY2VzICs9 IFwKCg== 133367 2012-03-22 15:34:51 -0700 2012-03-22 15:34:51 -0700 Qt buildfix for "First attempt for the EWS bots" 1.patch text/plain 1876 ossy ZGlmZiAtLWdpdCBiL1NvdXJjZS9XVEYvV1RGLnByaSBhL1NvdXJjZS9XVEYvV1RGLnByaQppbmRl eCBiMzJkYzdmLi5mZWQ2NjZhIDEwMDY0NAotLS0gYi9Tb3VyY2UvV1RGL1dURi5wcmkKKysrIGEv U291cmNlL1dURi9XVEYucHJpCkBAIC0xNiw3ICsxNiw4IEBAIElOQ0xVREVQQVRIICs9IFwKICAg ICAkJFNPVVJDRV9ESVIgXAogICAgICQkU09VUkNFX0RJUi9nb2JqZWN0IFwKICAgICAkJFNPVVJD RV9ESVIvcXQgXAotICAgICQkU09VUkNFX0RJUi91bmljb2RlCisgICAgJCRTT1VSQ0VfRElSL3Vu aWNvZGUgXAorICAgICQkU09VUkNFX0RJUi93dGYKIAogaGF2ZVF0KDUpIHsKICAgICBtYWMgewpk aWZmIC0tZ2l0IGIvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaSBhL1NvdXJjZS9XZWJDb3JlL1Rh cmdldC5wcmkKaW5kZXggYjQ2MzAxZS4uYzdmMTAxMiAxMDA2NDQKLS0tIGIvU291cmNlL1dlYkNv cmUvVGFyZ2V0LnByaQorKysgYS9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCkBAIC0yMSw3ICsy MSw3IEBAIGhhdmVRdCg1KSB7CiAgICAgIyBwYXRoIGZvciBRdFNjcmlwdCB3aGVuIGl0J3MgYnVp bHQgYXMgYSBzdGFuZGFsb25lIG1vZHVsZQogICAgIFFUICs9IHNjcmlwdAogfSBlbHNlIHsKLSAg ICBJTkNMVURFUEFUSCArPSAkJFBXRC8uLi9KYXZhU2NyaXB0Q29yZS93dGYvcXQvY29tcGF0Cisg ICAgSU5DTFVERVBBVEggKz0gJCRQV0QvLi4vV1RGL3d0Zi9xdC9jb21wYXQKIH0KIAogUkVTT1VS Q0VTICs9IFwKZGlmZiAtLWdpdCBiL1NvdXJjZS9hcGkucHJpIGEvU291cmNlL2FwaS5wcmkKaW5k ZXggZjMwMzVhOS4uNmMyZGY3YiAxMDA2NDQKLS0tIGIvU291cmNlL2FwaS5wcmkKKysrIGEvU291 cmNlL2FwaS5wcmkKQEAgLTIwMCw3ICsyMDAsOCBAQCBIRUFERVJTICs9IFwKIAogSU5DTFVERVBB VEggKz0gXAogICAgICQkUFdEL1dlYktpdC9xdC9BcGkgXAotICAgICQkUFdEL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydAorICAgICQkUFdEL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydCBcCisgICAg JCRQV0QvV1RGL3d0Zi9xdAogCiBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfVklERU89MSkgewog ICAgICFjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX1FUS0lUPTEpOiFjb250YWlucyhERUZJTkVT LCBXVEZfVVNFX0dTVFJFQU1FUj0xKTpjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX1FUX01VTFRJ TUVESUE9MSkgewpkaWZmIC0tZ2l0IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRl clRyZWUucHJvIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWUucHJvCmlu ZGV4IDU0YmNkYmYuLmMxMTYzODggMTAwNjQ0Ci0tLSBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0R1bXBSZW5kZXJUcmVlLnBybworKysgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVu ZGVyVHJlZS5wcm8KQEAgLTExLDcgKzExLDcgQEAgREVTVERJUiA9ICQkUk9PVF9CVUlMRF9ESVIv YmluCiAKIGxvYWQoZmVhdHVyZXMpCiAKLVdFQktJVCArPSB3dGYgd2ViY29yZQorV0VCS0lUICs9 IHd0ZiBqYXZhc2NyaXB0Y29yZSB3ZWJjb3JlCiAKIElOQ0xVREVQQVRIICs9IFwKICAgICAkJFBX RC8uLiBcCkBAIC0zNiw3ICszNiw3IEBAIEhFQURFUlMgKz0gXAogICAgIHRlc3RwbHVnaW4uaAog CiBTT1VSQ0VTICs9IFwKLSAgICAkJHtST09UX1dFQktJVF9ESVJ9L1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS93dGYvQXNzZXJ0aW9ucy5jcHAgXAorICAgICQke1JPT1RfV0VCS0lUX0RJUn0vU291cmNl L1dURi93dGYvQXNzZXJ0aW9ucy5jcHAgXAogICAgICQkUFdELy4uL1dvcmtRdWV1ZS5jcHAgXAog ICAgIER1bXBSZW5kZXJUcmVlUXQuY3BwIFwKICAgICBFdmVudFNlbmRlclF0LmNwcCBcCg== 133369 2012-03-22 15:40:38 -0700 2012-03-22 15:40:38 -0700 Qt buildfix with "First attempt for the EWS bots" for EWS 1.patch text/plain 0 ossy