Bug 91108 - [ANGLE] On QT, use Bison and Flex during ANGLE build
Summary: [ANGLE] On QT, use Bison and Flex during ANGLE build
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Simon Hausmann
URL:
Keywords:
Depends on:
Blocks: 91105
  Show dependency treegraph
 
Reported: 2012-07-12 09:44 PDT by Max Vujovic
Modified: 2012-07-18 04:49 PDT (History)
3 users (show)

See Also:


Attachments
Patch (5.97 KB, patch)
2012-07-17 01:43 PDT, Simon Hausmann
no flags Details | Formatted Diff | Diff
Patch (7.62 KB, patch)
2012-07-18 00:25 PDT, Simon Hausmann
kenneth: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Max Vujovic 2012-07-12 09:44:41 PDT
See description in bug 91105.
Comment 1 Simon Hausmann 2012-07-16 07:29:40 PDT
Good idea. My feeling is that we should do this in WebCore/DerivedSources.pri and call bison/flex directly, i.e. avoid the generate_parser.sh script. The main reason for avoiding the scripts would be that we don't require bash for the build of the Qt port on Windows.
Comment 2 Max Vujovic 2012-07-16 10:47:25 PDT
(In reply to comment #1)
> Good idea. My feeling is that we should do this in WebCore/DerivedSources.pri and call bison/flex directly, i.e. avoid the generate_parser.sh script.

That makes sense to me, too. 

> The main reason for avoiding the scripts would be that we don't require bash for the build of the Qt port on Windows.

That's really good to know. Thanks, Simon.
Comment 3 Simon Hausmann 2012-07-17 01:43:45 PDT
Created attachment 152720 [details]
Patch
Comment 4 Simon Hausmann 2012-07-17 01:47:37 PDT
I think this patch could be applied even today, we just won't compile the generated sources that exist in Thirdparty/Angle.

I noticed that the "new processor" files don't seem to be currently used though.
Comment 5 Max Vujovic 2012-07-17 16:35:06 PDT
(In reply to comment #4)
> I think this patch could be applied even today, we just won't compile the generated sources that exist in Thirdparty/Angle.

Thanks for the patch, Simon!

Just a heads up- we landed a big ANGLE update to r1170 today in bug 89039, so you'll have to make a (hopefully small) change to your patch.

The following files were renamed in the new version of ANGLE:
ANGLE/src/compiler/preprocessor/new/pp.l -> Tokenizer.l
ANGLE/src/compiler/preprocessor/new/pp.y -> ExpressionParser.y

You'll need to remove Tokenizer.cpp and ExpressionParser.cpp from WebCore/Target.pri as well, since you'll be generating them now.

> I noticed that the "new processor" files don't seem to be currently used though.

I think those files are now required for the new version of ANGLE to build. However, the new preprocessor isn't enabled in the current WebKit ANGLE source. Next time we update ANGLE though, it will be using the the new preprocessor.
Comment 6 Simon Hausmann 2012-07-18 00:25:32 PDT
Created attachment 152950 [details]
Patch
Comment 7 Kenneth Rohde Christiansen 2012-07-18 03:47:04 PDT
Comment on attachment 152950 [details]
Patch

rs=me
Comment 8 Simon Hausmann 2012-07-18 04:49:36 PDT
Committed r122947: <http://trac.webkit.org/changeset/122947>