Changeset 281192 in webkit

Timestamp:

Aug 18, 2021, 9:46:34 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r280382): [GTK] 2.33.3 does not build with gtk-doc enabled, installs broken pkg-config files
​https://bugs.webkit.org/show_bug.cgi?id=229152

Patch by Michael Catanzaro <Michael Catanzaro> on 2021-08-18
Reviewed by Philippe Normand.

Source/JavaScriptCore:

• PlatformGTK.cmake:
• javascriptcoregtk.pc.in:

Source/WebKit:

CMake is expanding templates in the pkg-config files that are not supposed to be expanded.
Oops! Let's switch back to using @SVN_REVISION@ instead of ${SVN_REVISION} as the template
for inserting the SVN revision into the pkg-config file, so we can tell CMake to leave the
${} variables alone.

• PlatformGTK.cmake:
• PlatformWPE.cmake:
• Shared/glib/BuildRevision.h.in:
• gtk/webkit2gtk-web-extension.pc.in:
• gtk/webkit2gtk.pc.in:

Tools:

• glib/apply-build-revision-to-files.py:

(main):

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/PlatformGTK.cmake (modified) (2 diffs)
• Source/JavaScriptCore/javascriptcoregtk.pc.in (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/PlatformGTK.cmake (modified) (2 diffs)
• Source/WebKit/PlatformWPE.cmake (modified) (3 diffs)
• Source/WebKit/Shared/glib/BuildRevision.h.in (modified) (1 diff)
• Source/WebKit/gtk/webkit2gtk-web-extension.pc.in (modified) (1 diff)
• Source/WebKit/gtk/webkit2gtk.pc.in (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/glib/apply-build-revision-to-files.py (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-08-18  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        REGRESSION(r280382): [GTK] 2.33.3 does not build with gtk-doc enabled, installs broken pkg-config files
+        https://bugs.webkit.org/show_bug.cgi?id=229152
+
+        Reviewed by Philippe Normand.
+
+        * PlatformGTK.cmake:
+        * javascriptcoregtk.pc.in:
+
 2021-08-17  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/PlatformGTK.cmake

@@ -4 +4 @@
 set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
 
+configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE} @ONLY)
+
 if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
-    configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE} @ONLY)
     add_custom_target(JavaScriptCore-build-revision
         ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${JavaScriptCore_PKGCONFIG_FILE}
@@ -13 +14 @@
         JavaScriptCore-build-revision
     )
-else ()
-    configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE})
 endif ()
 

trunk/Source/JavaScriptCore/javascriptcoregtk.pc.in

@@ -3 +3 @@
 libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
-revision=${BUILD_REVISION}
+revision=@BUILD_REVISION@
 
 Name: JavaScriptCoreGTK+

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-18  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        REGRESSION(r280382): [GTK] 2.33.3 does not build with gtk-doc enabled, installs broken pkg-config files
+        https://bugs.webkit.org/show_bug.cgi?id=229152
+
+        Reviewed by Philippe Normand.
+
+        CMake is expanding templates in the pkg-config files that are not supposed to be expanded.
+        Oops! Let's switch back to using @SVN_REVISION@ instead of ${SVN_REVISION} as the template
+        for inserting the SVN revision into the pkg-config file, so we can tell CMake to leave the
+        ${} variables alone.
+
+        * PlatformGTK.cmake:
+        * PlatformWPE.cmake:
+        * Shared/glib/BuildRevision.h.in:
+        * gtk/webkit2gtk-web-extension.pc.in:
+        * gtk/webkit2gtk.pc.in:
+
 2021-08-18  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/PlatformGTK.cmake

@@ -11 +11 @@
 file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension)
 
+configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h)
 configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitVersion.h)
+configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
+configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
 
 if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
-    configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
-    configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
-    configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h @ONLY)
     add_custom_target(WebKit-build-revision
         ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
@@ -24 +24 @@
         WebKit-build-revision
     )
-else ()
-    configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE})
-    configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE})
-    configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h)
 endif ()
 

trunk/Source/WebKit/PlatformWPE.cmake

@@ -13 +13 @@
 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_JSC_DIR})
 
+configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h)
 configure_file(UIProcess/API/wpe/WebKitVersion.h.in ${DERIVED_SOURCES_WPE_API_DIR}/WebKitVersion.h)
 configure_file(wpe/wpe-webkit.pc.in ${WPE_PKGCONFIG_FILE} @ONLY)
@@ -20 +21 @@
 
 if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
-    configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h @ONLY)
     add_custom_target(WebKit-build-revision
         ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
@@ -28 +28 @@
         WebKit-build-revision
     )
-else ()
-    configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h)
 endif ()
 

trunk/Source/WebKit/Shared/glib/BuildRevision.h.in

@@ -26 +26 @@
 #pragma once
 
-#define BUILD_REVISION "${BUILD_REVISION}"
+#define BUILD_REVISION "@BUILD_REVISION@"

trunk/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in

@@ -3 +3 @@
 libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
-revision=${BUILD_REVISION}
+revision=@BUILD_REVISION@
 
 Name: WebKitGTK web process extensions

trunk/Source/WebKit/gtk/webkit2gtk.pc.in

@@ -3 +3 @@
 libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
-revision=${BUILD_REVISION}
+revision=@BUILD_REVISION@
 
 Name: WebKitGTK

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-18  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        REGRESSION(r280382): [GTK] 2.33.3 does not build with gtk-doc enabled, installs broken pkg-config files
+        https://bugs.webkit.org/show_bug.cgi?id=229152
+
+        Reviewed by Philippe Normand.
+
+        * glib/apply-build-revision-to-files.py:
+        (main):
+
 2021-08-18  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/glib/apply-build-revision-to-files.py

@@ -71 +71 @@
                 for line in fd.readlines():
                     if line.startswith("revision"):
-                        line = "revision=${BUILD_REVISION}\n"
+                        line = "revision=@BUILD_REVISION@\n"
                     lines.append(line)
             data = "".join(lines)
         else:
-            print("Support for expanding $BUILD_REVISION in {} is missing.".format(in_file))
+            print("Support for expanding @BUILD_REVISION@ in {} is missing.".format(in_file))
             return 1
 
         with open(in_file, 'w') as fd:
-            fd.write(data.replace('${BUILD_REVISION}', build_revision))
+            fd.write(data.replace('@BUILD_REVISION@', build_revision))
 
     return 0