Bug 129380 - [GTK][CMake] build-webkit should rerun cmake if the Makefile is missing
Summary: [GTK][CMake] build-webkit should rerun cmake if the Makefile is missing
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKitGTK (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Martin Robinson
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-02-26 10:43 PST by Martin Robinson
Modified: 2014-03-05 08:46 PST (History)
2 users (show)

See Also:


Attachments
Patch (1.42 KB, patch)
2014-02-26 11:17 PST, Martin Robinson
pnormand: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
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>