Title: [258689] trunk/Tools
- Revision
- 258689
- Author
- [email protected]
- Date
- 2020-03-19 02:50:17 -0700 (Thu, 19 Mar 2020)
Log Message
REGRESSION(r258626): webkit-dirs warning
https://bugs.webkit.org/show_bug.cgi?id=209221
Reviewed by Adrian Perez de Castro.
* Scripts/webkitdirs.pm:
(buildCMakeProjectOrExit): Fix Perl Warning. 😎
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (258688 => 258689)
--- trunk/Tools/ChangeLog 2020-03-19 09:12:01 UTC (rev 258688)
+++ trunk/Tools/ChangeLog 2020-03-19 09:50:17 UTC (rev 258689)
@@ -1,3 +1,13 @@
+2020-03-18 Philippe Normand <[email protected]>
+
+ REGRESSION(r258626): webkit-dirs warning
+ https://bugs.webkit.org/show_bug.cgi?id=209221
+
+ Reviewed by Adrian Perez de Castro.
+
+ * Scripts/webkitdirs.pm:
+ (buildCMakeProjectOrExit): Fix Perl Warning. 😎
+
2020-03-19 Chris Lord <[email protected]>
Add Chris Lord ([email protected]) to the list of contributors
Modified: trunk/Tools/Scripts/webkitdirs.pm (258688 => 258689)
--- trunk/Tools/Scripts/webkitdirs.pm 2020-03-19 09:12:01 UTC (rev 258688)
+++ trunk/Tools/Scripts/webkitdirs.pm 2020-03-19 09:50:17 UTC (rev 258689)
@@ -2431,7 +2431,9 @@
exit(exitStatus(cleanCMakeGeneratedProject())) if $clean;
- if (wrapperPrefixIfNeeded() == jhbuildWrapperPrefix()) {
+ my $wrapper = wrapperPrefixIfNeeded();
+ my $jhbuildPrefix = jhbuildWrapperPrefix();
+ if (defined($wrapper) && defined($jhbuildPrefix) && $wrapper == $jhbuildPrefix) {
if (isGtk() && checkForArgumentAndRemoveFromARGV("--update-gtk")) {
system("perl", File::Spec->catfile(sourceDir(), "Tools", "Scripts", "update-webkitgtk-libs")) == 0 or die $!;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
