Title: [233428] trunk/Tools
- Revision
- 233428
- Author
- [email protected]
- Date
- 2018-07-02 12:02:18 -0700 (Mon, 02 Jul 2018)
Log Message
[WPE][GTK] flatpakutils.py should respect set-webkit-configuration build type
https://bugs.webkit.org/show_bug.cgi?id=187218
Reviewed by Philippe Normand.
Using the webkitpy Config module, if the build type is not passed on the command line, we
read it from WebKitBuild/Configuration and respect it.
* flatpak/flatpakutils.py:
(WebkitFlatpak.__init__):
(WebkitFlatpak.clean_args):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (233427 => 233428)
--- trunk/Tools/ChangeLog 2018-07-02 18:04:54 UTC (rev 233427)
+++ trunk/Tools/ChangeLog 2018-07-02 19:02:18 UTC (rev 233428)
@@ -1,3 +1,17 @@
+2018-07-02 Michael Catanzaro <[email protected]>
+
+ [WPE][GTK] flatpakutils.py should respect set-webkit-configuration build type
+ https://bugs.webkit.org/show_bug.cgi?id=187218
+
+ Reviewed by Philippe Normand.
+
+ Using the webkitpy Config module, if the build type is not passed on the command line, we
+ read it from WebKitBuild/Configuration and respect it.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.__init__):
+ (WebkitFlatpak.clean_args):
+
2018-07-02 Zan Dobersek <[email protected]>
[WPE] Add touch support to WindowViewBackend
Modified: trunk/Tools/flatpak/flatpakutils.py (233427 => 233428)
--- trunk/Tools/flatpak/flatpakutils.py 2018-07-02 18:04:54 UTC (rev 233427)
+++ trunk/Tools/flatpak/flatpakutils.py 2018-07-02 19:02:18 UTC (rev 233428)
@@ -29,6 +29,9 @@
import tempfile
import re
+from webkitpy.common.system.systemhost import SystemHost
+from webkitpy.port.factory import PortFactory
+
try:
from urllib.parse import urlparse # pylint: disable=E0611
except ImportError:
@@ -515,6 +518,7 @@
self.finish_args = None
self.no_flatpak_update = False
+ self.release = False
self.debug = False
self.clean = False
self.run_tests = None
@@ -551,8 +555,14 @@
self.makeargs = ""
def clean_args(self):
+ if not self.debug and not self.release:
+ factory = PortFactory(SystemHost())
+ port = factory.get(self.platform)
+ self.debug = port.default_configuration() == "Debug"
+ self.build_type = "Debug" if self.debug else "Release"
+
self.platform = self.platform.upper()
- self.build_type = "Debug" if self.debug else "Release"
+
if self.gdb is None and '--gdb' in sys.argv:
self.gdb = ""
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
