Title: [202095] trunk/Tools
- Revision
- 202095
- Author
- [email protected]
- Date
- 2016-06-15 10:08:08 -0700 (Wed, 15 Jun 2016)
Log Message
[Win][CMake] Changes in WebKit options are not reflected in incremental builds.
https://bugs.webkit.org/show_bug.cgi?id=158727
Reviewed by Alex Christensen.
Delete CMake cache file if WebKit options have been modified.
* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(shouldRemoveCMakeCache):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (202094 => 202095)
--- trunk/Tools/ChangeLog 2016-06-15 16:45:31 UTC (rev 202094)
+++ trunk/Tools/ChangeLog 2016-06-15 17:08:08 UTC (rev 202095)
@@ -1,3 +1,16 @@
+2016-06-15 Per Arne Vollan <[email protected]>
+
+ [Win][CMake] Changes in WebKit options are not reflected in incremental builds.
+ https://bugs.webkit.org/show_bug.cgi?id=158727
+
+ Reviewed by Alex Christensen.
+
+ Delete CMake cache file if WebKit options have been modified.
+
+ * Scripts/build-webkit:
+ * Scripts/webkitdirs.pm:
+ (shouldRemoveCMakeCache):
+
2016-06-15 Romain Bellessort <[email protected]>
Enabling Shadow DOM for all platforms
Modified: trunk/Tools/Scripts/build-webkit (202094 => 202095)
--- trunk/Tools/Scripts/build-webkit 2016-06-15 16:45:31 UTC (rev 202094)
+++ trunk/Tools/Scripts/build-webkit 2016-06-15 17:08:08 UTC (rev 202095)
@@ -243,6 +243,9 @@
my $baseProductDir = baseProductDir();
if (isAppleWinWebKit() || isWinCairo()) {
+ my @featureArgs = cMakeArgsFromFeatures();
+ removeCMakeCache(@featureArgs);
+
chdirWebKit();
if (exitStatus(generateBuildSystemFromCMakeProject())) {
die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
Modified: trunk/Tools/Scripts/webkitdirs.pm (202094 => 202095)
--- trunk/Tools/Scripts/webkitdirs.pm 2016-06-15 16:45:31 UTC (rev 202094)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-06-15 17:08:08 UTC (rev 202095)
@@ -1904,6 +1904,13 @@
return 1;
}
+ if(isAnyWindows()) {
+ my $winConfiguration = File::Spec->catdir(sourceDir(), "Source", "cmake", "OptionsWin.cmake");
+ if ($cacheFileModifiedTime < stat($winConfiguration)->mtime) {
+ return 1;
+ }
+ }
+
return 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
