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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219907 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebDriver/ChangeLog b/Source/WebDriver/ChangeLog
index 7114d173a563e128b0132d1a4fd3ed38b4edc50c..2cd280847d14703051c8c5038799fb892680e36a 100644 (file)
--- a/Source/WebDriver/ChangeLog
+++ b/Source/WebDriver/ChangeLog
@@ -1,3 +1,11 @@
+2017-07-26  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        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  <cgarcia@igalia.com>
 
         WebDriver: rename m_browsingContext as m_currentBrowsingContext in Session

diff --git a/Source/WebDriver/PlatformGTK.cmake b/Source/WebDriver/PlatformGTK.cmake
index 0deb59b86b5620ea82b5b0985289d09a7dce3914..2454da4437959190f9368144d15175624f970812 100644 (file)
--- a/Source/WebDriver/PlatformGTK.cmake
+++ b/Source/WebDriver/PlatformGTK.cmake
@@ -1,3 +1,5 @@
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
+
 set(WebDriver_Process_OUTPUT_NAME WebKitWebDriver)
 
 add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bd3a7b0f6b2881ceec7582e1c499590af2716ff1..53f1f655680a0124069233540810d406d4f93bd8 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2017-07-26  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        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  <beidson@apple.com>
 
         ResourceLoadStatistics grandfathering happens much too often.

diff --git a/Tools/gtk/make-dist.py b/Tools/gtk/make-dist.py
index e7af8f06de4534e82592f5593d6fc1566a9c39f4..6fd7d5bc41a32f3dc52a34b38de20cd44b1974af 100755 (executable)
--- a/Tools/gtk/make-dist.py
+++ b/Tools/gtk/make-dist.py
@@ -283,7 +283,7 @@ if __name__ == "__main__":
         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]