Bug 148003 - Move some commands from ./CMakeLists.txt to Source/cmake
Summary: Move some commands from ./CMakeLists.txt to Source/cmake
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Alex Christensen
URL:
Keywords:
Depends on: 148015
Blocks:
  Show dependency treegraph
 
Reported: 2015-08-13 16:57 PDT by Alex Christensen
Modified: 2015-08-18 04:49 PDT (History)
3 users (show)

See Also:


Attachments
Patch (8.30 KB, patch)
2015-08-13 17:02 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (27.21 KB, patch)
2015-08-17 13:04 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex Christensen 2015-08-13 16:57:54 PDT
When building everything separately like the Apple builds do, we need some functionality to be in Source/cmake instead of ./CMakeLists.txt to minimize the duplicate commands.
Comment 1 Alex Christensen 2015-08-13 17:02:16 PDT
Created attachment 258958 [details]
Patch
Comment 2 Brent Fulgham 2015-08-13 17:05:01 PDT
Comment on attachment 258958 [details]
Patch

r=me
Comment 3 WebKit Commit Bot 2015-08-13 19:14:33 PDT
Comment on attachment 258958 [details]
Patch

Clearing flags on attachment: 258958

Committed r188428: <http://trac.webkit.org/changeset/188428>
Comment 4 WebKit Commit Bot 2015-08-13 19:14:39 PDT
All reviewed patches have been landed.  Closing bug.
Comment 5 WebKit Commit Bot 2015-08-13 21:49:47 PDT
Re-opened since this is blocked by bug 148015
Comment 6 Alex Christensen 2015-08-17 13:04:54 PDT
Created attachment 259172 [details]
Patch
Comment 7 Alex Christensen 2015-08-17 13:06:05 PDT
This time I renamed OptionsWindows to OptionsWin and that fixed Windows.  I'll reland this once it passes another CMake EWS.
Comment 8 Alex Christensen 2015-08-17 13:43:20 PDT
Recommitted to http://trac.webkit.org/changeset/188540
Comment 9 Xabier Rodríguez Calvar 2015-08-18 04:11:15 PDT
This creates a problem with building GTK+ from scratch, as you don't get WTR and I think you don't get the launcher either.
Comment 10 Xabier Rodríguez Calvar 2015-08-18 04:18:01 PDT
(In reply to comment #9)
> This creates a problem with building GTK+ from scratch, as you don't get WTR
> and I think you don't get the launcher either.

And even after reverting this, I don't get WTR, so I guess there's something else.
Comment 11 Carlos Alberto Lopez Perez 2015-08-18 04:43:22 PDT
Also with the perf tests:

$ Tools/Scripts/run-perf-tests --platform gtk --release
WebKitTestRunner was not found at /home/gardener/WebKit/WebKitBuild/Release/bin/WebKitTestRunner
Build not up to date for /home/gardener/WebKit/WebKitBuild/Release/bin/WebKitTestRunner


The issue is that WebKitTestRunner is not longer built:

$ find WebKitBuild/Release/ -type f -executable
WebKitBuild/Release/CMakeFiles/3.0.2/CMakeDetermineCompilerABI_C.bin
WebKitBuild/Release/CMakeFiles/3.0.2/CMakeDetermineCompilerABI_CXX.bin
WebKitBuild/Release/CMakeFiles/3.0.2/CompilerIdCXX/a.out
WebKitBuild/Release/CMakeFiles/3.0.2/CompilerIdC/a.out
WebKitBuild/Release/bin/WebKitNetworkProcess
WebKitBuild/Release/bin/jsc
WebKitBuild/Release/bin/WebKitDatabaseProcess
WebKitBuild/Release/bin/WebKitPluginProcess
WebKitBuild/Release/bin/WebKitPluginProcess2
WebKitBuild/Release/bin/LLIntOffsetsExtractor
WebKitBuild/Release/bin/WebKitWebProcess
WebKitBuild/Release/lib/libjavascriptcoregtk-4.0.so.18.2.4
WebKitBuild/Release/lib/libwebkit2gtkinjectedbundle.so
WebKitBuild/Release/lib/libgtest.so
WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37.10.0


This is probably the issue causing the GTK perf bot to fail on all the tests


I'm going to open a bug for this regression
Comment 12 Carlos Alberto Lopez Perez 2015-08-18 04:49:22 PDT
Reported: https://bugs.webkit.org/show_bug.cgi?id=148127