Title: [90439] trunk/Tools
- Revision
- 90439
- Author
- [email protected]
- Date
- 2011-07-05 23:55:09 -0700 (Tue, 05 Jul 2011)
Log Message
2011-07-05 Eric Seidel <[email protected]>
Perl string concat failure on Leopard (causes NRWT to fail)
https://bugs.webkit.org/show_bug.cgi?id=63973
Reviewed by Daniel Bates.
Leopard's "xcodebuild -version" has a different format from Snow Leopard/Lion
thus the version parsing logic in webkitdirs.pm seems to fail.
Default to "3.0" instead of undef when we can't parse the version number.
This should send us down the correct path for Leopard.
* Scripts/webkitdirs.pm:
(determineBaseProductDir):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90438 => 90439)
--- trunk/Tools/ChangeLog 2011-07-06 06:36:56 UTC (rev 90438)
+++ trunk/Tools/ChangeLog 2011-07-06 06:55:09 UTC (rev 90439)
@@ -1,3 +1,19 @@
+2011-07-05 Eric Seidel <[email protected]>
+
+ Perl string concat failure on Leopard (causes NRWT to fail)
+ https://bugs.webkit.org/show_bug.cgi?id=63973
+
+ Reviewed by Daniel Bates.
+
+ Leopard's "xcodebuild -version" has a different format from Snow Leopard/Lion
+ thus the version parsing logic in webkitdirs.pm seems to fail.
+
+ Default to "3.0" instead of undef when we can't parse the version number.
+ This should send us down the correct path for Leopard.
+
+ * Scripts/webkitdirs.pm:
+ (determineBaseProductDir):
+
2011-07-05 Kevin Ollivier <[email protected]>
[wx] Unreviewed build fix after addition of Source/WebCore/xml/parser dir.
Modified: trunk/Tools/Scripts/webkitdirs.pm (90438 => 90439)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-07-06 06:36:56 UTC (rev 90438)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-07-06 06:55:09 UTC (rev 90439)
@@ -141,7 +141,7 @@
}
my $xcodebuildVersionOutput = `xcodebuild -version`;
- my $xcodeVersion = ($xcodebuildVersionOutput =~ /Xcode ([0-9](\.[0-9]+)*)/) ? $1 : undef;
+ my $xcodeVersion = ($xcodebuildVersionOutput =~ /Xcode ([0-9](\.[0-9]+)*)/) ? $1 : "3.0";
my $xcodeDefaultsDomain = (eval "v$xcodeVersion" lt v4) ? "com.apple.Xcode" : "com.apple.dt.Xcode";
my $xcodeDefaultsPrefix = (eval "v$xcodeVersion" lt v4) ? "PBX" : "IDE";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
