Changeset 292287 in webkit

Timestamp:

Apr 4, 2022, 4:19:56 AM (4 years ago)

Author:

Adrian Perez de Castro

Message:

[WPE][GTK] REGRESSION(r292263): Cannot make release tarballs
​https://bugs.webkit.org/show_bug.cgi?id=238698

Reviewed by Carlos Garcia Campos.

.:

• Source/cmake/WebKitDist.cmake: Make "dist" and "distcheck" targets depend on "doc-all".

Tools:

• gtk/manifest.txt.in: Fix paths of generated documentation to be included in release tarballs.
• wpe/manifest.txt.in: Ditto.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitDist.cmake (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/gtk/manifest.txt.in (modified) (1 diff)
• Tools/wpe/manifest.txt.in (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2022-04-04  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] REGRESSION(r292263): Cannot make release tarballs
+        https://bugs.webkit.org/show_bug.cgi?id=238698
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/WebKitDist.cmake: Make "dist" and "distcheck" targets depend on "doc-all".
+
 2022-04-04  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/cmake/WebKitDist.cmake

@@ -11 +11 @@
         DEPENDS ${CMAKE_BINARY_DIR}/manifest.txt
         DEPENDS WebKit
-        DEPENDS Documentation
+        DEPENDS doc-all
         COMMAND ${TOOLS_DIR}/Scripts/make-dist
                 --check --port=${_port}
@@ -44 +44 @@
         DEPENDS ${CMAKE_BINARY_DIR}/${_tarball_prefix}-${PROJECT_VERSION}.tar.xz
         DEPENDS WebKit
-        DEPENDS Documentation
+        DEPENDS doc-all
     )
 endmacro()

trunk/Tools/ChangeLog

@@ +1 @@
+2022-04-04  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] REGRESSION(r292263): Cannot make release tarballs
+        https://bugs.webkit.org/show_bug.cgi?id=238698
+
+        Reviewed by Carlos Garcia Campos.
+
+        * gtk/manifest.txt.in: Fix paths of generated documentation to be included in release tarballs.
+        * wpe/manifest.txt.in: Ditto.
+
 2022-04-04  Cathie Chen  <cathiechen@igalia.com>
 

trunk/Tools/gtk/manifest.txt.in

@@ -103 +103 @@
 file Tools/PlatformGTK.cmake
 
-directory ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-${WEBKITGTK_API_DOC_VERSION}/html/webkit2gtk-${WEBKITGTK_API_DOC_VERSION} Documentation/webkit2gtk-${WEBKITGTK_API_DOC_VERSION}/html
-directory ${CMAKE_BINARY_DIR}/Documentation/webkitdomgtk-${WEBKITGTK_API_DOC_VERSION}/html/webkitdomgtk-${WEBKITGTK_API_DOC_VERSION} Documentation/webkitdomgtk-${WEBKITGTK_API_DOC_VERSION}/html
-directory ${CMAKE_BINARY_DIR}/Documentation/jsc-glib-${WEBKITGTK_API_DOC_VERSION}/html/jsc-glib-${WEBKITGTK_API_DOC_VERSION} Documentation/jsc-glib-${WEBKITGTK_API_DOC_VERSION}/html
+directory ${CMAKE_BINARY_DIR}/Documentation/javascriptcoregtk-${WEBKITGTK_API_VERSION} Documentation/jsc-glib-${WEBKITGTK_API_DOC_VERSION}
+directory ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-${WEBKITGTK_API_VERSION} Documentation/webkit2gtk-${WEBKITGTK_API_DOC_VERSION}
+directory ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION} Documentation/webkit2gtk-web-extension-${WEBKITGTK_API_DOC_VERSION}

trunk/Tools/wpe/manifest.txt.in

@@ -97 +97 @@
 file Tools/PlatformWPE.cmake
 
-directory ${CMAKE_BINARY_DIR}/Documentation/wpe-${WPE_API_DOC_VERSION}/html/wpe-${WPE_API_DOC_VERSION} Documentation/wpe-${WPE_API_DOC_VERSION}/html
-directory ${CMAKE_BINARY_DIR}/Documentation/wpe-webextensions-${WPE_API_DOC_VERSION}/html/wpe-webextensions-${WPE_API_DOC_VERSION} Documentation/wpe-webextensions-${WPE_API_DOC_VERSION}/html
+directory ${CMAKE_BINARY_DIR}/Documentation/wpe-javascriptcore-${WPE_API_VERSION} Documentation/wpe-javascriptcore-${WPE_API_DOC_VERSION}
+directory ${CMAKE_BINARY_DIR}/Documentation/wpe-webkit-${WPE_API_VERSION} Documentation/wpe-webkit-${WPE_API_DOC_VERSION}
+directory ${CMAKE_BINARY_DIR}/Documentation/wpe-web-extension-${WPE_API_VERSION} Documentation/wpe-web-extension-${WPE_API_DOC_VERSION}