Changeset 280590 in webkit

Timestamp:

Aug 3, 2021, 6:26:20 AM (5 years ago)

Author:

Philippe Normand

Message:

[WPE][GTK] SVN_REVISION drifting away if bots don't re-run cmake
​https://bugs.webkit.org/show_bug.cgi?id=228290

Reviewed by Michael Catanzaro.

The apply-build-revision-to-files.py script wasn't expanding the BUILD_REVISION beyond the
first run, because it processes files generated by CMake already, and expanding the
BUILD_REVISION once prevents further expansions. So the proposed solution is to always
expand BuildRevision.h.in from that script, and for .pc files, to restore the BUILD_REVISION
template before updating the file.

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

(main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• glib/apply-build-revision-to-files.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-03  Philippe Normand  <pnormand@igalia.com>
+
+        [WPE][GTK] SVN_REVISION drifting away if bots don't re-run cmake
+        https://bugs.webkit.org/show_bug.cgi?id=228290
+
+        Reviewed by Michael Catanzaro.
+
+        The apply-build-revision-to-files.py script wasn't expanding the BUILD_REVISION beyond the
+        first run, because it processes files generated by CMake already, and expanding the
+        BUILD_REVISION once prevents further expansions. So the proposed solution is to always
+        expand BuildRevision.h.in from that script, and for .pc files, to restore the BUILD_REVISION
+        template before updating the file.
+
+        * glib/apply-build-revision-to-files.py:
+        (main):
+
 2021-08-02  Peng Liu  <peng.liu6@apple.com>
 

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

@@ -27 +27 @@
 from webkitpy.common.system.filesystem import FileSystem  # nopep8
 
-
 def main(args):
     scm = SCMDetector(FileSystem(), Executive()).default_scm()
@@ -34 +33 @@
 
     for in_file in args:
-        with open(in_file) as fd:
-            data = fd.read().replace('${BUILD_REVISION}', build_revision)
+        filename = os.path.basename(in_file)
+        _, extension = os.path.splitext(filename)
+        if filename == "BuildRevision.h":
+            with open("Source/WebKit/Shared/glib/BuildRevision.h.in") as template:
+                data = template.read()
+        elif extension == '.pc':
+            # Restore a valid BUILD_REVISION template.
+            lines = []
+            with open(in_file) as fd:
+                for line in fd.readlines():
+                    if line.startswith("revision"):
+                        line = "revision=${BUILD_REVISION}\n"
+                    lines.append(line)
+            data = "".join(lines)
+        else:
+            print("Support for expanding $BUILD_REVISION in {} is missing.".format(in_file))
+            return 1
+
         with open(in_file, 'w') as fd:
-            fd.write(data)
+            fd.write(data.replace('${BUILD_REVISION}', build_revision))
 
     return 0