Title: [182065] trunk/Tools
- Revision
- 182065
- Author
- [email protected]
- Date
- 2015-03-27 09:59:24 -0700 (Fri, 27 Mar 2015)
Log Message
Fix WinCairo bot.
https://bugs.webkit.org/show_bug.cgi?id=143086
Patch by Alex Christensen <[email protected]> on 2015-03-27
Reviewed by Brent Fulgham.
* Scripts/webkitdirs.pm:
(buildVisualStudioProject):
(runSvnUpdateAndResolveChangeLogs):
Use ActivePerl-friendly perl.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (182064 => 182065)
--- trunk/Tools/ChangeLog 2015-03-27 16:49:21 UTC (rev 182064)
+++ trunk/Tools/ChangeLog 2015-03-27 16:59:24 UTC (rev 182065)
@@ -1,3 +1,15 @@
+2015-03-27 Alex Christensen <[email protected]>
+
+ Fix WinCairo bot.
+ https://bugs.webkit.org/show_bug.cgi?id=143086
+
+ Reviewed by Brent Fulgham.
+
+ * Scripts/webkitdirs.pm:
+ (buildVisualStudioProject):
+ (runSvnUpdateAndResolveChangeLogs):
+ Use ActivePerl-friendly perl.
+
2015-03-27 Csaba Osztrogonác <[email protected]>
URTBF after r182059 to fix the EFL build.
Modified: trunk/Tools/Scripts/webkitdirs.pm (182064 => 182065)
--- trunk/Tools/Scripts/webkitdirs.pm 2015-03-27 16:49:21 UTC (rev 182064)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-03-27 16:59:24 UTC (rev 182065)
@@ -1675,7 +1675,7 @@
my $platform = "/p:Platform=" . (isWin64() ? "x64" : "Win32");
my $logPath = File::Spec->catdir($baseProductDir, $configuration);
- File::Path->make_path($logPath) unless -d $logPath;
+ File::Path->make_path($logPath) unless -d $logPath or $logPath eq ".";
my $errorLogFile = File::Spec->catfile($logPath, "webkit_errors.log");
chomp($errorLogFile = `cygpath -w "$errorLogFile"`) if isCygwin();
@@ -2473,9 +2473,10 @@
sub runSvnUpdateAndResolveChangeLogs(@)
{
my @svnOptions = @_;
- open UPDATE, "-|", "svn", "update", @svnOptions or die;
+ my $openCommand = "svn update " . join(" ", @svnOptions);
+ open my $update, "$openCommand |" or die "cannot execute command $openCommand";
my @conflictedChangeLogs;
- while (my $line = <UPDATE>) {
+ while (my $line = <$update>) {
print $line;
$line =~ m/^C\s+(.+?)[\r\n]*$/;
if ($1) {
@@ -2483,7 +2484,7 @@
push @conflictedChangeLogs, $filename if basename($filename) eq "ChangeLog";
}
}
- close UPDATE or die;
+ close $update or die;
if (@conflictedChangeLogs) {
print "Attempting to merge conflicted ChangeLogs.\n";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
