Title: [125163] trunk/Tools
- Revision
- 125163
- Author
- [email protected]
- Date
- 2012-08-09 04:00:56 -0700 (Thu, 09 Aug 2012)
Log Message
[Qt][Win] Build system bug revealed by r124835
https://bugs.webkit.org/show_bug.cgi?id=93339
Reviewed by Tor Arne Vestbø.
Don't add "LC_ALL=c" on Windows in svnRevisionForDirectory() and in pathRelativeToSVNRepositoryRootForPath().
* Scripts/VCSUtils.pm:
(isWindows): Copied from webkitdirs.pm.
(svnRevisionForDirectory):
(pathRelativeToSVNRepositoryRootForPath):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (125162 => 125163)
--- trunk/Tools/ChangeLog 2012-08-09 08:16:54 UTC (rev 125162)
+++ trunk/Tools/ChangeLog 2012-08-09 11:00:56 UTC (rev 125163)
@@ -1,3 +1,17 @@
+2012-08-09 Csaba Osztrogonác <[email protected]>
+
+ [Qt][Win] Build system bug revealed by r124835
+ https://bugs.webkit.org/show_bug.cgi?id=93339
+
+ Reviewed by Tor Arne Vestbø.
+
+ Don't add "LC_ALL=c" on Windows in svnRevisionForDirectory() and in pathRelativeToSVNRepositoryRootForPath().
+
+ * Scripts/VCSUtils.pm:
+ (isWindows): Copied from webkitdirs.pm.
+ (svnRevisionForDirectory):
+ (pathRelativeToSVNRepositoryRootForPath):
+
2012-08-08 Dirk Pranke <[email protected]>
update bot parsing of new-run-webkit-tests' output
Modified: trunk/Tools/Scripts/VCSUtils.pm (125162 => 125163)
--- trunk/Tools/Scripts/VCSUtils.pm 2012-08-09 08:16:54 UTC (rev 125162)
+++ trunk/Tools/Scripts/VCSUtils.pm 2012-08-09 11:00:56 UTC (rev 125163)
@@ -366,6 +366,11 @@
return determineSVNRoot();
}
+sub isWindows()
+{
+ return ($^O eq "MSWin32") || 0;
+}
+
sub svnRevisionForDirectory($)
{
my ($dir) = @_;
@@ -373,10 +378,15 @@
if (isSVNDirectory($dir)) {
my $escapedDir = escapeSubversionPath($dir);
- my $svnInfo = `LC_ALL=C svn info $escapedDir | grep Revision:`;
+ my $command = "svn info $escapedDir | grep Revision:";
+ $command = "LC_ALL=C $command" if !isWindows();
+ my $svnInfo = `$command`;
($revision) = ($svnInfo =~ m/Revision: (\d+).*/g);
} elsif (isGitDirectory($dir)) {
- my $gitLog = `cd $dir && LC_ALL=C git log --grep='git-svn-id: ' -n 1 | grep git-svn-id:`;
+ my $command = "git log --grep='git-svn-id: ' -n 1 | grep git-svn-id:";
+ $command = "LC_ALL=C $command" if !isWindows();
+ $command = "cd $dir && $command";
+ my $gitLog = `$command`;
($revision) = ($gitLog =~ m/ +git-svn-id: .+@(\d+) /g);
}
if (!defined($revision)) {
@@ -394,9 +404,13 @@
my $svnInfo;
if (isSVN()) {
my $escapedRelativePath = escapeSubversionPath($relativePath);
- $svnInfo = `LC_ALL=C svn info $escapedRelativePath`;
+ my $command = "svn info $escapedRelativePath";
+ $command = "LC_ALL=C $command" if !isWindows();
+ $svnInfo = `$command`;
} elsif (isGit()) {
- $svnInfo = `LC_ALL=C git svn info $relativePath`;
+ my $command = "git svn info $relativePath";
+ $command = "LC_ALL=C $command" if !isWindows();
+ $svnInfo = `$command`;
}
$svnInfo =~ /.*^URL: (.*?)$/m;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
