Title: [260240] trunk/Tools
- Revision
- 260240
- Author
- [email protected]
- Date
- 2020-04-17 01:37:37 -0700 (Fri, 17 Apr 2020)
Log Message
[Flatpak SDK] Not fully hooked in BuildSlaveSupport
https://bugs.webkit.org/show_bug.cgi?id=210548
Patch by Philippe Normand <[email protected]> on 2020-04-17
Reviewed by Carlos Alberto Lopez Perez.
* Scripts/webkitdirs.pm:
(determineBaseProductDir): Flatpak SDK builds use a dedicated product directory per port.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (260239 => 260240)
--- trunk/Tools/ChangeLog 2020-04-17 07:52:00 UTC (rev 260239)
+++ trunk/Tools/ChangeLog 2020-04-17 08:37:37 UTC (rev 260240)
@@ -1,3 +1,13 @@
+2020-04-17 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Not fully hooked in BuildSlaveSupport
+ https://bugs.webkit.org/show_bug.cgi?id=210548
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * Scripts/webkitdirs.pm:
+ (determineBaseProductDir): Flatpak SDK builds use a dedicated product directory per port.
+
2020-04-16 Lauro Moura <[email protected]>
[GTK] A couple of API tests are flaky failing on X11.
Modified: trunk/Tools/Scripts/webkitdirs.pm (260239 => 260240)
--- trunk/Tools/Scripts/webkitdirs.pm 2020-04-17 07:52:00 UTC (rev 260239)
+++ trunk/Tools/Scripts/webkitdirs.pm 2020-04-17 08:37:37 UTC (rev 260240)
@@ -757,7 +757,11 @@
if (usesPerConfigurationBuildDirectory()) {
$configurationProductDir = "$baseProductDir";
} else {
- $configurationProductDir = "$baseProductDir/$configuration";
+ if (shouldUseFlatpak()) {
+ $configurationProductDir = "$baseProductDir/$portName/$configuration";
+ } else {
+ $configurationProductDir = "$baseProductDir/$configuration";
+ }
$configurationProductDir .= "-" . xcodeSDKPlatformName() if isEmbeddedWebKit() || isMacCatalystWebKit();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
