Title: [236331] trunk/Tools
- Revision
- 236331
- Author
- [email protected]
- Date
- 2018-09-21 10:13:34 -0700 (Fri, 21 Sep 2018)
Log Message
Bring up queues for iOS 12 (Build fix)
https://bugs.webkit.org/show_bug.cgi?id=189683
Unreviewed build fix.
We should not build ImageDiff as x86 by default since 32 bit projects are
deprecated in Xcode. ImageDiff should only be built once.
* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(argumentsForConfiguration):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (236330 => 236331)
--- trunk/Tools/ChangeLog 2018-09-21 17:04:56 UTC (rev 236330)
+++ trunk/Tools/ChangeLog 2018-09-21 17:13:34 UTC (rev 236331)
@@ -1,3 +1,17 @@
+2018-09-21 Jonathan Bedard <[email protected]>
+
+ Bring up queues for iOS 12 (Build fix)
+ https://bugs.webkit.org/show_bug.cgi?id=189683
+
+ Unreviewed build fix.
+
+ We should not build ImageDiff as x86 by default since 32 bit projects are
+ deprecated in Xcode. ImageDiff should only be built once.
+
+ * Scripts/build-webkit:
+ * Scripts/webkitdirs.pm:
+ (argumentsForConfiguration):
+
2018-09-21 Adrian Perez de Castro <[email protected]>
[WPE] Built RPM of WPE webkit fails to install with "nothing provides libWPEToolingBackends.so()"
Modified: trunk/Tools/Scripts/build-webkit (236330 => 236331)
--- trunk/Tools/Scripts/build-webkit 2018-09-21 17:04:56 UTC (rev 236330)
+++ trunk/Tools/Scripts/build-webkit 2018-09-21 17:13:34 UTC (rev 236331)
@@ -344,25 +344,25 @@
if (exitStatus($result)) {
exit exitStatus($result);
}
+ }
- # Build ImageDiff for host
- my @command = File::Spec->catfile(getcwd(), "/Tools/Scripts/build-imagediff");
- chdirWebKit();
- if (!-e $command[0]) {
- die "build-imagediff script not found";
- }
+ # Build ImageDiff for host
+ my @command = File::Spec->catfile(getcwd(), "/Tools/Scripts/build-imagediff");
+ chdirWebKit();
+ if (!-e $command[0]) {
+ die "build-imagediff script not found";
+ }
- if ($clean) {
- push @command, " --clean";
- }
- push @command, argumentsForConfiguration();
- push @command, @ARGV;
- @command = extractNonMacOSHostConfiguration(\@command);
- $result = system(@command);
- if (exitStatus($result)) {
- exit exitStatus($result);
- }
+ if ($clean) {
+ push @command, " --clean";
}
+ push @command, argumentsForConfiguration();
+ push @command, @ARGV;
+ @command = extractNonMacOSHostConfiguration(\@command);
+ $result = system(@command);
+ if (exitStatus($result)) {
+ exit exitStatus($result);
+ }
}
# Don't report the "WebKit is now built" message after a clean operation.
Modified: trunk/Tools/Scripts/webkitdirs.pm (236330 => 236331)
--- trunk/Tools/Scripts/webkitdirs.pm 2018-09-21 17:04:56 UTC (rev 236330)
+++ trunk/Tools/Scripts/webkitdirs.pm 2018-09-21 17:13:34 UTC (rev 236331)
@@ -488,7 +488,7 @@
push(@args, '--release') if ($configuration =~ "^Release");
push(@args, '--ios-device') if (defined $xcodeSDK && $xcodeSDK =~ /^iphoneos/);
push(@args, '--ios-simulator') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/);
- push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
+ push(@args, '--32-bit') if ($architecture eq "x86" and !isWin64());
push(@args, '--64-bit') if (isWin64());
push(@args, '--gtk') if isGtk();
push(@args, '--wpe') if isWPE();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
