Title: [152601] trunk/Tools
- Revision
- 152601
- Author
- [email protected]
- Date
- 2013-07-12 11:57:35 -0700 (Fri, 12 Jul 2013)
Log Message
[Tools] Ignore missing GNUmakefile when detecting previous arch in build-webkit
https://bugs.webkit.org/show_bug.cgi?id=91223
Patch by Emanuele Aina <[email protected]> on 2013-07-12
Reviewed by Martin Robinson.
When run on a clean checkout, `build-webkit` complains that no
GNUmakefile exists when trying to detect the previously configured
architecture, but in this case there's no previous configuration so
the warning is pointless.
* Scripts/webkitdirs.pm:
(determineArchitecture): Redirect grep stderr to /dev/null.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (152600 => 152601)
--- trunk/Tools/ChangeLog 2013-07-12 18:54:07 UTC (rev 152600)
+++ trunk/Tools/ChangeLog 2013-07-12 18:57:35 UTC (rev 152601)
@@ -1,3 +1,18 @@
+2013-07-12 Emanuele Aina <[email protected]>
+
+ [Tools] Ignore missing GNUmakefile when detecting previous arch in build-webkit
+ https://bugs.webkit.org/show_bug.cgi?id=91223
+
+ Reviewed by Martin Robinson.
+
+ When run on a clean checkout, `build-webkit` complains that no
+ GNUmakefile exists when trying to detect the previously configured
+ architecture, but in this case there's no previous configuration so
+ the warning is pointless.
+
+ * Scripts/webkitdirs.pm:
+ (determineArchitecture): Redirect grep stderr to /dev/null.
+
2013-07-12 Brian Holt <[email protected]>
check-webkit-style: Ignore false positive: Instance of 'Popen' has no 'pid' member
Modified: trunk/Tools/Scripts/webkitdirs.pm (152600 => 152601)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-07-12 18:54:07 UTC (rev 152600)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-07-12 18:57:35 UTC (rev 152601)
@@ -294,7 +294,7 @@
if (isGtk()) {
determineConfigurationProductDir();
- my $host_triple = `grep -E '^host = ' $configurationProductDir/GNUmakefile`;
+ my $host_triple = `grep -E '^host = ' $configurationProductDir/GNUmakefile 2> /dev/null`;
if ($host_triple =~ m/^host = ([^-]+)-/) {
# We have a configured build tree; use it.
$architecture = $1;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
