Title: [120032] trunk/Tools
- Revision
- 120032
- Author
- [email protected]
- Date
- 2012-06-11 20:04:28 -0700 (Mon, 11 Jun 2012)
Log Message
[EFL] Remove CMakeCache.txt before building
https://bugs.webkit.org/show_bug.cgi?id=88717
Patch by Christophe Dumez <[email protected]> on 2012-06-11
Reviewed by Antonio Gomes.
Remove CMake cache file before every build to avoid using outdated
build flags when new features get enabled. This will avoid unexpected
failures on the bots due to outdated build flags.
* Scripts/webkitdirs.pm:
(generateBuildSystemFromCMakeProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (120031 => 120032)
--- trunk/Tools/ChangeLog 2012-06-12 03:02:16 UTC (rev 120031)
+++ trunk/Tools/ChangeLog 2012-06-12 03:04:28 UTC (rev 120032)
@@ -1,3 +1,17 @@
+2012-06-11 Christophe Dumez <[email protected]>
+
+ [EFL] Remove CMakeCache.txt before building
+ https://bugs.webkit.org/show_bug.cgi?id=88717
+
+ Reviewed by Antonio Gomes.
+
+ Remove CMake cache file before every build to avoid using outdated
+ build flags when new features get enabled. This will avoid unexpected
+ failures on the bots due to outdated build flags.
+
+ * Scripts/webkitdirs.pm:
+ (generateBuildSystemFromCMakeProject):
+
2012-06-11 Vincent Scheib <[email protected]>
Add new Pointer Lock spec attribute webkitPointerLockElement.
Modified: trunk/Tools/Scripts/webkitdirs.pm (120031 => 120032)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-06-12 03:02:16 UTC (rev 120031)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-06-12 03:04:28 UTC (rev 120032)
@@ -2095,6 +2095,12 @@
$ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
}
+ # Remove CMakeCache.txt to avoid using outdated build flags
+ if (isEfl()) {
+ my $cacheFilePath = File::Spec->catdir($buildPath, "CMakeCache.txt");
+ unlink($cacheFilePath) if -e $cacheFilePath;
+ }
+
# We call system("cmake @args") instead of system("cmake", @args) so that @args is
# parsed for shell metacharacters.
my $wrapper = jhbuildWrapperPrefixIfNeeded() . " ";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
