Title: [208954] trunk/Source/WebCore
- Revision
- 208954
- Author
- [email protected]
- Date
- 2016-11-21 17:57:30 -0800 (Mon, 21 Nov 2016)
Log Message
Disable #line markers in bison output on Windows
https://bugs.webkit.org/show_bug.cgi?id=164973
Reviewed by Darin Adler.
New bison versions since 3.0 have bug that causes unescaped paths
to be printed in #line directives. On Windows CMake passes absolute
paths to bison that have backslashes in them, leading to compiler
errors or warnings because of unrecognized escape sequences.
No new tests needed.
* css/makegrammar.pl:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (208953 => 208954)
--- trunk/Source/WebCore/ChangeLog 2016-11-21 23:54:43 UTC (rev 208953)
+++ trunk/Source/WebCore/ChangeLog 2016-11-22 01:57:30 UTC (rev 208954)
@@ -1,3 +1,19 @@
+2016-11-21 Konstantin Tokarev <[email protected]>
+
+ Disable #line markers in bison output on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=164973
+
+ Reviewed by Darin Adler.
+
+ New bison versions since 3.0 have bug that causes unescaped paths
+ to be printed in #line directives. On Windows CMake passes absolute
+ paths to bison that have backslashes in them, leading to compiler
+ errors or warnings because of unrecognized escape sequences.
+
+ No new tests needed.
+
+ * css/makegrammar.pl:
+
2016-11-21 Olivier Blin <[email protected]>
[cmake][OpenWebRTC] Move SDPProcessorScriptResource rules to common WebCore
Modified: trunk/Source/WebCore/css/makegrammar.pl (208953 => 208954)
--- trunk/Source/WebCore/css/makegrammar.pl 2016-11-21 23:54:43 UTC (rev 208953)
+++ trunk/Source/WebCore/css/makegrammar.pl 2016-11-22 01:57:30 UTC (rev 208954)
@@ -75,7 +75,9 @@
}
my $fileBase = File::Spec->join($outputDir, $filename);
-system("\"$bison\" -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp");
+my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
+system(@bisonCommand) == 0 or die;
open HEADER, ">$fileBase.h" or die;
print HEADER << "EOF";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
