Title: [279569] trunk/Tools
- Revision
- 279569
- Author
- [email protected]
- Date
- 2021-07-05 11:04:22 -0700 (Mon, 05 Jul 2021)
Log Message
[GTK] Installs in wrong directory on the bots
https://bugs.webkit.org/show_bug.cgi?id=227684
Patch by Philippe Normand <[email protected]> on 2021-07-05
Reviewed by Aakash Jain.
The patch landed in r279563 induced a typo in the installation prefix path option passed to
build-webkit. Then the built-product-archive was failing to find the header andn pkgconfig
files to pack. This patch fixes the issue.
* CISupport/build-webkit-org/steps.py:
(CompileWebKit.start):
* CISupport/build-webkit-org/steps_unittest.py:
(TestCompileWebKit.test_success_gtk):
Modified Paths
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (279568 => 279569)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-07-05 14:52:21 UTC (rev 279568)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-07-05 18:04:22 UTC (rev 279569)
@@ -290,7 +290,7 @@
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")
+ prefix = os.path.join("/app", "webkit", "WebKitBuild", self.getProperty("configuration").title(), "install")
self.setCommand(self.command + [f'--prefix={prefix}'])
appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (279568 => 279569)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-07-05 14:52:21 UTC (rev 279568)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-07-05 18:04:22 UTC (rev 279569)
@@ -420,7 +420,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=True,
- command=['perl', './Tools/Scripts/build-webkit', '--release', '--prefix=/app/webkit/WebKitBuild/release/install', '--gtk'],
+ command=['perl', './Tools/Scripts/build-webkit', '--release', '--prefix=/app/webkit/WebKitBuild/Release/install', '--gtk'],
) + 0,
)
self.expectOutcome(result=SUCCESS, state_string='compiled')
Modified: trunk/Tools/ChangeLog (279568 => 279569)
--- trunk/Tools/ChangeLog 2021-07-05 14:52:21 UTC (rev 279568)
+++ trunk/Tools/ChangeLog 2021-07-05 18:04:22 UTC (rev 279569)
@@ -1,5 +1,21 @@
2021-07-05 Philippe Normand <[email protected]>
+ [GTK] Installs in wrong directory on the bots
+ https://bugs.webkit.org/show_bug.cgi?id=227684
+
+ Reviewed by Aakash Jain.
+
+ The patch landed in r279563 induced a typo in the installation prefix path option passed to
+ build-webkit. Then the built-product-archive was failing to find the header andn pkgconfig
+ files to pack. This patch fixes the issue.
+
+ * CISupport/build-webkit-org/steps.py:
+ (CompileWebKit.start):
+ * CISupport/build-webkit-org/steps_unittest.py:
+ (TestCompileWebKit.test_success_gtk):
+
+2021-07-05 Philippe Normand <[email protected]>
+
[GTK] Pack header and .pc files in the built-product archive
https://bugs.webkit.org/show_bug.cgi?id=227526
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
