Changeset 208954 in webkit

Timestamp:

Nov 21, 2016 5:57:30 PM (7 years ago)

Author:

Konstantin Tokarev

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/makegrammar.pl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-21  Konstantin Tokarev  <annulen@yandex.ru>
+
+        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  <olivier.blin@softathome.com>
 

trunk/Source/WebCore/css/makegrammar.pl

@@ -76 +76 @@
 
 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;