Move WebKit into Source
Created attachment 79093 [details] Patch
Attachment 79093 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Android.mk', u'CMakeLists.txt', u'ChangeLo..." exit_code: 1 Tools/QtTestBrowser/launcherwindow.h:70: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 48 files If any of these errors are false positives, please file a bug against check-webkit-style.
Attachment 79093 [details] did not build on chromium: Build output: http://queues.webkit.org/results/7532114
Attachment 79093 [details] did not build on qt: Build output: http://queues.webkit.org/results/7507112
EWS failures expected because this patch doesn't include the actual move. We'll also need (at least) this patch downstream for Chromium. Index: glue/webkit_glue.gypi =================================================================== --- glue/webkit_glue.gypi (revision 71432) +++ glue/webkit_glue.gypi (working copy) @@ -6,7 +6,7 @@ 'variables': { 'conditions': [ ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../..', + 'webkit_src_dir': '../../../../..', },{ 'webkit_src_dir': '../../third_party/WebKit', }], @@ -45,7 +45,7 @@ { 'action_name': 'webkit_chromium_resources', 'variables': { - 'input_path': '<(webkit_src_dir)/WebKit/chromium/WebKit.grd', + 'input_path': '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.grd', }, 'inputs': [ '<!@(<(grit_info_cmd) --inputs <(input_path))', @@ -512,11 +512,11 @@ 'conditions': [ ['inside_chromium_build==1 and component=="shared_library"', { 'dependencies': [ - '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', ], 'export_dependent_settings': [ - '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', ], }],
Attachment 79093 [details] did not build on win: Build output: http://queues.webkit.org/results/7583121
Created attachment 79094 [details] Downstream patch for Chromium This is a more complete downstream patch for Chromium. The real downstream patch is actually larger. We need to update the root DEPS and adjust a bunch of include directives in source files.
This move is by far the most complex. I'm going to leave this patch up here for a bit to see if folks have comments before actually landing it. (Note: the attached patch doesn't actually move the directory---if you want to try it, you'll have to do the move manually.)
Comment on attachment 79093 [details] Patch I tested this patch, Qt build is OK.
> I tested this patch, Qt build is OK. Thanks!
Comment on attachment 79093 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79093&action=review Builds fine in GTK+ with the following typos fixed. > GNUmakefile.am:236 > +include SOurce/WebKit/gtk/po/GNUmakefile.am Type, SOurce. > WebKit/gtk/GNUmakefile.am:432 > +Programs_unittests_testdomdocument_SOURCES = Soource/WebKit/gtk/tests/testdomdocument.c Type, Soource.
I can't believe I wrote 'Type' twice there...
> Builds fine in GTK+ with the following typos fixed. Thanks for trying it out. Issues fixed.
Created attachment 79116 [details] Patch
Attachment 79116 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Android.mk', u'CMakeLists.txt', u'ChangeLo..." exit_code: 1 Tools/QtTestBrowser/launcherwindow.h:70: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 48 files If any of these errors are false positives, please file a bug against check-webkit-style.
Attachment 79116 [details] did not build on chromium: Build output: http://queues.webkit.org/results/7525144
Attachment 79116 [details] did not build on qt: Build output: http://queues.webkit.org/results/7495148
Attachment 79116 [details] did not build on win: Build output: http://queues.webkit.org/results/7572126
Committed r75908: <http://trac.webkit.org/changeset/75908>