Title: [219907] trunk
Revision
219907
Author
[email protected]
Date
2017-07-26 01:13:27 -0700 (Wed, 26 Jul 2017)

Log Message

Unreviewed. Fix GTK distcheck.

Source/WebDriver:

Ensure WebDriver derived sources directory is created, WebKitFS.cmake is useless for this.

* PlatformGTK.cmake:

Tools:

* gtk/make-dist.py:
(ensure_version_if_possible): Use the right pkg-config filename, it's webkit2gtk not webkitgtk.

Modified Paths

Diff

Modified: trunk/Source/WebDriver/ChangeLog (219906 => 219907)


--- trunk/Source/WebDriver/ChangeLog	2017-07-26 07:39:01 UTC (rev 219906)
+++ trunk/Source/WebDriver/ChangeLog	2017-07-26 08:13:27 UTC (rev 219907)
@@ -1,3 +1,11 @@
+2017-07-26  Carlos Garcia Campos  <[email protected]>
+
+        Unreviewed. Fix GTK distcheck.
+
+        Ensure WebDriver derived sources directory is created, WebKitFS.cmake is useless for this.
+
+        * PlatformGTK.cmake:
+
 2017-07-24  Carlos Garcia Campos  <[email protected]>
 
         WebDriver: rename m_browsingContext as m_currentBrowsingContext in Session

Modified: trunk/Source/WebDriver/PlatformGTK.cmake (219906 => 219907)


--- trunk/Source/WebDriver/PlatformGTK.cmake	2017-07-26 07:39:01 UTC (rev 219906)
+++ trunk/Source/WebDriver/PlatformGTK.cmake	2017-07-26 08:13:27 UTC (rev 219907)
@@ -1,3 +1,5 @@
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
+
 set(WebDriver_Process_OUTPUT_NAME WebKitWebDriver)
 
 add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")

Modified: trunk/Tools/ChangeLog (219906 => 219907)


--- trunk/Tools/ChangeLog	2017-07-26 07:39:01 UTC (rev 219906)
+++ trunk/Tools/ChangeLog	2017-07-26 08:13:27 UTC (rev 219907)
@@ -1,3 +1,10 @@
+2017-07-26  Carlos Garcia Campos  <[email protected]>
+
+        Unreviewed. Fix GTK distcheck.
+
+        * gtk/make-dist.py:
+        (ensure_version_if_possible): Use the right pkg-config filename, it's webkit2gtk not webkitgtk.
+
 2017-07-25  Brady Eidson  <[email protected]>
 
         ResourceLoadStatistics grandfathering happens much too often.

Modified: trunk/Tools/gtk/make-dist.py (219906 => 219907)


--- trunk/Tools/gtk/make-dist.py	2017-07-26 07:39:01 UTC (rev 219906)
+++ trunk/Tools/gtk/make-dist.py	2017-07-26 08:13:27 UTC (rev 219907)
@@ -283,7 +283,7 @@
         if arguments.version is not None:
             return
 
-        pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkitgtk-4.0.pc")
+        pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkit2gtk-4.0.pc")
         if os.path.isfile(pkgconfig_file):
             p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE)
             version = p.communicate()[0]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to