Title: [105875] trunk/Tools
- Revision
- 105875
- Author
- [email protected]
- Date
- 2012-01-25 06:32:47 -0800 (Wed, 25 Jan 2012)
Log Message
[Qt] build-webkit --qt requires a git-svn or SVN checkout.
Reviewed by Tor Arne Vestø.
Don't require it by making svnRevisionForDirectory return "unknown"
instead of bailing out with an error.
* Scripts/VCSUtils.pm:
(svnRevisionForDirectory):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (105874 => 105875)
--- trunk/Tools/ChangeLog 2012-01-25 14:30:27 UTC (rev 105874)
+++ trunk/Tools/ChangeLog 2012-01-25 14:32:47 UTC (rev 105875)
@@ -1,3 +1,15 @@
+2012-01-25 Simon Hausmann <[email protected]>
+
+ [Qt] build-webkit --qt requires a git-svn or SVN checkout.
+
+ Reviewed by Tor Arne Vestø.
+
+ Don't require it by making svnRevisionForDirectory return "unknown"
+ instead of bailing out with an error.
+
+ * Scripts/VCSUtils.pm:
+ (svnRevisionForDirectory):
+
2012-01-25 Adam Barth <[email protected]>
Temporarily disable running the unit tests on the Chromium EWS. These
Modified: trunk/Tools/Scripts/VCSUtils.pm (105874 => 105875)
--- trunk/Tools/Scripts/VCSUtils.pm 2012-01-25 14:30:27 UTC (rev 105874)
+++ trunk/Tools/Scripts/VCSUtils.pm 2012-01-25 14:32:47 UTC (rev 105875)
@@ -374,7 +374,10 @@
my $gitLog = `cd $dir && LC_ALL=C git log --grep='git-svn-id: ' -n 1 | grep git-svn-id:`;
($revision) = ($gitLog =~ m/ +git-svn-id: .+@(\d+) /g);
}
- die "Unable to determine current SVN revision in $dir" unless (defined $revision);
+ if (!defined($revision)) {
+ $revision = "unknown";
+ warn "Unable to determine current SVN revision in $dir";
+ }
return $revision;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
