Changeset 279563 in webkit

Timestamp:

Jul 5, 2021 1:25:09 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Pack header and .pc files in the built-product archive
​https://bugs.webkit.org/show_bug.cgi?id=227526

Patch by Philippe Normand <​pnormand@igalia.com> on 2021-07-05
Reviewed by Michael Catanzaro.

The header files and pkg-config files needed to build WebKitGTK apps are now included in the
built product zip file. As they're text files the impact on the zip size should not be
significant. In order to support this, two changes are introduced for the GTK build bot:

• build-webkit is now called with a --prefix option
• a new build step has been added, which installs the built files in the given prefix directory

Then built-product-archive can simply pack files from the install prefix directory.

Additionally the .a (potentially big) files are now excluded from the zip archive.

• CISupport/build-webkit-org/factories.py:

(BuildFactory.init):

• CISupport/build-webkit-org/steps.py:

(CompileWebKit.start):
(InstallBuiltProduct):

• CISupport/built-product-archive:
• Scripts/install-built-product: Added.

Location:

trunk/Tools

Files:

• CISupport/build-webkit-org/factories.py (modified) (1 diff)
• CISupport/build-webkit-org/steps.py (modified) (2 diffs)
• CISupport/build-webkit-org/steps_unittest.py (modified) (1 diff)
• CISupport/built-product-archive (modified) (4 diffs, 1 prop)
• CISupport/ews-build/factories.py (modified) (2 diffs)
• CISupport/ews-build/factories_unittest.py (modified) (1 diff)
• CISupport/ews-build/steps.py (modified) (2 diffs)
• CISupport/ews-build/steps_unittest.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Scripts/install-built-product (added)

trunk/Tools/CISupport/build-webkit-org/factories.py

@@ -64 +64 @@
 
         if triggers:
+            if platform == "gtk":
+                self.addStep(InstallBuiltProduct())
+
             self.addStep(ArchiveBuiltProduct())
             self.addStep(UploadBuiltProduct())

trunk/Tools/CISupport/build-webkit-org/steps.py

@@ -290 +290 @@
             self.setCommand(self.command + ['DEBUG_INFORMATION_FORMAT=dwarf-with-dsym'])
             self.setCommand(self.command + ['CLANG_DEBUG_INFORMATION_LEVEL=line-tables-only'])
+        if platform == 'gtk':
+            prefix = os.path.join("/app", "webkit", "WebKitBuild", self.getProperty("configuration"), "install")
+            self.setCommand(self.command + [f'--prefix={prefix}'])
 
         appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
@@ -321 +324 @@
     command = ["perl", "./Tools/Scripts/build-jsc", WithProperties("--%(configuration)s")]
 
+
+class InstallBuiltProduct(shell.ShellCommand):
+    command = ["python3", "Tools/Scripts/install-built-product",
+               WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
 
 class ArchiveBuiltProduct(shell.ShellCommand):

trunk/Tools/CISupport/build-webkit-org/steps_unittest.py

@@ -421 +421 @@
                 timeout=1200,
                 logEnviron=True,
-                command=['perl', './Tools/Scripts/build-webkit', '--release', '--gtk'],
+                command=['perl', './Tools/Scripts/build-webkit', '--release', '--prefix=/app/webkit/WebKitBuild/release/install', '--gtk'],
             ) + 0,
         )

trunk/Tools/CISupport/built-product-archive

@@ -111 +111 @@
 
 
-def createZipFromList(listToZip, configuration, excludePattern=None):
+def createZipFromList(listToZip, configuration, excludePatterns=None):
     global _topLevelBuildDirectory
     global _configurationBuildDirectory
@@ -125 +125 @@
     if sys.platform.startswith('linux'):
         zipCommand = ['zip', '-y', '-r', archiveFile] + listToZip
-        if excludePattern:
-            zipCommand += ['-x', excludePattern]
+        if excludePatterns:
+            for excludePattern in excludePatterns:
+                zipCommand += ['-x', excludePattern]
         return subprocess.call(zipCommand, cwd=_configurationBuildDirectory)
 
@@ -252 +253 @@
                     contents.append(os.path.join(cogDirectory, filename))
 
+        if platform == 'gtk':
+            contents.extend([os.path.join('install', directory) for directory in ['include', os.path.join('lib', 'pkgconfig')]])
+
         # When debug fission is enabled the directories below contain dwo files
         # with the debug information needed to generate backtraces with GDB.
@@ -258 +262 @@
                 contents.append(objectDir)
 
-        if createZipFromList(contents, configuration, excludePattern='*.o'):
+        if createZipFromList(contents, configuration, excludePatterns=['*.o', '*.a']):
             return 1
 

trunk/Tools/CISupport/ews-build/factories.py

@@ -33 +33 @@
                    RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsInStressMode, RunWebKitTestsInStressGuardmallocMode,
                    SetBuildSummary, ShowIdentifier, TriggerCrashLogSubmission, UpdateWorkingDirectory,
-                   ValidatePatch, ValidateChangeLogAndReviewer, ValidateCommiterAndReviewer, WaitForCrashCollection)
+                   ValidatePatch, ValidateChangeLogAndReviewer, ValidateCommiterAndReviewer, WaitForCrashCollection,
+                   InstallBuiltProduct)
 
 
@@ -115 +116 @@
             self.addStep(InstallGtkDependencies())
         self.addStep(CompileWebKit(skipUpload=self.skipUpload))
+        if platform == 'gtk':
+            self.addStep(InstallBuiltProduct())
 
 

trunk/Tools/CISupport/ews-build/factories_unittest.py

@@ -313 +313 @@
             _BuildStepFactory(steps.InstallGtkDependencies),
             _BuildStepFactory(steps.CompileWebKit, skipUpload=False),
+            _BuildStepFactory(steps.InstallBuiltProduct),
         ])
 

trunk/Tools/CISupport/ews-build/steps.py

@@ -1560 +1560 @@
             self.setCommand(self.command + ['DEBUG_INFORMATION_FORMAT=dwarf-with-dsym'])
             self.setCommand(self.command + ['CLANG_DEBUG_INFORMATION_LEVEL=line-tables-only'])
+        if platform == 'gtk':
+            prefix = os.path.join("/app", "webkit", "WebKitBuild", self.getProperty("configuration"), "install")
+            self.setCommand(self.command + [f'--prefix={prefix}'])
 
         appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
@@ -2031 +2034 @@
 
 
+class InstallBuiltProduct(shell.ShellCommand):
+    command = ["python3", "Tools/Scripts/install-built-product",
+               WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+
 class CleanBuild(shell.Compile):
     name = 'delete-WebKitBuild-directory'

trunk/Tools/CISupport/ews-build/steps_unittest.py

@@ -1080 +1080 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['perl', 'Tools/Scripts/build-webkit', '--release', '--gtk'],
+                        command=['perl', 'Tools/Scripts/build-webkit', '--release', '--prefix=/app/webkit/WebKitBuild/release/install', '--gtk'],
                         )
             + 0,

trunk/Tools/ChangeLog

@@ +1 @@
+2021-07-05  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] Pack header and .pc files in the built-product archive
+        https://bugs.webkit.org/show_bug.cgi?id=227526
+
+        Reviewed by Michael Catanzaro.
+
+        The header files and pkg-config files needed to build WebKitGTK apps are now included in the
+        built product zip file. As they're text files the impact on the zip size should not be
+        significant. In order to support this, two changes are introduced for the GTK build bot:
+
+        - build-webkit is now called with a --prefix option
+        - a new build step has been added, which installs the built files in the given prefix directory
+
+        Then built-product-archive can simply pack files from the install prefix directory.
+
+        Additionally the .a (potentially big) files are now excluded from the zip archive.
+
+        * CISupport/build-webkit-org/factories.py:
+        (BuildFactory.__init__):
+        * CISupport/build-webkit-org/steps.py:
+        (CompileWebKit.start):
+        (InstallBuiltProduct):
+        * CISupport/built-product-archive:
+        * Scripts/install-built-product: Added.
+
 2021-07-04  Wenson Hsieh  <wenson_hsieh@apple.com>