Unreviewed. Fix GTK distcheck.
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Jul 2017 08:13:27 +0000 (08:13 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Jul 2017 08:13:27 +0000 (08:13 +0000)
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: http://svn.webkit.org/repository/webkit/trunk@219907 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebDriver/ChangeLog
Source/WebDriver/PlatformGTK.cmake
Tools/ChangeLog
Tools/gtk/make-dist.py

index 7114d17..2cd2808 100644 (file)
@@ -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
index 0deb59b..2454da4 100644 (file)
@@ -1,3 +1,5 @@
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
+
 set(WebDriver_Process_OUTPUT_NAME WebKitWebDriver)
 
 add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")
index bd3a7b0..53f1f65 100644 (file)
@@ -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.
index e7af8f0..6fd7d5b 100755 (executable)
@@ -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]