RESOLVED DUPLICATE of bug 26293 26340
[Qt] Build break introduced by r44550
https://bugs.webkit.org/show_bug.cgi?id=26340
Summary [Qt] Build break introduced by r44550
Laszlo Gombos
Reported 2009-06-11 20:04:25 PDT
I found two problems: 1. JavaScriptCore/runtime/JSONObject.cpp needs to be listed as a LUT_FILE as well 2. name collision between WebCore/inspector/JSONObject.cpp and the newly created JavaScriptCore/runtime/JSONObject.cpp (all .o's are generated in the same dir for QtWebKit) I was not sure how to resolve 2. I few ideas: - rename one of the JSONObject.cpp (e.g. to InspectorJSONObject.cpp) - create JavaScriptCore library first and and link it to WebCore to avoid collision Will submit patch for 1. (LUT_FILE); this should at least fix the standalone jsc build.
Attachments
Add JSONObject.cpp to LUT files for JavaScripCore (990 bytes, patch)
2009-06-11 20:08 PDT, Laszlo Gombos
no flags
Fix Qt build break by rename JSONObject in inspector (32.92 KB, patch)
2009-06-12 09:50 PDT, Joseph Ligman
no flags
Fix Qt build break by rename JSONObject in inspector (31.67 KB, patch)
2009-06-12 11:27 PDT, Joseph Ligman
no flags
Fix Qt build break by rename JSONObject in inspector (35.57 KB, patch)
2009-06-13 07:40 PDT, Joseph Ligman
no flags
Laszlo Gombos
Comment 1 2009-06-11 20:08:14 PDT
Created attachment 31190 [details] Add JSONObject.cpp to LUT files for JavaScripCore
Jan Alonzo
Comment 2 2009-06-12 05:17:00 PDT
Comment on attachment 31190 [details] Add JSONObject.cpp to LUT files for JavaScripCore > --- JavaScriptCore/JavaScriptCore.pri (revision 44621) > +++ JavaScriptCore/JavaScriptCore.pri (working copy) > @@ -69,6 +69,7 @@ include(pcre/pcre.pri) > > LUT_FILES += \ > runtime/DatePrototype.cpp \ > + runtime/JSONObject.cpp \ > runtime/NumberConstructor.cpp \ > runtime/StringPrototype.cpp \ > runtime/ArrayPrototype.cpp \ Looks fine. r=me.
Laszlo Gombos
Comment 3 2009-06-12 08:02:19 PDT
Comment on attachment 31190 [details] Add JSONObject.cpp to LUT files for JavaScripCore Landed as http://trac.webkit.org/changeset/44623.
Laszlo Gombos
Comment 4 2009-06-12 08:03:09 PDT
Based on some discussions on #webkit the proposal to resolve the remaining build break is to rename WebCore/inspector/JSONObject.cpp to InspectorJSONObject.cpp (and change the class name as well).
Joseph Ligman
Comment 5 2009-06-12 09:50:09 PDT
Created attachment 31199 [details] Fix Qt build break by rename JSONObject in inspector I don't have all the ports so was unable to verify all builds.
Joseph Ligman
Comment 6 2009-06-12 11:27:55 PDT
Created attachment 31204 [details] Fix Qt build break by rename JSONObject in inspector There was a problem with the ChangeLog in the previous patch. I don't have all the ports so I am unable to verify all builds.
Dimitri Glazkov (Google)
Comment 7 2009-06-12 11:33:00 PDT
Did you use svn mv for the file move?
Joseph Ligman
Comment 8 2009-06-12 13:51:23 PDT
Sorry I did not. I can do that, but maybe pfeldman will have some other comments.
Jan Alonzo
Comment 9 2009-06-12 15:30:43 PDT
Comment on attachment 31190 [details] Add JSONObject.cpp to LUT files for JavaScripCore Clearing review flag as the patch has landed.
Joseph Ligman
Comment 10 2009-06-13 07:40:41 PDT
Created attachment 31235 [details] Fix Qt build break by rename JSONObject in inspector This one uses svn move instead of just add and delete
Timothy Hatcher
Comment 11 2009-06-13 16:08:08 PDT
Now that I look at JSONObject, it is just to similar to ScriptObject. I think it can go, and just make ScriptObject support JSON stringify and creation from a JSON string. Dimitri, Pavel, do you think that would work?
Timothy Hatcher
Comment 12 2009-06-13 16:45:02 PDT
*** This bug has been marked as a duplicate of 26293 ***
Pavel Feldman
Comment 13 2009-06-14 00:48:16 PDT
(In reply to comment #11) > Now that I look at JSONObject, it is just to similar to ScriptObject. I think > it can go, and just make ScriptObject support JSON stringify and creation from > a JSON string. Dimitri, Pavel, do you think that would work? > I agree that there is a redundancy here. However, I am not sure that Script* is now exactly what we need, so we might need to tweak them a bit. To reduce the number of the moving parts, I'd suggest that this one is fixed as suggested (via renaming Inspector's one to a more specific name) now. In the meanwhile, I would like to learn more on the new stringify API in WebKit and find a good way of Script*, new JSON.stringify and Chromium's JSON capabilities playing together nicely.
Dimitri Glazkov (Google)
Comment 14 2009-06-14 10:39:09 PDT
I am fine with Pavel's opinion. I kinda like Timothy's suggestion though. Color me ambivalent.
Simon Hausmann
Comment 15 2009-06-15 04:52:24 PDT
Comment on attachment 31235 [details] Fix Qt build break by rename JSONObject in inspector Thanks Joe!
Simon Hausmann
Comment 16 2009-06-15 04:54:10 PDT
Comment on attachment 31235 [details] Fix Qt build break by rename JSONObject in inspector Landed in 44682. Clearning review but leaving the bug open for further discussion around the json classes. Pavel, Timothy, do you prefer a separate bugzilla entry for that?
Tor Arne Vestbø
Comment 17 2009-06-15 04:58:29 PDT
(In reply to comment #16) > (From update of attachment 31235 [details] [review]) > Landed in 44682. Clearning review but leaving the bug open for further > discussion around the json classes. Pavel, Timothy, do you prefer a separate > bugzilla entry for that? I think discussions are in https://bugs.webkit.org/show_bug.cgi?id=26293
Note You need to log in before you can comment on or make changes to this bug.