Changeset 277485 in webkit

Timestamp:

May 14, 2021, 3:22:29 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

Unreviewed. [GTK] Fix make distcheck

.:

Use WEBKITGTK_API_DOC_VERSION instead of WEBKITGTK_API_VERSION or the documentation install rules.

• Source/PlatformGTK.cmake:

Tools:

Update library version now that we build with soup3 by default.

• Scripts/make-dist:

(Distcheck.check_symbols):
(ensure_version_if_possible):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/PlatformGTK.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/make-dist (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2021-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. [GTK] Fix make distcheck
+
+        Use WEBKITGTK_API_DOC_VERSION instead of WEBKITGTK_API_VERSION or the documentation install rules.
+
+        * Source/PlatformGTK.cmake:
+
 2021-05-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/PlatformGTK.cmake

@@ -16 +16 @@
 
 if (ENABLE_GTKDOC)
-    install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-${WEBKITGTK_API_VERSION}/html/webkit2gtk-${WEBKITGTK_API_VERSION}
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-${WEBKITGTK_API_DOC_VERSION}/html/webkit2gtk-${WEBKITGTK_API_DOC_VERSION}
             DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
     )
-    install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkitdomgtk-${WEBKITGTK_API_VERSION}/html/webkitdomgtk-${WEBKITGTK_API_VERSION}
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkitdomgtk-${WEBKITGTK_API_DOC_VERSION}/html/webkitdomgtk-${WEBKITGTK_API_DOC_VERSION}
             DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
     )
-    install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/jsc-glib-${WEBKITGTK_API_VERSION}/html/jsc-glib-${WEBKITGTK_API_VERSION}
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/jsc-glib-${WEBKITGTK_API_DOC_VERSION}/html/jsc-glib-${WEBKITGTK_API_DOC_VERSION}
             DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
     )

trunk/Tools/ChangeLog

@@ +1 @@
+2021-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. [GTK] Fix make distcheck
+
+        Update library version now that we build with soup3 by default.
+
+        * Scripts/make-dist:
+        (Distcheck.check_symbols):
+        (ensure_version_if_possible):
+
 2021-05-13  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/make-dist

@@ -259 +259 @@
     def check_symbols(self, build_dir):
         check_bss = os.path.join(self.source_root, 'Tools', 'Scripts', 'check-for-global-bss-symbols-in-webkitgtk-libs')
-        libjsc = os.path.join(build_dir, 'lib', 'libjavascriptcoregtk-4.0.so')
-        libwk = os.path.join(build_dir, 'lib', 'libwebkit2gtk-4.0.so')
+        libjsc = os.path.join(build_dir, 'lib', 'libjavascriptcoregtk-4.1.so')
+        libwk = os.path.join(build_dir, 'lib', 'libwebkit2gtk-4.1.so')
         subprocess.check_call([check_bss, libjsc, libwk])
 
@@ -296 +296 @@
             return
 
-        pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkit2gtk-4.0.pc")
+        pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkit2gtk-4.1.pc")
         if os.path.isfile(pkgconfig_file):
             p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE)