Bug 129380

Summary: [GTK][CMake] build-webkit should rerun cmake if the Makefile is missing
Product: WebKit Reporter: Martin Robinson <mrobinson>
Component: WebKitGTKAssignee: Martin Robinson <mrobinson>
Status: RESOLVED FIXED    
Severity: Normal CC: commit-queue, dbates
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch pnormand: review+

Description Martin Robinson 2014-02-26 10:43:18 PST 
We try to avoid running cmake when we don't have to. There are circumstances where CMake creates the CMake cache, but not the Makefile or the Makefile is removed. In those cases, we should rerun cmake instead of skipping it.
Comment 1 Martin Robinson 2014-02-26 11:17:30 PST 
Created attachment 225268 [details]
Patch
Comment 2 Philippe Normand 2014-03-05 08:07:42 PST 
Comment on attachment 225268 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=225268&action=review

> Tools/Scripts/webkitdirs.pm:1982
> +    if (isGtk() && -e cmakeCachePath() && -e File::Spec->catdir(baseProductDir(), configuration(), "Makefile")) {

Shouldn't it be catfile?
Comment 3 Philippe Normand 2014-03-05 08:26:51 PST 
Comment on attachment 225268 [details]
Patch

Well it would work with catdir but if you can use catfile for consistency sake before landing it'd be great :)
Comment 4 Martin Robinson 2014-03-05 08:46:46 PST 
Committed r165111: <http://trac.webkit.org/changeset/165111>