Title: [292287] trunk
- Revision
- 292287
- Author
- [email protected]
- Date
- 2022-04-04 04:19:56 -0700 (Mon, 04 Apr 2022)
Log 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (292286 => 292287)
--- trunk/ChangeLog 2022-04-04 11:17:51 UTC (rev 292286)
+++ trunk/ChangeLog 2022-04-04 11:19:56 UTC (rev 292287)
@@ -1,5 +1,14 @@
2022-04-04 Adrian Perez de Castro <[email protected]>
+ [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 <[email protected]>
+
[CMake] Provide better messages when gi-docgen cannot be found
https://bugs.webkit.org/show_bug.cgi?id=238729
Modified: trunk/Source/cmake/WebKitDist.cmake (292286 => 292287)
--- trunk/Source/cmake/WebKitDist.cmake 2022-04-04 11:17:51 UTC (rev 292286)
+++ trunk/Source/cmake/WebKitDist.cmake 2022-04-04 11:19:56 UTC (rev 292287)
@@ -10,7 +10,7 @@
COMMENT "Checking release tarball: ${_tarball_prefix}-${PROJECT_VERSION}.tar"
DEPENDS ${CMAKE_BINARY_DIR}/manifest.txt
DEPENDS WebKit
- DEPENDS Documentation
+ DEPENDS doc-all
COMMAND ${TOOLS_DIR}/Scripts/make-dist
--check --port=${_port}
--tarball-name=${_tarball_prefix}
@@ -43,6 +43,6 @@
add_custom_target(dist
DEPENDS ${CMAKE_BINARY_DIR}/${_tarball_prefix}-${PROJECT_VERSION}.tar.xz
DEPENDS WebKit
- DEPENDS Documentation
+ DEPENDS doc-all
)
endmacro()
Modified: trunk/Tools/ChangeLog (292286 => 292287)
--- trunk/Tools/ChangeLog 2022-04-04 11:17:51 UTC (rev 292286)
+++ trunk/Tools/ChangeLog 2022-04-04 11:19:56 UTC (rev 292287)
@@ -1,3 +1,13 @@
+2022-04-04 Adrian Perez de Castro <[email protected]>
+
+ [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 <[email protected]>
REGRESSION(r291797): [wk1] 5 contain-intrinsic-size* tests are constant text failures
Modified: trunk/Tools/gtk/manifest.txt.in (292286 => 292287)
--- trunk/Tools/gtk/manifest.txt.in 2022-04-04 11:17:51 UTC (rev 292286)
+++ trunk/Tools/gtk/manifest.txt.in 2022-04-04 11:19:56 UTC (rev 292287)
@@ -102,6 +102,6 @@
file Tools/CMakeLists.txt
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/_javascript_coregtk-${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}
Modified: trunk/Tools/wpe/manifest.txt.in (292286 => 292287)
--- trunk/Tools/wpe/manifest.txt.in 2022-04-04 11:17:51 UTC (rev 292286)
+++ trunk/Tools/wpe/manifest.txt.in 2022-04-04 11:19:56 UTC (rev 292287)
@@ -96,5 +96,6 @@
file Tools/CMakeLists.txt
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-_javascript_core-${WPE_API_VERSION} Documentation/wpe-_javascript_core-${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}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
