Bug 81844 - Actually move WTF files to their new home
Summary: Actually move WTF files to their new home
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Eric Seidel (no email)
URL:
Keywords:
: 79783 (view as bug list)
Depends on: 81884 82001
Blocks: 75673 81999
  Show dependency treegraph
 
Reported: 2012-03-21 16:45 PDT by Eric Seidel (no email)
Modified: 2012-03-22 18:19 PDT (History)
11 users (show)

See Also:


Attachments
First attempt for the EWS bots (deleted)
2012-03-21 16:49 PDT, Eric Seidel (no email)
no flags Details | Formatted Diff | Diff
Patch to fix GTK+ build (2.51 KB, patch)
2012-03-22 03:25 PDT, Carlos Garcia Campos
no flags Details | Formatted Diff | Diff
Qt buildfix for "First attempt for the EWS bots" (1.83 KB, patch)
2012-03-22 15:34 PDT, Csaba Osztrogonác
no flags Details | Formatted Diff | Diff
Qt buildfix with "First attempt for the EWS bots" for EWS (deleted)
2012-03-22 15:40 PDT, Csaba Osztrogonác
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Seidel (no email) 2012-03-21 16:45:35 PDT
Actually move WTF files to their new home
Comment 1 Eric Seidel (no email) 2012-03-21 16:46:53 PDT
Sad.  It silently failed to add the patch.
Comment 2 Eric Seidel (no email) 2012-03-21 16:49:29 PDT
Created attachment 133143 [details]
First attempt for the EWS bots
Comment 3 Eric Seidel (no email) 2012-03-21 16:51:53 PDT
I may try creating a github branch instead of trying to use patches, as this is gonna get ridiculous real fast.
Comment 4 Eric Seidel (no email) 2012-03-21 17:12:17 PDT
This is some sort of svn-apply "add" bug again.
Comment 5 Adam Barth 2012-03-21 17:15:13 PDT
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...
Comment 6 Eric Seidel (no email) 2012-03-21 17:32:40 PDT
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.
Comment 7 Hajime Morrita 2012-03-22 00:18:10 PDT
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.
Comment 8 Carlos Garcia Campos 2012-03-22 02:50:50 PDT
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.
Comment 9 Carlos Garcia Campos 2012-03-22 03:25:30 PDT
Created attachment 133212 [details]
Patch to fix GTK+ build

Applied on top of eric's patch and patch attached to bug #81884, this one fixes the GTK+ build.
Comment 10 Eric Seidel (no email) 2012-03-22 12:45:17 PDT
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.
Comment 11 Eric Seidel (no email) 2012-03-22 12:50:17 PDT
Comment on attachment 133212 [details]
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.
Comment 12 Carlos Garcia Campos 2012-03-22 12:53:59 PDT
(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.
Comment 13 Eric Seidel (no email) 2012-03-22 13:13:02 PDT
Comment on attachment 133212 [details]
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.
Comment 14 Carlos Garcia Campos 2012-03-22 13:15:15 PDT
(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.
Comment 15 Raphael Kubo da Costa (:rakuco) 2012-03-22 14:09:17 PDT
(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?
Comment 16 Csaba Osztrogonác 2012-03-22 15:00:27 PDT
(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
Comment 17 Csaba Osztrogonác 2012-03-22 15:29:38 PDT
*** Bug 79783 has been marked as a duplicate of this bug. ***
Comment 18 Csaba Osztrogonác 2012-03-22 15:34:51 PDT
Created attachment 133367 [details]
Qt buildfix for "First attempt for the EWS bots"
Comment 19 Csaba Osztrogonác 2012-03-22 15:40:38 PDT
Created attachment 133369 [details]
Qt buildfix with "First attempt for the EWS bots" for EWS

Additionally I removed the entry I mentioned to make svn-apply happy.
Comment 20 Csaba Osztrogonác 2012-03-22 15:44:31 PDT
I missed to test Qt-WK2 build, I'm on it now.
Comment 21 Eric Seidel (no email) 2012-03-22 15:55:17 PDT
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!
Comment 22 Eric Seidel (no email) 2012-03-22 16:01:17 PDT
Committed r111778: <http://trac.webkit.org/changeset/111778>
Comment 23 mitz 2012-03-22 16:20:41 PDT
(In reply to comment #22)
> Committed r111778: <http://trac.webkit.org/changeset/111778>

This appears to have broken the Snow Leopard and Lion builds.
Comment 24 Eric Seidel (no email) 2012-03-22 16:22:00 PDT
Yup.  Investigating.
Comment 25 mitz 2012-03-22 16:36:37 PDT
Committed a build fix in <http://trac.webkit.org/r111782>.
Comment 26 Csaba Osztrogonác 2012-03-22 16:39:53 PDT
Qt buildfixes landed in:
http://trac.webkit.org/changeset/111780
http://trac.webkit.org/changeset/111783
Comment 27 Eric Seidel (no email) 2012-03-22 16:56:42 PDT
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.
Comment 28 Raphael Kubo da Costa (:rakuco) 2012-03-22 17:58:02 PDT
(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