Title: [165267] trunk/Tools
- Revision
- 165267
- Author
- [email protected]
- Date
- 2014-03-07 09:27:42 -0800 (Fri, 07 Mar 2014)
Log Message
[GTK] buid-webkit should use CMake by default
https://bugs.webkit.org/show_bug.cgi?id=129855
Reviewed by Carlos Garcia Campos.
Make the CMake build the default GTK+ build when using build-webkit. This will
ensure that all bots are using CMake. We do this by swapping --gtk and --gtkcmake,
so that we have --gtk and --gtkautotools.
* Scripts/webkitdirs.pm: Swap --gtkcmake/--gtk for --gtk/--gtkautotools.
* Scripts/webkitpy/port/gtk.py: Ditto.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (165266 => 165267)
--- trunk/Tools/ChangeLog 2014-03-07 17:21:46 UTC (rev 165266)
+++ trunk/Tools/ChangeLog 2014-03-07 17:27:42 UTC (rev 165267)
@@ -1,3 +1,17 @@
+2014-03-07 Martin Robinson <[email protected]>
+
+ [GTK] buid-webkit should use CMake by default
+ https://bugs.webkit.org/show_bug.cgi?id=129855
+
+ Reviewed by Carlos Garcia Campos.
+
+ Make the CMake build the default GTK+ build when using build-webkit. This will
+ ensure that all bots are using CMake. We do this by swapping --gtk and --gtkcmake,
+ so that we have --gtk and --gtkautotools.
+
+ * Scripts/webkitdirs.pm: Swap --gtkcmake/--gtk for --gtk/--gtkautotools.
+ * Scripts/webkitpy/port/gtk.py: Ditto.
+
2014-03-06 Martin Robinson <[email protected]>
[CMake] [GTK] Build with ninja when it is available
Modified: trunk/Tools/Scripts/webkitdirs.pm (165266 => 165267)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-03-07 17:21:46 UTC (rev 165266)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-03-07 17:27:42 UTC (rev 165267)
@@ -374,8 +374,8 @@
push(@args, '--release') if ($configuration =~ "^Release");
push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
push(@args, '--64-bit') if (isWin64());
- push(@args, '--gtk') if isGtkAutotools();
- push(@args, '--gtkcmake') if isGtkCMake();
+ push(@args, '--gtkautotools') if isGtkAutotools();
+ push(@args, '--gtk') if isGtkCMake();
push(@args, '--efl') if isEfl();
push(@args, '--wincairo') if isWinCairo();
push(@args, '--wince') if isWinCE();
@@ -945,7 +945,7 @@
sub determineIsGtkCMake()
{
return if defined($isGtkCMake);
- $isGtkCMake = checkForArgumentAndRemoveFromARGV("--gtkcmake");
+ $isGtkCMake = checkForArgumentAndRemoveFromARGV("--gtk");
}
sub isGtkCMake()
@@ -968,7 +968,7 @@
sub determineIsGtkAutotools()
{
return if defined($isGtkAutotools);
- $isGtkAutotools = checkForArgumentAndRemoveFromARGV("--gtk");
+ $isGtkAutotools = checkForArgumentAndRemoveFromARGV("--gtkautotools");
}
sub isWinCE()
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (165266 => 165267)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-03-07 17:21:46 UTC (rev 165266)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-03-07 17:27:42 UTC (rev 165267)
@@ -73,9 +73,9 @@
def _port_flag_for_scripts(self):
if self._is_cmake_build():
- return "--gtkcmake"
+ return "--gtk"
else:
- return "--gtk"
+ return "--gtkautotools"
@memoized
def _driver_class(self):
@@ -215,9 +215,9 @@
def build_webkit_command(self, build_style=None):
command = super(GtkPort, self).build_webkit_command(build_style)
if self._is_cmake_build():
- command.extend(["--gtkcmake", "--update-gtk"])
+ command.extend(["--gtk", "--update-gtk"])
else:
- command.extend(["--gtk", "--update-gtk"])
+ command.extend(["--gtkautotools", "--update-gtk"])
if self.get_option('webkit_test_runner'):
command.append("--no-webkit1")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
