Title: [294504] trunk
Revision
294504
Author
[email protected]
Date
2022-05-19 13:57:08 -0700 (Thu, 19 May 2022)

Log Message

[WPE][GTK] Improve dependency tracking of PDF.js files (and other GResources)
https://bugs.webkit.org/show_bug.cgi?id=240535

Patch by Michael Catanzaro <[email protected]> on 2022-05-19
Reviewed by Adrian Perez de Castro.

This commit does two things. First, for each use of
glib-compile-resources, it adds the --dependency-file argument in order
to make the build command depend on the files included in the GResource
manifest, to ensure the resource is automatically recompiled whenever
any of its source files change. Second, for PDF.js only, it replaces the
GLOB_RECURSE command with a list of source files. The
generate-pdfjs-gresource-manifest.py script is adapted to create CMake
file lists in addition to GResource manifests, and renamed from
-gresource-manifest.py to -resource-manifest.py. The web inspector
GResource would benefit from similar work, but that will be a problem
for another day.

* Tools/TestWebKitAPI/glib/CMakeLists.txt:
* Tools/glib/generate-pdfjs-resource-manifest.py: Renamed from Tools/glib/generate-pdfjs-gresource-manifest.py.
(get_filenames):
(get_filenames.resource_name):
(is_compressible):
(write_cmake_file):
(write_gresource_manifest):
* Source/ThirdParty/pdfjs/PdfJSFiles.cmake: Added.
* Source/ThirdParty/pdfjs/README.webkit:
* Source/WebKit/InspectorGResources.cmake:
* Source/WebKit/PdfJSGResources.cmake:
* Source/WebKit/PlatformGTK.cmake:
* Source/WebKit/PlatformWPE.cmake:
* CMakeLists.txt:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:

Canonical link: https://commits.webkit.org/250761@main

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/CMakeLists.txt (294503 => 294504)


--- trunk/CMakeLists.txt	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/CMakeLists.txt	2022-05-19 20:57:08 UTC (rev 294504)
@@ -13,6 +13,11 @@
 cmake_minimum_required(VERSION 3.12)
 project(WebKit)
 
+# Remove this cmake_policy() after upgrading cmake_minimum_required() to 3.20.
+if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20")
+    cmake_policy(SET CMP0116 OLD)
+endif ()
+
 # -----------------------------------------------------------------------------
 # Common configuration
 #------------------------------------------------------------------------------

Added: trunk/Source/ThirdParty/pdfjs/PdfJSFiles.cmake (0 => 294504)


--- trunk/Source/ThirdParty/pdfjs/PdfJSFiles.cmake	                        (rev 0)
+++ trunk/Source/ThirdParty/pdfjs/PdfJSFiles.cmake	2022-05-19 20:57:08 UTC (rev 294504)
@@ -0,0 +1,356 @@
+# This file was generated by Tools/glib/generate-pdfjs-resource-manifest.py. Do not modify manually.
+set(PDFJSFiles
+    ${THIRDPARTY_DIR}/pdfjs/build/pdf.js
+    ${THIRDPARTY_DIR}/pdfjs/build/pdf.sandbox.js
+    ${THIRDPARTY_DIR}/pdfjs/build/pdf.worker.js
+    ${THIRDPARTY_DIR}/pdfjs/web/debugger.css
+    ${THIRDPARTY_DIR}/pdfjs/web/debugger.js
+    ${THIRDPARTY_DIR}/pdfjs/web/viewer.css
+    ${THIRDPARTY_DIR}/pdfjs/web/viewer.html
+    ${THIRDPARTY_DIR}/pdfjs/web/viewer.js
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/78-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/78-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/78-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/78-RKSJ-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/78-RKSJ-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/78-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/78ms-RKSJ-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/78ms-RKSJ-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/83pv-RKSJ-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/90ms-RKSJ-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/90ms-RKSJ-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/90msp-RKSJ-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/90msp-RKSJ-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/90pv-RKSJ-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/90pv-RKSJ-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Add-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Add-RKSJ-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Add-RKSJ-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Add-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-CNS1-0.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-CNS1-1.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-CNS1-2.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-CNS1-3.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-CNS1-4.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-CNS1-5.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-CNS1-6.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-CNS1-UCS2.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-GB1-0.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-GB1-1.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-GB1-2.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-GB1-3.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-GB1-4.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-GB1-5.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-GB1-UCS2.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Japan1-0.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Japan1-1.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Japan1-2.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Japan1-3.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Japan1-4.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Japan1-5.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Japan1-6.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Japan1-UCS2.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Korea1-0.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Korea1-1.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Korea1-2.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Adobe-Korea1-UCS2.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/B5pc-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/B5pc-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/CNS-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/CNS-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/CNS1-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/CNS1-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/CNS2-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/CNS2-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/ETHK-B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/ETHK-B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/ETen-B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/ETen-B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/ETenms-B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/ETenms-B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Ext-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Ext-RKSJ-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Ext-RKSJ-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Ext-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GB-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GB-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GB-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GB-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBK-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBK-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBK2K-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBK2K-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBKp-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBKp-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBT-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBT-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBT-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBT-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBTpc-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBTpc-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBpc-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/GBpc-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKdla-B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKdla-B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKdlb-B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKdlb-B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKgccs-B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKgccs-B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKm314-B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKm314-B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKm471-B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKm471-B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKscs-B5-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/HKscs-B5-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Hankaku.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Hiragana.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSC-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSC-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSC-Johab-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSC-Johab-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSCms-UHC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSCms-UHC-HW-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSCms-UHC-HW-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSCms-UHC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSCpc-EUC-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/KSCpc-EUC-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Katakana.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/NWP-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/NWP-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/RKSJ-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/RKSJ-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/Roman.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniCNS-UCS2-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniCNS-UCS2-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniCNS-UTF16-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniCNS-UTF16-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniCNS-UTF32-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniCNS-UTF32-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniCNS-UTF8-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniCNS-UTF8-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniGB-UCS2-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniGB-UCS2-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniGB-UTF16-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniGB-UTF16-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniGB-UTF32-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniGB-UTF32-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniGB-UTF8-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniGB-UTF8-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UCS2-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UCS2-HW-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UCS2-HW-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UCS2-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UTF16-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UTF16-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UTF32-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UTF32-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UTF8-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS-UTF8-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS2004-UTF16-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS2004-UTF16-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS2004-UTF32-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS2004-UTF32-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS2004-UTF8-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJIS2004-UTF8-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJISPro-UCS2-HW-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJISPro-UCS2-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJISPro-UTF8-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJISX0213-UTF32-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJISX0213-UTF32-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJISX02132004-UTF32-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniJISX02132004-UTF32-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniKS-UCS2-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniKS-UCS2-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniKS-UTF16-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniKS-UTF16-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniKS-UTF32-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniKS-UTF32-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniKS-UTF8-H.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/UniKS-UTF8-V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/V.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/cmaps/WP-Symbol.bcmap
+    ${THIRDPARTY_DIR}/pdfjs/web/images/annotation-check.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/annotation-comment.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/annotation-help.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/annotation-insert.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/annotation-key.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/annotation-newparagraph.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/annotation-noicon.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/annotation-note.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/annotation-paragraph.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/findbarButton-next.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/findbarButton-previous.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/loading-dark.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/loading-icon.gif
+    ${THIRDPARTY_DIR}/pdfjs/web/images/loading.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-documentProperties.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-firstPage.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-handTool.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-lastPage.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-rotateCcw.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-rotateCw.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-scrollHorizontal.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-scrollPage.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-scrollVertical.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-scrollWrapped.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-selectTool.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-spreadEven.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-spreadNone.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/secondaryToolbarButton-spreadOdd.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/shadow.png
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-bookmark.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-currentOutlineItem.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-download.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-menuArrow.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-openFile.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-pageDown.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-pageUp.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-presentationMode.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-print.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-search.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-secondaryToolbarToggle.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-sidebarToggle.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-viewAttachments.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-viewLayers.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-viewOutline.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-viewThumbnail.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-zoomIn.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/toolbarButton-zoomOut.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/treeitem-collapsed.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/images/treeitem-expanded.svg
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/locale.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ach/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/af/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/an/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ar/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ast/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/az/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/be/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/bg/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/bn/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/bo/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/br/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/brx/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/bs/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ca/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/cak/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ckb/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/cs/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/cy/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/da/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/de/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/dsb/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/el/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/en-CA/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/en-GB/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/en-US/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/eo/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/es-AR/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/es-CL/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/es-ES/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/es-MX/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/et/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/eu/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/fa/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ff/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/fi/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/fr/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/fy-NL/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ga-IE/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/gd/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/gl/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/gn/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/gu-IN/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/he/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/hi-IN/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/hr/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/hsb/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/hu/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/hy-AM/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/hye/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ia/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/id/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/is/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/it/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ja/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ka/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/kab/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/kk/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/km/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/kn/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ko/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/lij/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/lo/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/lt/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ltg/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/lv/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/meh/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/mk/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/mr/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ms/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/my/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/nb-NO/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ne-NP/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/nl/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/nn-NO/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/oc/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/pa-IN/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/pl/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/pt-BR/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/pt-PT/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/rm/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ro/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ru/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/sat/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/sc/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/scn/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/sco/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/si/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/sk/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/sl/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/son/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/sq/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/sr/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/sv-SE/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/szl/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ta/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/te/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/tg/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/th/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/tl/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/tr/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/trs/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/uk/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/ur/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/uz/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/vi/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/wo/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/xh/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/zh-CN/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/locale/zh-TW/viewer.properties
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitDingbats.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitFixed.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitFixedBold.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitFixedBoldItalic.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitFixedItalic.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitSans.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitSansBold.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitSansBoldItalic.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitSansItalic.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitSerif.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitSerifBold.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitSerifBoldItalic.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitSerifItalic.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/FoxitSymbol.pfb
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/LiberationSans-Bold.ttf
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/LiberationSans-BoldItalic.ttf
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/LiberationSans-Italic.ttf
+    ${THIRDPARTY_DIR}/pdfjs/web/standard_fonts/LiberationSans-Regular.ttf
+)
\ No newline at end of file

Modified: trunk/Source/ThirdParty/pdfjs/README.webkit (294503 => 294504)


--- trunk/Source/ThirdParty/pdfjs/README.webkit	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/Source/ThirdParty/pdfjs/README.webkit	2022-05-19 20:57:08 UTC (rev 294504)
@@ -6,4 +6,6 @@
 2. Grab a new official release (*-dist.zip, modern browsers version) distributed at GitHub and extract everything into this directory.
 3. Delete the sourcemap (.js.map) files (currently viewer.js.map, pdf.js.map, pdf.worker.js.map, and pdf.sandbox.js.map).
 4. Delete the example PDF file, compressed.tracemonkey-pldi-09.pdf.
-5. Sanity-check the result by loading https://www.irs.gov/pub/irs-pdf/i1040gi.pdf (big PDF) and https://www.irs.gov/pub/irs-pdf/f1040.pdf (PDF with forms)
+5. From top source dir, run: 'Tools/glib/generate-pdfjs-resource-manifest.py --cmake --input=Source/ThirdParty/pdfjs --output=Source/ThirdParty/pdfjs/PdfJSFiles.cmake'
+6. Build WebKit, your favorite port will do
+7. Sanity-check by loading https://www.irs.gov/pub/irs-pdf/i1040gi.pdf (big PDF) and https://www.irs.gov/pub/irs-pdf/f1040.pdf (PDF with forms)

Modified: trunk/Source/WebKit/InspectorGResources.cmake (294503 => 294504)


--- trunk/Source/WebKit/InspectorGResources.cmake	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/Source/WebKit/InspectorGResources.cmake	2022-05-19 20:57:08 UTC (rev 294504)
@@ -9,9 +9,10 @@
     )
 
     add_custom_command(
-        OUTPUT ${_derived_sources_dir}/InspectorGResourceBundle.c
+        OUTPUT ${_derived_sources_dir}/InspectorGResourceBundle.c ${_derived_sources_dir}/InspectorGResourceBundle.deps
         DEPENDS ${_derived_sources_dir}/InspectorGResourceBundle.xml
-        COMMAND glib-compile-resources --generate --sourcedir=${_derived_sources_dir}/InspectorResources/WebInspectorUI --target=${_derived_sources_dir}/InspectorGResourceBundle.c ${_derived_sources_dir}/InspectorGResourceBundle.xml
+        DEPFILE {_derived_sources_dir}/InspectorGResourceBundle.deps
+        COMMAND glib-compile-resources --generate --sourcedir=${_derived_sources_dir}/InspectorResources/WebInspectorUI --target=${_derived_sources_dir}/InspectorGResourceBundle.c --dependency-file=${_derived_sources_dir}/InspectorGResourceBundle.deps ${_derived_sources_dir}/InspectorGResourceBundle.xml
         VERBATIM
     )
 endmacro()

Modified: trunk/Source/WebKit/PdfJSGResources.cmake (294503 => 294504)


--- trunk/Source/WebKit/PdfJSGResources.cmake	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/Source/WebKit/PdfJSGResources.cmake	2022-05-19 20:57:08 UTC (rev 294504)
@@ -1,4 +1,4 @@
-file(GLOB_RECURSE PdfJSFiles CONFIGURE_DEPENDS ${THIRDPARTY_DIR}/pdfjs/*)
+include(../ThirdParty/pdfjs/PdfJSFiles.cmake)
 
 set(PdfJSExtraFiles
     ${WEBCORE_DIR}/Modules/pdfjs-extras/content-script.js
@@ -7,29 +7,28 @@
 macro(WEBKIT_BUILD_PDFJS_GRESOURCES _derived_sources_dir)
     add_custom_command(
         OUTPUT ${_derived_sources_dir}/PdfJSGResourceBundle.xml
-        DEPENDS ${TOOLS_DIR}/glib/generate-pdfjs-gresource-manifest.py
-                ${PdfJSFiles}
-        COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/glib/generate-pdfjs-gresource-manifest.py --input=${THIRDPARTY_DIR}/pdfjs --output=${_derived_sources_dir}/PdfJSGResourceBundle.xml
+        DEPENDS ${TOOLS_DIR}/glib/generate-pdfjs-resource-manifest.py ${PdfJSFiles}
+        COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/glib/generate-pdfjs-resource-manifest.py --gresource --input=${THIRDPARTY_DIR}/pdfjs --output=${_derived_sources_dir}/PdfJSGResourceBundle.xml
         VERBATIM
     )
 
     add_custom_command(
-        OUTPUT ${_derived_sources_dir}/PdfJSGResourceBundle.c
+        OUTPUT ${_derived_sources_dir}/PdfJSGResourceBundle.c ${_derived_sources_dir}/PdfJSGResourceBundle.deps
         DEPENDS ${_derived_sources_dir}/PdfJSGResourceBundle.xml
-        COMMAND glib-compile-resources --generate --sourcedir=${THIRDPARTY_DIR}/pdfjs --target=${_derived_sources_dir}/PdfJSGResourceBundle.c ${_derived_sources_dir}/PdfJSGResourceBundle.xml
+        DEPFILE ${_derived_sources_dir}/PdfJSGResourceBundle.deps
+        COMMAND glib-compile-resources --generate --sourcedir=${THIRDPARTY_DIR}/pdfjs --target=${_derived_sources_dir}/PdfJSGResourceBundle.c --dependency-file=${_derived_sources_dir}/PdfJSGResourceBundle.deps ${_derived_sources_dir}/PdfJSGResourceBundle.xml
         VERBATIM
     )
 
     add_custom_command(
         OUTPUT ${_derived_sources_dir}/PdfJSGResourceBundleExtras.xml
-        DEPENDS ${TOOLS_DIR}/glib/generate-pdfjs-gresource-manifest.py
-                ${PdfJSExtraFiles}
-        COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/glib/generate-pdfjs-gresource-manifest.py --input=${WEBCORE_DIR}/Modules/pdfjs-extras --output=${_derived_sources_dir}/PdfJSGResourceBundleExtras.xml
+        DEPENDS ${TOOLS_DIR}/glib/generate-pdfjs-resource-manifest.py ${PdfJSExtraFiles}
+        COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/glib/generate-pdfjs-resource-manifest.py --gresource --input=${WEBCORE_DIR}/Modules/pdfjs-extras --output=${_derived_sources_dir}/PdfJSGResourceBundleExtras.xml
         VERBATIM
     )
 
     add_custom_command(
-        OUTPUT ${_derived_sources_dir}/PdfJSGResourceBundleExtras.c
+        OUTPUT ${_derived_sources_dir}/PdfJSGResourceBundleExtras.c ${_derived_sources_dir}/PdfJSGResourceBundleExtras.deps
         DEPENDS ${_derived_sources_dir}/PdfJSGResourceBundleExtras.xml
         COMMAND glib-compile-resources --generate --sourcedir=${WEBCORE_DIR}/Modules/pdfjs-extras --target=${_derived_sources_dir}/PdfJSGResourceBundleExtras.c ${_derived_sources_dir}/PdfJSGResourceBundleExtras.xml
         VERBATIM

Modified: trunk/Source/WebKit/PlatformGTK.cmake (294503 => 294504)


--- trunk/Source/WebKit/PlatformGTK.cmake	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/Source/WebKit/PlatformGTK.cmake	2022-05-19 20:57:08 UTC (rev 294504)
@@ -597,9 +597,10 @@
 )
 
 add_custom_command(
-    OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c
+    OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.deps
     DEPENDS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
-    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebKit/Resources/gtk --target=${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
+    DEPFILE ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.deps
+    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebKit/Resources/gtk --target=${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c --dependency-file=${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.deps ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
     VERBATIM
 )
 

Modified: trunk/Source/WebKit/PlatformWPE.cmake (294503 => 294504)


--- trunk/Source/WebKit/PlatformWPE.cmake	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/Source/WebKit/PlatformWPE.cmake	2022-05-19 20:57:08 UTC (rev 294504)
@@ -280,9 +280,10 @@
 )
 
 add_custom_command(
-    OUTPUT ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c
+    OUTPUT ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.deps
     DEPENDS ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
-    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --target=${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
+    DEPFILE ${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.deps
+    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/Resources --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebCore/platform/audio/resources --target=${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.c --dependency-file=${WebKit2Gtk_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.deps ${WebKit_DERIVED_SOURCES_DIR}/WebKitResourcesGResourceBundle.xml
     VERBATIM
 )
 

Modified: trunk/Source/cmake/OptionsGTK.cmake (294503 => 294504)


--- trunk/Source/cmake/OptionsGTK.cmake	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/Source/cmake/OptionsGTK.cmake	2022-05-19 20:57:08 UTC (rev 294504)
@@ -5,6 +5,11 @@
 
 SET_PROJECT_VERSION(2 37 0)
 
+# This is required because we use the DEPFILE argument to add_custom_command().
+# Remove after upgrading cmake_minimum_required() to 3.20.
+if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ninja")
+    message(FATAL_ERROR "Building with Makefiles requires CMake 3.20 or newer. Either enable Ninja by passing -GNinja, or upgrade CMake.")
+endif ()
 
 set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
 

Modified: trunk/Source/cmake/OptionsWPE.cmake (294503 => 294504)


--- trunk/Source/cmake/OptionsWPE.cmake	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/Source/cmake/OptionsWPE.cmake	2022-05-19 20:57:08 UTC (rev 294504)
@@ -3,6 +3,12 @@
 
 SET_PROJECT_VERSION(2 35 1)
 
+# This is required because we use the DEPFILE argument to add_custom_command().
+# Remove after upgrading cmake_minimum_required() to 3.20.
+if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ninja")
+    message(FATAL_ERROR "Building with Makefiles requires CMake 3.20 or newer. Either enable Ninja by passing -GNinja, or upgrade CMake.")
+endif ()
+
 set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
 
 find_package(Cairo 1.14.0 REQUIRED)

Modified: trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt (294503 => 294504)


--- trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt	2022-05-19 20:57:08 UTC (rev 294504)
@@ -119,13 +119,16 @@
 endif ()
 
 add_custom_command(
-    OUTPUT ${TEST_RESOURCES_DIR}/webkitglib-tests-resources.gresource
+    OUTPUT ${TEST_RESOURCES_DIR}/webkitglib-tests-resources.gresource ${TEST_RESOURCES_DIR}/webkitglib-tests-resources.deps
     DEPENDS ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/resources/webkitglib-tests.gresource.xml
             ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/resources/link-title.js
+    DEPFILE ${TEST_RESOURCES_DIR}/webkitglib-tests-resources.deps
     COMMAND glib-compile-resources
             --target=${TEST_RESOURCES_DIR}/webkitglib-tests-resources.gresource
             --sourcedir=${CMAKE_SOURCE_DIR}
+            --dependency-file=${TEST_RESOURCES_DIR}/webkitglib-tests-resources.deps
             ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/resources/webkitglib-tests.gresource.xml
+    VERBATIM
 )
 
 add_custom_target(test-gresource-bundle

Deleted: trunk/Tools/glib/generate-pdfjs-gresource-manifest.py (294503 => 294504)


--- trunk/Tools/glib/generate-pdfjs-gresource-manifest.py	2022-05-19 19:57:08 UTC (rev 294503)
+++ trunk/Tools/glib/generate-pdfjs-gresource-manifest.py	2022-05-19 20:57:08 UTC (rev 294504)
@@ -1,98 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (C) 2022 Igalia S.L.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-import argparse
-import os
-import sys
-
-VALID_EXTENSIONS = {'.html', '.js', '.css', '.svg', '.png', '.gif', '.cur', '.bcmap', '.properties', '.pfb', '.ttf'}
-COMPRESSIBLE_EXTENSIONS = {'.html', '.js', '.css', '.svg', '.properties'}
-BASE_DIRS = {'pdfjs/', 'pdfjs-extras/'}
-
-IGNORE = {'LICENSE',
-          'README.webkit',
-          'web/cmaps/LICENSE',
-          'web/standard_fonts/LICENSE_FOXIT',
-          'web/standard_fonts/LICENSE_LIBERATION'}
-
-
-def get_filenames(directory):
-    filenames = []
-
-    def resource_name(filename):
-        for base_directory in BASE_DIRS:
-            base_dir_index = filename.rfind(base_directory)
-            if base_dir_index != -1:
-                return filename[base_dir_index + len(base_directory):]
-        return None
-
-    for root, dirs, files in os.walk(directory):
-        dirs.sort()
-        files.sort()
-        for file in files:
-            if os.path.basename(root) == 'cocoa':
-                continue
-            filename = os.path.join(root, file)
-            name = resource_name(filename)
-            if name is None:
-                continue
-
-            # The result should use forward slashes, thus make sure any os-specific
-            # separator is properly replaced.
-            if os.sep != '/':
-                name = name.replace(os.sep, '/')
-            if name not in IGNORE:
-                if os.path.splitext(name)[1] not in VALID_EXTENSIONS:
-                    print('Unexpected file %s, please teach generate-pdfjs-gresource-manifest.py how to handle it' % filename, file=sys.stderr)
-                    sys.exit(1)
-                filenames.append(name)
-
-    return filenames
-
-
-def is_compressible(filename):
-    return os.path.splitext(filename)[1] in COMPRESSIBLE_EXTENSIONS
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Generate a GResources file for pdfjs.')
-    parser.add_argument('--input', type=str,
-                        help='the input directory')
-    parser.add_argument('--output', nargs='?', type=argparse.FileType('w'), default=sys.stdout,
-                        help='the output file')
-
-    args = parser.parse_args(sys.argv[1:])
-
-    args.output.write("""<?xml version=1.0 encoding=UTF-8?>
-<gresources>
-    <gresource prefix="/org/webkit/pdfjs">
-""")
-
-    for filename in get_filenames(args.input):
-        line = '        <file'
-        if is_compressible(filename):
-            line += ' compressed="true"'
-        if not filename.startswith('build/') and not filename.startswith('web/'):
-            alias = 'extras/' + filename
-            line += ' alias="%s"' % alias
-        line += '>%s</file>\n' % filename
-
-        args.output.write(line)
-
-    args.output.write("""    </gresource>
-</gresources>
-""")

Copied: trunk/Tools/glib/generate-pdfjs-resource-manifest.py (from rev 294503, trunk/Tools/glib/generate-pdfjs-gresource-manifest.py) (0 => 294504)


--- trunk/Tools/glib/generate-pdfjs-resource-manifest.py	                        (rev 0)
+++ trunk/Tools/glib/generate-pdfjs-resource-manifest.py	2022-05-19 20:57:08 UTC (rev 294504)
@@ -0,0 +1,127 @@
+#!/usr/bin/env python3
+# Copyright (C) 2022 Igalia S.L.
+# Copyright (C) 2022 Red Hat Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+import argparse
+import os
+import sys
+
+VALID_EXTENSIONS = {'.html', '.js', '.css', '.svg', '.png', '.gif', '.cur', '.bcmap', '.properties', '.pfb', '.ttf'}
+COMPRESSIBLE_EXTENSIONS = {'.html', '.js', '.css', '.svg', '.properties'}
+BASE_DIRS = {'pdfjs/', 'pdfjs-extras/'}
+
+IGNORE = {'LICENSE',
+          'PdfJSFiles.cmake',
+          'README.webkit',
+          'web/cmaps/LICENSE',
+          'web/standard_fonts/LICENSE_FOXIT',
+          'web/standard_fonts/LICENSE_LIBERATION'}
+
+
+def get_filenames(directory):
+    filenames = []
+
+    def resource_name(filename):
+        for base_directory in BASE_DIRS:
+            base_dir_index = filename.rfind(base_directory)
+            if base_dir_index != -1:
+                return filename[base_dir_index + len(base_directory):]
+        return None
+
+    for root, dirs, files in os.walk(directory):
+        dirs.sort()
+        files.sort()
+        for file in files:
+            # FIXME: Find a more sophisticated way to ignore unwanted
+            # port-specific files, so this will work for Cocoa ports too.
+            if os.path.basename(root) == 'cocoa':
+                continue
+            filename = os.path.join(root, file)
+            name = resource_name(filename)
+            if name is None:
+                continue
+
+            # The result should use forward slashes, thus make sure any os-specific
+            # separator is properly replaced.
+            if os.sep != '/':
+                name = name.replace(os.sep, '/')
+            if name not in IGNORE:
+                if os.path.splitext(name)[1] not in VALID_EXTENSIONS:
+                    print('Unexpected file %s, please teach generate-pdfjs-resource-manifest.py how to handle it' % filename, file=sys.stderr)
+                    sys.exit(1)
+                filenames.append(name)
+
+    return filenames
+
+
+def is_compressible(filename):
+    return os.path.splitext(filename)[1] in COMPRESSIBLE_EXTENSIONS
+
+
+def write_cmake_file(args):
+    args.output.write("# This file was generated by Tools/glib/generate-pdfjs-resource-manifest.py. Do not modify manually.\n")
+    args.output.write('set(PDFJSFiles\n')
+    for filename in get_filenames(args.input):
+        args.output.write('    ${THIRDPARTY_DIR}/pdfjs/%s\n' % filename)
+    args.output.write(')')
+
+
+def write_gresource_manifest(args):
+    args.output.write("""<?xml version=1.0 encoding=UTF-8?>
+<gresources>
+    <gresource prefix="/org/webkit/pdfjs">
+""")
+
+    for filename in get_filenames(args.input):
+        line = '        <file'
+        if is_compressible(filename):
+            line += ' compressed="true"'
+        if not filename.startswith('build/') and not filename.startswith('web/'):
+            alias = 'extras/' + filename
+            line += ' alias="%s"' % alias
+        line += '>%s</file>\n' % filename
+
+        args.output.write(line)
+
+    args.output.write("""    </gresource>
+</gresources>
+""")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Generate a GResources file for pdfjs.')
+    parser.add_argument('--input', type=str,
+                        help='the input directory')
+    parser.add_argument('--output', nargs='?', type=argparse.FileType('w'), default=sys.stdout,
+                        help='the output file')
+    parser.add_argument('--cmake', action='',
+                        help='generate CMake file list')
+    parser.add_argument('--gresource', action='',
+                        help='generate GResource manifest')
+
+    args = parser.parse_args(sys.argv[1:])
+
+    if args.cmake and args.gresource:
+        print('Cannot pass both --cmake and --gresource at the same time', file=sys.stderr)
+        sys.exit(1)
+    elif args.cmake:
+        write_cmake_file(args)
+    elif args.gresource:
+        write_gresource_manifest(args)
+    else:
+        print('Must pass either --cmake or --gresource', file=sys.stderr)
+        sys.exit(1)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to