Title: [122956] trunk/Tools
- Revision
- 122956
- Author
- commit-qu...@webkit.org
- Date
- 2012-07-18 05:59:23 -0700 (Wed, 18 Jul 2012)
Log Message
[CMake][EFL] Building jsc causes reconfiguration
https://bugs.webkit.org/show_bug.cgi?id=91387
Patch by Thiago Marcos P. Santos <thiago.san...@intel.com> on 2012-07-18
Reviewed by Daniel Bates.
We should remove CMakeCache only when running build-webkit script,
otherwise it will cause a reconfiguration every time someone calls
generateBuildSystemFromCMakeProject(). We were re-building "jsc" and
not running WebKit2 unit tests on the bots because the project was
reconfigured with default values by the scripts that run these tests.
* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(removeCMakeCache):
(generateBuildSystemFromCMakeProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (122955 => 122956)
--- trunk/Tools/ChangeLog 2012-07-18 12:59:21 UTC (rev 122955)
+++ trunk/Tools/ChangeLog 2012-07-18 12:59:23 UTC (rev 122956)
@@ -1,3 +1,21 @@
+2012-07-18 Thiago Marcos P. Santos <thiago.san...@intel.com>
+
+ [CMake][EFL] Building jsc causes reconfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=91387
+
+ Reviewed by Daniel Bates.
+
+ We should remove CMakeCache only when running build-webkit script,
+ otherwise it will cause a reconfiguration every time someone calls
+ generateBuildSystemFromCMakeProject(). We were re-building "jsc" and
+ not running WebKit2 unit tests on the bots because the project was
+ reconfigured with default values by the scripts that run these tests.
+
+ * Scripts/build-webkit:
+ * Scripts/webkitdirs.pm:
+ (removeCMakeCache):
+ (generateBuildSystemFromCMakeProject):
+
2012-07-18 Seokju Kwon <seokju.k...@samsung.com>
[EFL][DRT] Add support for Web Inspector in WebKit-EFL DRT
Modified: trunk/Tools/Scripts/build-webkit (122955 => 122956)
--- trunk/Tools/Scripts/build-webkit 2012-07-18 12:59:21 UTC (rev 122955)
+++ trunk/Tools/Scripts/build-webkit 2012-07-18 12:59:23 UTC (rev 122956)
@@ -319,6 +319,11 @@
$makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
$cmakeArgs .= ($cmakeArgs ? " " : "") . "-DENABLE_WEBKIT=ON";
$cmakeArgs .= " -DENABLE_WEBKIT2=ON" if !$noWebKit2;
+
+ # We remove CMakeCache to avoid the bots to reuse cached flags when
+ # we enable new features. This forces a reconfiguration.
+ removeCMakeCache();
+
buildCMakeProjectOrExit($clean, "Efl", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
}
Modified: trunk/Tools/Scripts/webkitdirs.pm (122955 => 122956)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-07-18 12:59:21 UTC (rev 122955)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-07-18 12:59:23 UTC (rev 122956)
@@ -2128,6 +2128,12 @@
return "";
}
+sub removeCMakeCache()
+{
+ my $cacheFilePath = File::Spec->catdir(baseProductDir(), configuration(), "CMakeCache.txt");
+ unlink($cacheFilePath) if -e $cacheFilePath;
+}
+
sub generateBuildSystemFromCMakeProject
{
my ($port, $prefixPath, @cmakeArgs, $additionalCMakeArgs) = @_;
@@ -2167,12 +2173,6 @@
saveJhbuildMd5();
}
- # 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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
