Attachment 373398 Details for Bug 199449 – Patch

[patch] Patch

bug-199449-20190703192347.patch (text/plain), 1.54 KB, created by Carlos Alberto Lopez Perez on 2019-07-03 10:23:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Alberto Lopez Perez

Created: 2019-07-03 10:23:48 PDT

Size: 1.54 KB

patch

obsolete

>Subversion Revision: 247091
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 8fb514c040e8b79e58f9a69aa66f178723b22714..aac7303088b4fd687f3701b03f0112fcba1796af 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-07-03  Carlos Alberto Lopez Perez  <clopez@igalia.com>
>+
>+        [GTK][WPE][CMake] The CMake cache should be clean when the JHBuild is rebuilt
>+        https://bugs.webkit.org/show_bug.cgi?id=199449
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitdirs.pm:
>+        (shouldRemoveCMakeCache): Clean the CMake cache if we detect that the JHBuild has been rebuilt.
>+
> 2019-07-03  Aakash Jain  <aakash_jain@apple.com>
> 
>         Unreviewed follow-up fix to r247049, default the platform to '*' when platform property is not set.
>diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
>index 67cc17a6b116c6001d3099302b85009a0c49ef3c..b2fafd7ef27cf6873b0fb3e6e6c623192fd40835 100755
>--- a/Tools/Scripts/webkitdirs.pm
>+++ b/Tools/Scripts/webkitdirs.pm
>@@ -2120,6 +2120,15 @@ sub shouldRemoveCMakeCache(@)
>         }
>     }
> 
>+    # If a change on the JHBuild moduleset has been done, we need to clean the cache as well.
>+    if (isGtk() || isWPE()) {
>+        my $jhbuildRootDirectory = File::Spec->catdir(getJhbuildPath(), "Root");
>+        # The script update-webkit-libs-jhbuild shall re-generate $jhbuildRootDirectory if the moduleset changed.
>+        if (-d $jhbuildRootDirectory && $cacheFileModifiedTime < stat($jhbuildRootDirectory)->mtime) {
>+            return 1;
>+        }
>+    }
>+
>     return 0;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 199449: 373398